diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cfe712f08..5d677bd0b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/umbel/pilosa",
-	"GoVersion": "go1.5",
+	"GoVersion": "go1.5.1",
 	"Packages": [
 		"./..."
 	],
@@ -10,67 +10,21 @@
 			"Comment": "v0.1.0-21-g056c9bc",
 			"Rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4"
 		},
-		{
-			"ImportPath": "github.com/bitly/go-notify",
-			"Rev": "0a148b8111d688ba7550fc7119fe0d5d8e650838"
-		},
-		{
-			"ImportPath": "github.com/cactus/go-statsd-client/statsd",
-			"Rev": "3999011ef0451eb805b0fa31f98cfb9261bd71be"
-		},
-		{
-			"ImportPath": "github.com/cihub/seelog",
-			"Comment": "go1.1-81-gc510775",
-			"Rev": "c510775bb50d98213cfafca75a4bc5e3fddc8d8f"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-etcd/etcd",
-			"Rev": "1e26d8ee84cf9b1000d2af8acfb45b2521f49be5"
-		},
 		{
 			"ImportPath": "github.com/davecgh/go-spew/spew",
 			"Rev": "e762b3d1320b76030bd7f6cc2bfc3d9acce874c0"
 		},
 		{
-			"ImportPath": "github.com/gocql/gocql",
-			"Comment": "1st_gen_framing-221-gf8fb76b",
-			"Rev": "f8fb76bb772442ea938e4be46ab1666e542411a5"
+			"ImportPath": "github.com/gogo/protobuf/proto",
+			"Rev": "499788908625f4d83de42a204d1350fde8588e4f"
 		},
 		{
 			"ImportPath": "github.com/golang/groupcache/lru",
 			"Rev": "d781998583680cda80cf61e0b37dd0cd8da2eb52"
 		},
-		{
-			"ImportPath": "github.com/golang/snappy",
-			"Rev": "723cc1e459b8eea2dea4583200fd60757d40097a"
-		},
-		{
-			"ImportPath": "github.com/gorilla/websocket",
-			"Rev": "92334662baa9cbebc2e6e68b8d56bc1233f85a4c"
-		},
-		{
-			"ImportPath": "github.com/kr/s3",
-			"Rev": "c070c8f9a8f0032d48f0d2a77d4e382788bd8a1d"
-		},
-		{
-			"ImportPath": "github.com/robertkrimen/otto",
-			"Rev": "f9e07770bd9b5142de517b05a85ffbb42d1895da"
-		},
-		{
-			"ImportPath": "github.com/stathat/consistent",
-			"Rev": "0262985f12333852b6423025aa3ca315af473a4a"
-		},
-		{
-			"ImportPath": "github.com/syndtr/goleveldb/leveldb",
-			"Rev": "183614d6b32571e867df4cf086f5480ceefbdfac"
-		},
 		{
 			"ImportPath": "github.com/yasushi-saito/rbtree",
 			"Rev": "571e2538414bf914c7e2909b61217b4e3e5508f4"
-		},
-		{
-			"ImportPath": "gopkg.in/inf.v0",
-			"Rev": "c85f1217d51339c0fa3a498cc8b2075de695dae6"
 		}
 	]
 }
diff --git a/NOTES b/NOTES
new file mode 100644
index 000000000..49d372099
--- /dev/null
+++ b/NOTES
@@ -0,0 +1,26 @@
+                                                  
+      DB         Profile                          
+        ┌───────────▼────────────────────────────┐
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+Bitmap──▶0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │────────────────────────────────────────┤
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │0000000000000000000000000000000000000000│
+        │────────────────────────────────────────┤
+    F  ▶│0000000000000000000000000000000000000000│
+    r  ││0000000000000000000000000000000000000000│
+    a  ││0000000000000000000000000000000000000000│
+    m  ││0000000000000000000000000000000000000000│
+    e  ▶│0000000000000000000000000000000000000000│
+        └────────────────────────────────────────┘
+                                     ▲───────────▲
+                                         Slice    
+
+
+Fragment=intersection of frame & slice
diff --git a/README.md b/README.md
index 6f46f6a54..4a172735b 100644
--- a/README.md
+++ b/README.md
@@ -24,28 +24,12 @@ Now you can install the `pilosa` binary:
 $ go install github.com/umbel/pilosa/...
 ```
 
-Pilosa requires that [etcd][] is running locally for coordinating the cluster:
-
-```sh
-# In another terminal window
-$ etcd
-```
-
 Now run `pilosa` with the default configuration:
 
 ```sh
 pilosa
 ```
 
-This setup assumes that cassandra and etcd are running locally and that
-cassandra keyspace pilosa has been setup as describe in the file
-`index/storage_cass.go`.
-
-If you don't want backend storage you can comment out storage_backend in the
-config file and it will just operate out of memory.
-
-[etcd]: https://github.com/coreos/etcd
-
 
 ## Development
 
@@ -68,9 +52,3 @@ $ godep save ./...
 [godep]: https://github.com/tools/godep
 
 
-### Running tests
-
-Because of a bug in Go 1.5, you'll need to run `make test` to exclude tests
-the the `vendor/` directory.
-
-
diff --git a/benchmark_autogen_test.go b/benchmark_autogen_test.go
deleted file mode 100644
index b9185ba44..000000000
--- a/benchmark_autogen_test.go
+++ /dev/null
@@ -1,8796 +0,0 @@
-package pilosa
-
-import (
-	"math/rand"
-	"testing"
-)
-
-const (
-	c1 uint32 = 0xcc9e2d51
-	c2 uint32 = 0x1b873593
-)
-
-func benchmarkDifferentCombinations(b *testing.B, op string, b1, b2 int, s1, s2 int) {
-	m1 := NewBitmap()
-	m2 := NewBitmap()
-
-	bit := uint64(0)
-	rand.Seed(int64(c1))
-	for i := 0; i < b1; i++ {
-		bit += uint64(rand.Intn(s1) + 1)
-		m1.SetBit(bit)
-	}
-
-	bit = 0
-	rand.Seed(int64(c2))
-	for i := 0; i < b2; i++ {
-		bit += uint64(rand.Intn(s1) + 1)
-		m2.SetBit(bit)
-	}
-
-	var f func(b_bm *Bitmap) *Bitmap
-	switch op {
-	case "and":
-		f = m1.Intersection
-	case "or":
-		f = m1.Union
-	case "diff":
-		f = m1.Difference
-	default:
-		return
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		if f(m2) == nil {
-			b.Fatalf("Problem with %s benchmark at i = %d", op, i)
-		}
-	}
-}
-func Benchmark_and_64_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 64)
-}
-
-func Benchmark_and_64_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 128)
-}
-
-func Benchmark_and_64_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 256)
-}
-
-func Benchmark_and_64_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 512)
-}
-
-func Benchmark_and_64_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 1024)
-}
-
-func Benchmark_and_64_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 8192)
-}
-
-func Benchmark_and_64_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 16384)
-}
-
-func Benchmark_and_64_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 32768)
-}
-
-func Benchmark_and_64_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 64, 65536)
-}
-
-func Benchmark_and_64_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 64)
-}
-
-func Benchmark_and_64_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 128)
-}
-
-func Benchmark_and_64_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 256)
-}
-
-func Benchmark_and_64_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 512)
-}
-
-func Benchmark_and_64_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 1024)
-}
-
-func Benchmark_and_64_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 8192)
-}
-
-func Benchmark_and_64_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 16384)
-}
-
-func Benchmark_and_64_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 32768)
-}
-
-func Benchmark_and_64_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 128, 65536)
-}
-
-func Benchmark_and_64_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 64)
-}
-
-func Benchmark_and_64_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 128)
-}
-
-func Benchmark_and_64_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 256)
-}
-
-func Benchmark_and_64_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 512)
-}
-
-func Benchmark_and_64_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 1024)
-}
-
-func Benchmark_and_64_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 8192)
-}
-
-func Benchmark_and_64_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 16384)
-}
-
-func Benchmark_and_64_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 32768)
-}
-
-func Benchmark_and_64_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 256, 65536)
-}
-
-func Benchmark_and_64_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 64)
-}
-
-func Benchmark_and_64_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 128)
-}
-
-func Benchmark_and_64_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 256)
-}
-
-func Benchmark_and_64_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 512)
-}
-
-func Benchmark_and_64_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 1024)
-}
-
-func Benchmark_and_64_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 8192)
-}
-
-func Benchmark_and_64_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 16384)
-}
-
-func Benchmark_and_64_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 32768)
-}
-
-func Benchmark_and_64_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 512, 65536)
-}
-
-func Benchmark_and_64_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 64)
-}
-
-func Benchmark_and_64_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 128)
-}
-
-func Benchmark_and_64_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 256)
-}
-
-func Benchmark_and_64_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 512)
-}
-
-func Benchmark_and_64_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 1024)
-}
-
-func Benchmark_and_64_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 8192)
-}
-
-func Benchmark_and_64_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 16384)
-}
-
-func Benchmark_and_64_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 32768)
-}
-
-func Benchmark_and_64_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 1024, 65536)
-}
-
-func Benchmark_and_64_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 64)
-}
-
-func Benchmark_and_64_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 128)
-}
-
-func Benchmark_and_64_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 256)
-}
-
-func Benchmark_and_64_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 512)
-}
-
-func Benchmark_and_64_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 1024)
-}
-
-func Benchmark_and_64_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 8192)
-}
-
-func Benchmark_and_64_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 16384)
-}
-
-func Benchmark_and_64_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 32768)
-}
-
-func Benchmark_and_64_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 8192, 65536)
-}
-
-func Benchmark_and_64_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 64)
-}
-
-func Benchmark_and_64_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 128)
-}
-
-func Benchmark_and_64_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 256)
-}
-
-func Benchmark_and_64_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 512)
-}
-
-func Benchmark_and_64_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 1024)
-}
-
-func Benchmark_and_64_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 8192)
-}
-
-func Benchmark_and_64_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 16384)
-}
-
-func Benchmark_and_64_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 32768)
-}
-
-func Benchmark_and_64_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 16384, 65536)
-}
-
-func Benchmark_and_64_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 64)
-}
-
-func Benchmark_and_64_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 128)
-}
-
-func Benchmark_and_64_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 256)
-}
-
-func Benchmark_and_64_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 512)
-}
-
-func Benchmark_and_64_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 1024)
-}
-
-func Benchmark_and_64_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 8192)
-}
-
-func Benchmark_and_64_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 16384)
-}
-
-func Benchmark_and_64_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 32768)
-}
-
-func Benchmark_and_64_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 32768, 65536)
-}
-
-func Benchmark_and_64_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 64)
-}
-
-func Benchmark_and_64_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 128)
-}
-
-func Benchmark_and_64_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 256)
-}
-
-func Benchmark_and_64_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 512)
-}
-
-func Benchmark_and_64_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 1024)
-}
-
-func Benchmark_and_64_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 8192)
-}
-
-func Benchmark_and_64_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 16384)
-}
-
-func Benchmark_and_64_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 32768)
-}
-
-func Benchmark_and_64_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 64, 65536, 65536)
-}
-
-func Benchmark_and_64_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 64)
-}
-
-func Benchmark_and_64_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 128)
-}
-
-func Benchmark_and_64_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 256)
-}
-
-func Benchmark_and_64_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 512)
-}
-
-func Benchmark_and_64_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 1024)
-}
-
-func Benchmark_and_64_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 8192)
-}
-
-func Benchmark_and_64_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 16384)
-}
-
-func Benchmark_and_64_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 32768)
-}
-
-func Benchmark_and_64_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 64, 65536)
-}
-
-func Benchmark_and_64_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 64)
-}
-
-func Benchmark_and_64_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 128)
-}
-
-func Benchmark_and_64_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 256)
-}
-
-func Benchmark_and_64_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 512)
-}
-
-func Benchmark_and_64_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 1024)
-}
-
-func Benchmark_and_64_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 8192)
-}
-
-func Benchmark_and_64_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 16384)
-}
-
-func Benchmark_and_64_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 32768)
-}
-
-func Benchmark_and_64_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 128, 65536)
-}
-
-func Benchmark_and_64_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 64)
-}
-
-func Benchmark_and_64_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 128)
-}
-
-func Benchmark_and_64_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 256)
-}
-
-func Benchmark_and_64_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 512)
-}
-
-func Benchmark_and_64_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 1024)
-}
-
-func Benchmark_and_64_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 8192)
-}
-
-func Benchmark_and_64_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 16384)
-}
-
-func Benchmark_and_64_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 32768)
-}
-
-func Benchmark_and_64_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 256, 65536)
-}
-
-func Benchmark_and_64_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 64)
-}
-
-func Benchmark_and_64_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 128)
-}
-
-func Benchmark_and_64_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 256)
-}
-
-func Benchmark_and_64_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 512)
-}
-
-func Benchmark_and_64_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 1024)
-}
-
-func Benchmark_and_64_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 8192)
-}
-
-func Benchmark_and_64_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 16384)
-}
-
-func Benchmark_and_64_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 32768)
-}
-
-func Benchmark_and_64_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 512, 65536)
-}
-
-func Benchmark_and_64_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 64)
-}
-
-func Benchmark_and_64_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 128)
-}
-
-func Benchmark_and_64_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 256)
-}
-
-func Benchmark_and_64_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 512)
-}
-
-func Benchmark_and_64_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 1024)
-}
-
-func Benchmark_and_64_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 8192)
-}
-
-func Benchmark_and_64_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 16384)
-}
-
-func Benchmark_and_64_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 32768)
-}
-
-func Benchmark_and_64_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 1024, 65536)
-}
-
-func Benchmark_and_64_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 64)
-}
-
-func Benchmark_and_64_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 128)
-}
-
-func Benchmark_and_64_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 256)
-}
-
-func Benchmark_and_64_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 512)
-}
-
-func Benchmark_and_64_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 1024)
-}
-
-func Benchmark_and_64_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 8192)
-}
-
-func Benchmark_and_64_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 16384)
-}
-
-func Benchmark_and_64_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 32768)
-}
-
-func Benchmark_and_64_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 8192, 65536)
-}
-
-func Benchmark_and_64_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 64)
-}
-
-func Benchmark_and_64_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 128)
-}
-
-func Benchmark_and_64_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 256)
-}
-
-func Benchmark_and_64_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 512)
-}
-
-func Benchmark_and_64_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 1024)
-}
-
-func Benchmark_and_64_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 8192)
-}
-
-func Benchmark_and_64_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 16384)
-}
-
-func Benchmark_and_64_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 32768)
-}
-
-func Benchmark_and_64_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 16384, 65536)
-}
-
-func Benchmark_and_64_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 64)
-}
-
-func Benchmark_and_64_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 128)
-}
-
-func Benchmark_and_64_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 256)
-}
-
-func Benchmark_and_64_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 512)
-}
-
-func Benchmark_and_64_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 1024)
-}
-
-func Benchmark_and_64_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 8192)
-}
-
-func Benchmark_and_64_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 16384)
-}
-
-func Benchmark_and_64_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 32768)
-}
-
-func Benchmark_and_64_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 32768, 65536)
-}
-
-func Benchmark_and_64_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 64)
-}
-
-func Benchmark_and_64_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 128)
-}
-
-func Benchmark_and_64_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 256)
-}
-
-func Benchmark_and_64_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 512)
-}
-
-func Benchmark_and_64_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 1024)
-}
-
-func Benchmark_and_64_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 8192)
-}
-
-func Benchmark_and_64_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 16384)
-}
-
-func Benchmark_and_64_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 32768)
-}
-
-func Benchmark_and_64_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 1024, 65536, 65536)
-}
-
-func Benchmark_and_64_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 64)
-}
-
-func Benchmark_and_64_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 128)
-}
-
-func Benchmark_and_64_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 256)
-}
-
-func Benchmark_and_64_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 512)
-}
-
-func Benchmark_and_64_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 1024)
-}
-
-func Benchmark_and_64_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 8192)
-}
-
-func Benchmark_and_64_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 16384)
-}
-
-func Benchmark_and_64_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 32768)
-}
-
-func Benchmark_and_64_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 64, 65536)
-}
-
-func Benchmark_and_64_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 64)
-}
-
-func Benchmark_and_64_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 128)
-}
-
-func Benchmark_and_64_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 256)
-}
-
-func Benchmark_and_64_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 512)
-}
-
-func Benchmark_and_64_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 1024)
-}
-
-func Benchmark_and_64_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 8192)
-}
-
-func Benchmark_and_64_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 16384)
-}
-
-func Benchmark_and_64_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 32768)
-}
-
-func Benchmark_and_64_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 128, 65536)
-}
-
-func Benchmark_and_64_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 64)
-}
-
-func Benchmark_and_64_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 128)
-}
-
-func Benchmark_and_64_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 256)
-}
-
-func Benchmark_and_64_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 512)
-}
-
-func Benchmark_and_64_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 1024)
-}
-
-func Benchmark_and_64_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 8192)
-}
-
-func Benchmark_and_64_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 16384)
-}
-
-func Benchmark_and_64_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 32768)
-}
-
-func Benchmark_and_64_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 256, 65536)
-}
-
-func Benchmark_and_64_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 64)
-}
-
-func Benchmark_and_64_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 128)
-}
-
-func Benchmark_and_64_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 256)
-}
-
-func Benchmark_and_64_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 512)
-}
-
-func Benchmark_and_64_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 1024)
-}
-
-func Benchmark_and_64_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 8192)
-}
-
-func Benchmark_and_64_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 16384)
-}
-
-func Benchmark_and_64_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 32768)
-}
-
-func Benchmark_and_64_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 512, 65536)
-}
-
-func Benchmark_and_64_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 64)
-}
-
-func Benchmark_and_64_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 128)
-}
-
-func Benchmark_and_64_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 256)
-}
-
-func Benchmark_and_64_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 512)
-}
-
-func Benchmark_and_64_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 1024)
-}
-
-func Benchmark_and_64_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 8192)
-}
-
-func Benchmark_and_64_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 16384)
-}
-
-func Benchmark_and_64_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 32768)
-}
-
-func Benchmark_and_64_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 1024, 65536)
-}
-
-func Benchmark_and_64_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 64)
-}
-
-func Benchmark_and_64_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 128)
-}
-
-func Benchmark_and_64_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 256)
-}
-
-func Benchmark_and_64_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 512)
-}
-
-func Benchmark_and_64_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 1024)
-}
-
-func Benchmark_and_64_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 8192)
-}
-
-func Benchmark_and_64_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 16384)
-}
-
-func Benchmark_and_64_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 32768)
-}
-
-func Benchmark_and_64_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 8192, 65536)
-}
-
-func Benchmark_and_64_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 64)
-}
-
-func Benchmark_and_64_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 128)
-}
-
-func Benchmark_and_64_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 256)
-}
-
-func Benchmark_and_64_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 512)
-}
-
-func Benchmark_and_64_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 1024)
-}
-
-func Benchmark_and_64_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 8192)
-}
-
-func Benchmark_and_64_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 16384)
-}
-
-func Benchmark_and_64_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 32768)
-}
-
-func Benchmark_and_64_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 16384, 65536)
-}
-
-func Benchmark_and_64_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 64)
-}
-
-func Benchmark_and_64_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 128)
-}
-
-func Benchmark_and_64_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 256)
-}
-
-func Benchmark_and_64_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 512)
-}
-
-func Benchmark_and_64_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 1024)
-}
-
-func Benchmark_and_64_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 8192)
-}
-
-func Benchmark_and_64_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 16384)
-}
-
-func Benchmark_and_64_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 32768)
-}
-
-func Benchmark_and_64_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 32768, 65536)
-}
-
-func Benchmark_and_64_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 64)
-}
-
-func Benchmark_and_64_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 128)
-}
-
-func Benchmark_and_64_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 256)
-}
-
-func Benchmark_and_64_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 512)
-}
-
-func Benchmark_and_64_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 1024)
-}
-
-func Benchmark_and_64_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 8192)
-}
-
-func Benchmark_and_64_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 16384)
-}
-
-func Benchmark_and_64_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 32768)
-}
-
-func Benchmark_and_64_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 64, 65536, 65536, 65536)
-}
-
-func Benchmark_and_1024_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 64)
-}
-
-func Benchmark_and_1024_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 128)
-}
-
-func Benchmark_and_1024_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 256)
-}
-
-func Benchmark_and_1024_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 512)
-}
-
-func Benchmark_and_1024_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 1024)
-}
-
-func Benchmark_and_1024_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 8192)
-}
-
-func Benchmark_and_1024_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 16384)
-}
-
-func Benchmark_and_1024_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 32768)
-}
-
-func Benchmark_and_1024_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 64, 65536)
-}
-
-func Benchmark_and_1024_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 64)
-}
-
-func Benchmark_and_1024_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 128)
-}
-
-func Benchmark_and_1024_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 256)
-}
-
-func Benchmark_and_1024_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 512)
-}
-
-func Benchmark_and_1024_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 1024)
-}
-
-func Benchmark_and_1024_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 8192)
-}
-
-func Benchmark_and_1024_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 16384)
-}
-
-func Benchmark_and_1024_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 32768)
-}
-
-func Benchmark_and_1024_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 128, 65536)
-}
-
-func Benchmark_and_1024_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 64)
-}
-
-func Benchmark_and_1024_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 128)
-}
-
-func Benchmark_and_1024_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 256)
-}
-
-func Benchmark_and_1024_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 512)
-}
-
-func Benchmark_and_1024_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 1024)
-}
-
-func Benchmark_and_1024_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 8192)
-}
-
-func Benchmark_and_1024_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 16384)
-}
-
-func Benchmark_and_1024_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 32768)
-}
-
-func Benchmark_and_1024_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 256, 65536)
-}
-
-func Benchmark_and_1024_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 64)
-}
-
-func Benchmark_and_1024_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 128)
-}
-
-func Benchmark_and_1024_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 256)
-}
-
-func Benchmark_and_1024_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 512)
-}
-
-func Benchmark_and_1024_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 1024)
-}
-
-func Benchmark_and_1024_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 8192)
-}
-
-func Benchmark_and_1024_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 16384)
-}
-
-func Benchmark_and_1024_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 32768)
-}
-
-func Benchmark_and_1024_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 512, 65536)
-}
-
-func Benchmark_and_1024_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 64)
-}
-
-func Benchmark_and_1024_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 128)
-}
-
-func Benchmark_and_1024_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 256)
-}
-
-func Benchmark_and_1024_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 512)
-}
-
-func Benchmark_and_1024_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 1024)
-}
-
-func Benchmark_and_1024_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 8192)
-}
-
-func Benchmark_and_1024_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 16384)
-}
-
-func Benchmark_and_1024_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 32768)
-}
-
-func Benchmark_and_1024_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 1024, 65536)
-}
-
-func Benchmark_and_1024_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 64)
-}
-
-func Benchmark_and_1024_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 128)
-}
-
-func Benchmark_and_1024_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 256)
-}
-
-func Benchmark_and_1024_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 512)
-}
-
-func Benchmark_and_1024_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 1024)
-}
-
-func Benchmark_and_1024_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 8192)
-}
-
-func Benchmark_and_1024_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 16384)
-}
-
-func Benchmark_and_1024_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 32768)
-}
-
-func Benchmark_and_1024_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 8192, 65536)
-}
-
-func Benchmark_and_1024_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 64)
-}
-
-func Benchmark_and_1024_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 128)
-}
-
-func Benchmark_and_1024_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 256)
-}
-
-func Benchmark_and_1024_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 512)
-}
-
-func Benchmark_and_1024_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 1024)
-}
-
-func Benchmark_and_1024_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 8192)
-}
-
-func Benchmark_and_1024_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 16384)
-}
-
-func Benchmark_and_1024_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 32768)
-}
-
-func Benchmark_and_1024_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 16384, 65536)
-}
-
-func Benchmark_and_1024_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 64)
-}
-
-func Benchmark_and_1024_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 128)
-}
-
-func Benchmark_and_1024_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 256)
-}
-
-func Benchmark_and_1024_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 512)
-}
-
-func Benchmark_and_1024_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 1024)
-}
-
-func Benchmark_and_1024_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 8192)
-}
-
-func Benchmark_and_1024_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 16384)
-}
-
-func Benchmark_and_1024_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 32768)
-}
-
-func Benchmark_and_1024_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 32768, 65536)
-}
-
-func Benchmark_and_1024_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 64)
-}
-
-func Benchmark_and_1024_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 128)
-}
-
-func Benchmark_and_1024_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 256)
-}
-
-func Benchmark_and_1024_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 512)
-}
-
-func Benchmark_and_1024_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 1024)
-}
-
-func Benchmark_and_1024_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 8192)
-}
-
-func Benchmark_and_1024_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 16384)
-}
-
-func Benchmark_and_1024_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 32768)
-}
-
-func Benchmark_and_1024_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 64, 65536, 65536)
-}
-
-func Benchmark_and_1024_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 64)
-}
-
-func Benchmark_and_1024_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 128)
-}
-
-func Benchmark_and_1024_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 256)
-}
-
-func Benchmark_and_1024_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 512)
-}
-
-func Benchmark_and_1024_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 1024)
-}
-
-func Benchmark_and_1024_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 8192)
-}
-
-func Benchmark_and_1024_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 16384)
-}
-
-func Benchmark_and_1024_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 32768)
-}
-
-func Benchmark_and_1024_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 64, 65536)
-}
-
-func Benchmark_and_1024_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 64)
-}
-
-func Benchmark_and_1024_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 128)
-}
-
-func Benchmark_and_1024_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 256)
-}
-
-func Benchmark_and_1024_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 512)
-}
-
-func Benchmark_and_1024_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 1024)
-}
-
-func Benchmark_and_1024_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 8192)
-}
-
-func Benchmark_and_1024_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 16384)
-}
-
-func Benchmark_and_1024_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 32768)
-}
-
-func Benchmark_and_1024_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 128, 65536)
-}
-
-func Benchmark_and_1024_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 64)
-}
-
-func Benchmark_and_1024_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 128)
-}
-
-func Benchmark_and_1024_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 256)
-}
-
-func Benchmark_and_1024_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 512)
-}
-
-func Benchmark_and_1024_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 1024)
-}
-
-func Benchmark_and_1024_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 8192)
-}
-
-func Benchmark_and_1024_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 16384)
-}
-
-func Benchmark_and_1024_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 32768)
-}
-
-func Benchmark_and_1024_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 256, 65536)
-}
-
-func Benchmark_and_1024_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 64)
-}
-
-func Benchmark_and_1024_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 128)
-}
-
-func Benchmark_and_1024_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 256)
-}
-
-func Benchmark_and_1024_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 512)
-}
-
-func Benchmark_and_1024_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 1024)
-}
-
-func Benchmark_and_1024_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 8192)
-}
-
-func Benchmark_and_1024_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 16384)
-}
-
-func Benchmark_and_1024_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 32768)
-}
-
-func Benchmark_and_1024_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 512, 65536)
-}
-
-func Benchmark_and_1024_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 64)
-}
-
-func Benchmark_and_1024_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 128)
-}
-
-func Benchmark_and_1024_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 256)
-}
-
-func Benchmark_and_1024_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 512)
-}
-
-func Benchmark_and_1024_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 1024)
-}
-
-func Benchmark_and_1024_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 8192)
-}
-
-func Benchmark_and_1024_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 16384)
-}
-
-func Benchmark_and_1024_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 32768)
-}
-
-func Benchmark_and_1024_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 1024, 65536)
-}
-
-func Benchmark_and_1024_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 64)
-}
-
-func Benchmark_and_1024_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 128)
-}
-
-func Benchmark_and_1024_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 256)
-}
-
-func Benchmark_and_1024_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 512)
-}
-
-func Benchmark_and_1024_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 1024)
-}
-
-func Benchmark_and_1024_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 8192)
-}
-
-func Benchmark_and_1024_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 16384)
-}
-
-func Benchmark_and_1024_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 32768)
-}
-
-func Benchmark_and_1024_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 8192, 65536)
-}
-
-func Benchmark_and_1024_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 64)
-}
-
-func Benchmark_and_1024_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 128)
-}
-
-func Benchmark_and_1024_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 256)
-}
-
-func Benchmark_and_1024_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 512)
-}
-
-func Benchmark_and_1024_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 1024)
-}
-
-func Benchmark_and_1024_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 8192)
-}
-
-func Benchmark_and_1024_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 16384)
-}
-
-func Benchmark_and_1024_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 32768)
-}
-
-func Benchmark_and_1024_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 16384, 65536)
-}
-
-func Benchmark_and_1024_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 64)
-}
-
-func Benchmark_and_1024_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 128)
-}
-
-func Benchmark_and_1024_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 256)
-}
-
-func Benchmark_and_1024_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 512)
-}
-
-func Benchmark_and_1024_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 1024)
-}
-
-func Benchmark_and_1024_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 8192)
-}
-
-func Benchmark_and_1024_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 16384)
-}
-
-func Benchmark_and_1024_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 32768)
-}
-
-func Benchmark_and_1024_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 32768, 65536)
-}
-
-func Benchmark_and_1024_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 64)
-}
-
-func Benchmark_and_1024_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 128)
-}
-
-func Benchmark_and_1024_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 256)
-}
-
-func Benchmark_and_1024_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 512)
-}
-
-func Benchmark_and_1024_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 1024)
-}
-
-func Benchmark_and_1024_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 8192)
-}
-
-func Benchmark_and_1024_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 16384)
-}
-
-func Benchmark_and_1024_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 32768)
-}
-
-func Benchmark_and_1024_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 1024, 65536, 65536)
-}
-
-func Benchmark_and_1024_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 64)
-}
-
-func Benchmark_and_1024_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 128)
-}
-
-func Benchmark_and_1024_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 256)
-}
-
-func Benchmark_and_1024_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 512)
-}
-
-func Benchmark_and_1024_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 1024)
-}
-
-func Benchmark_and_1024_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 8192)
-}
-
-func Benchmark_and_1024_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 16384)
-}
-
-func Benchmark_and_1024_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 32768)
-}
-
-func Benchmark_and_1024_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 64, 65536)
-}
-
-func Benchmark_and_1024_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 64)
-}
-
-func Benchmark_and_1024_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 128)
-}
-
-func Benchmark_and_1024_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 256)
-}
-
-func Benchmark_and_1024_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 512)
-}
-
-func Benchmark_and_1024_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 1024)
-}
-
-func Benchmark_and_1024_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 8192)
-}
-
-func Benchmark_and_1024_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 16384)
-}
-
-func Benchmark_and_1024_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 32768)
-}
-
-func Benchmark_and_1024_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 128, 65536)
-}
-
-func Benchmark_and_1024_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 64)
-}
-
-func Benchmark_and_1024_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 128)
-}
-
-func Benchmark_and_1024_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 256)
-}
-
-func Benchmark_and_1024_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 512)
-}
-
-func Benchmark_and_1024_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 1024)
-}
-
-func Benchmark_and_1024_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 8192)
-}
-
-func Benchmark_and_1024_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 16384)
-}
-
-func Benchmark_and_1024_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 32768)
-}
-
-func Benchmark_and_1024_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 256, 65536)
-}
-
-func Benchmark_and_1024_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 64)
-}
-
-func Benchmark_and_1024_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 128)
-}
-
-func Benchmark_and_1024_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 256)
-}
-
-func Benchmark_and_1024_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 512)
-}
-
-func Benchmark_and_1024_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 1024)
-}
-
-func Benchmark_and_1024_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 8192)
-}
-
-func Benchmark_and_1024_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 16384)
-}
-
-func Benchmark_and_1024_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 32768)
-}
-
-func Benchmark_and_1024_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 512, 65536)
-}
-
-func Benchmark_and_1024_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 64)
-}
-
-func Benchmark_and_1024_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 128)
-}
-
-func Benchmark_and_1024_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 256)
-}
-
-func Benchmark_and_1024_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 512)
-}
-
-func Benchmark_and_1024_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 1024)
-}
-
-func Benchmark_and_1024_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 8192)
-}
-
-func Benchmark_and_1024_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 16384)
-}
-
-func Benchmark_and_1024_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 32768)
-}
-
-func Benchmark_and_1024_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 1024, 65536)
-}
-
-func Benchmark_and_1024_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 64)
-}
-
-func Benchmark_and_1024_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 128)
-}
-
-func Benchmark_and_1024_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 256)
-}
-
-func Benchmark_and_1024_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 512)
-}
-
-func Benchmark_and_1024_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 1024)
-}
-
-func Benchmark_and_1024_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 8192)
-}
-
-func Benchmark_and_1024_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 16384)
-}
-
-func Benchmark_and_1024_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 32768)
-}
-
-func Benchmark_and_1024_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 8192, 65536)
-}
-
-func Benchmark_and_1024_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 64)
-}
-
-func Benchmark_and_1024_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 128)
-}
-
-func Benchmark_and_1024_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 256)
-}
-
-func Benchmark_and_1024_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 512)
-}
-
-func Benchmark_and_1024_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 1024)
-}
-
-func Benchmark_and_1024_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 8192)
-}
-
-func Benchmark_and_1024_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 16384)
-}
-
-func Benchmark_and_1024_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 32768)
-}
-
-func Benchmark_and_1024_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 16384, 65536)
-}
-
-func Benchmark_and_1024_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 64)
-}
-
-func Benchmark_and_1024_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 128)
-}
-
-func Benchmark_and_1024_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 256)
-}
-
-func Benchmark_and_1024_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 512)
-}
-
-func Benchmark_and_1024_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 1024)
-}
-
-func Benchmark_and_1024_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 8192)
-}
-
-func Benchmark_and_1024_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 16384)
-}
-
-func Benchmark_and_1024_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 32768)
-}
-
-func Benchmark_and_1024_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 32768, 65536)
-}
-
-func Benchmark_and_1024_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 64)
-}
-
-func Benchmark_and_1024_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 128)
-}
-
-func Benchmark_and_1024_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 256)
-}
-
-func Benchmark_and_1024_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 512)
-}
-
-func Benchmark_and_1024_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 1024)
-}
-
-func Benchmark_and_1024_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 8192)
-}
-
-func Benchmark_and_1024_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 16384)
-}
-
-func Benchmark_and_1024_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 32768)
-}
-
-func Benchmark_and_1024_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 1024, 65536, 65536, 65536)
-}
-
-func Benchmark_and_65536_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 64)
-}
-
-func Benchmark_and_65536_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 128)
-}
-
-func Benchmark_and_65536_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 256)
-}
-
-func Benchmark_and_65536_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 512)
-}
-
-func Benchmark_and_65536_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 1024)
-}
-
-func Benchmark_and_65536_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 8192)
-}
-
-func Benchmark_and_65536_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 16384)
-}
-
-func Benchmark_and_65536_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 32768)
-}
-
-func Benchmark_and_65536_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 64, 65536)
-}
-
-func Benchmark_and_65536_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 64)
-}
-
-func Benchmark_and_65536_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 128)
-}
-
-func Benchmark_and_65536_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 256)
-}
-
-func Benchmark_and_65536_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 512)
-}
-
-func Benchmark_and_65536_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 1024)
-}
-
-func Benchmark_and_65536_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 8192)
-}
-
-func Benchmark_and_65536_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 16384)
-}
-
-func Benchmark_and_65536_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 32768)
-}
-
-func Benchmark_and_65536_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 128, 65536)
-}
-
-func Benchmark_and_65536_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 64)
-}
-
-func Benchmark_and_65536_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 128)
-}
-
-func Benchmark_and_65536_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 256)
-}
-
-func Benchmark_and_65536_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 512)
-}
-
-func Benchmark_and_65536_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 1024)
-}
-
-func Benchmark_and_65536_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 8192)
-}
-
-func Benchmark_and_65536_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 16384)
-}
-
-func Benchmark_and_65536_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 32768)
-}
-
-func Benchmark_and_65536_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 256, 65536)
-}
-
-func Benchmark_and_65536_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 64)
-}
-
-func Benchmark_and_65536_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 128)
-}
-
-func Benchmark_and_65536_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 256)
-}
-
-func Benchmark_and_65536_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 512)
-}
-
-func Benchmark_and_65536_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 1024)
-}
-
-func Benchmark_and_65536_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 8192)
-}
-
-func Benchmark_and_65536_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 16384)
-}
-
-func Benchmark_and_65536_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 32768)
-}
-
-func Benchmark_and_65536_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 512, 65536)
-}
-
-func Benchmark_and_65536_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 64)
-}
-
-func Benchmark_and_65536_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 128)
-}
-
-func Benchmark_and_65536_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 256)
-}
-
-func Benchmark_and_65536_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 512)
-}
-
-func Benchmark_and_65536_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 1024)
-}
-
-func Benchmark_and_65536_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 8192)
-}
-
-func Benchmark_and_65536_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 16384)
-}
-
-func Benchmark_and_65536_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 32768)
-}
-
-func Benchmark_and_65536_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 1024, 65536)
-}
-
-func Benchmark_and_65536_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 64)
-}
-
-func Benchmark_and_65536_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 128)
-}
-
-func Benchmark_and_65536_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 256)
-}
-
-func Benchmark_and_65536_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 512)
-}
-
-func Benchmark_and_65536_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 1024)
-}
-
-func Benchmark_and_65536_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 8192)
-}
-
-func Benchmark_and_65536_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 16384)
-}
-
-func Benchmark_and_65536_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 32768)
-}
-
-func Benchmark_and_65536_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 8192, 65536)
-}
-
-func Benchmark_and_65536_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 64)
-}
-
-func Benchmark_and_65536_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 128)
-}
-
-func Benchmark_and_65536_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 256)
-}
-
-func Benchmark_and_65536_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 512)
-}
-
-func Benchmark_and_65536_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 1024)
-}
-
-func Benchmark_and_65536_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 8192)
-}
-
-func Benchmark_and_65536_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 16384)
-}
-
-func Benchmark_and_65536_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 32768)
-}
-
-func Benchmark_and_65536_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 16384, 65536)
-}
-
-func Benchmark_and_65536_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 64)
-}
-
-func Benchmark_and_65536_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 128)
-}
-
-func Benchmark_and_65536_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 256)
-}
-
-func Benchmark_and_65536_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 512)
-}
-
-func Benchmark_and_65536_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 1024)
-}
-
-func Benchmark_and_65536_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 8192)
-}
-
-func Benchmark_and_65536_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 16384)
-}
-
-func Benchmark_and_65536_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 32768)
-}
-
-func Benchmark_and_65536_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 32768, 65536)
-}
-
-func Benchmark_and_65536_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 64)
-}
-
-func Benchmark_and_65536_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 128)
-}
-
-func Benchmark_and_65536_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 256)
-}
-
-func Benchmark_and_65536_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 512)
-}
-
-func Benchmark_and_65536_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 1024)
-}
-
-func Benchmark_and_65536_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 8192)
-}
-
-func Benchmark_and_65536_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 16384)
-}
-
-func Benchmark_and_65536_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 32768)
-}
-
-func Benchmark_and_65536_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 64, 65536, 65536)
-}
-
-func Benchmark_and_65536_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 64)
-}
-
-func Benchmark_and_65536_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 128)
-}
-
-func Benchmark_and_65536_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 256)
-}
-
-func Benchmark_and_65536_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 512)
-}
-
-func Benchmark_and_65536_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 1024)
-}
-
-func Benchmark_and_65536_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 8192)
-}
-
-func Benchmark_and_65536_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 16384)
-}
-
-func Benchmark_and_65536_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 32768)
-}
-
-func Benchmark_and_65536_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 64, 65536)
-}
-
-func Benchmark_and_65536_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 64)
-}
-
-func Benchmark_and_65536_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 128)
-}
-
-func Benchmark_and_65536_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 256)
-}
-
-func Benchmark_and_65536_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 512)
-}
-
-func Benchmark_and_65536_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 1024)
-}
-
-func Benchmark_and_65536_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 8192)
-}
-
-func Benchmark_and_65536_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 16384)
-}
-
-func Benchmark_and_65536_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 32768)
-}
-
-func Benchmark_and_65536_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 128, 65536)
-}
-
-func Benchmark_and_65536_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 64)
-}
-
-func Benchmark_and_65536_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 128)
-}
-
-func Benchmark_and_65536_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 256)
-}
-
-func Benchmark_and_65536_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 512)
-}
-
-func Benchmark_and_65536_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 1024)
-}
-
-func Benchmark_and_65536_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 8192)
-}
-
-func Benchmark_and_65536_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 16384)
-}
-
-func Benchmark_and_65536_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 32768)
-}
-
-func Benchmark_and_65536_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 256, 65536)
-}
-
-func Benchmark_and_65536_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 64)
-}
-
-func Benchmark_and_65536_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 128)
-}
-
-func Benchmark_and_65536_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 256)
-}
-
-func Benchmark_and_65536_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 512)
-}
-
-func Benchmark_and_65536_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 1024)
-}
-
-func Benchmark_and_65536_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 8192)
-}
-
-func Benchmark_and_65536_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 16384)
-}
-
-func Benchmark_and_65536_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 32768)
-}
-
-func Benchmark_and_65536_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 512, 65536)
-}
-
-func Benchmark_and_65536_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 64)
-}
-
-func Benchmark_and_65536_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 128)
-}
-
-func Benchmark_and_65536_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 256)
-}
-
-func Benchmark_and_65536_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 512)
-}
-
-func Benchmark_and_65536_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 1024)
-}
-
-func Benchmark_and_65536_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 8192)
-}
-
-func Benchmark_and_65536_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 16384)
-}
-
-func Benchmark_and_65536_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 32768)
-}
-
-func Benchmark_and_65536_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 1024, 65536)
-}
-
-func Benchmark_and_65536_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 64)
-}
-
-func Benchmark_and_65536_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 128)
-}
-
-func Benchmark_and_65536_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 256)
-}
-
-func Benchmark_and_65536_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 512)
-}
-
-func Benchmark_and_65536_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 1024)
-}
-
-func Benchmark_and_65536_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 8192)
-}
-
-func Benchmark_and_65536_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 16384)
-}
-
-func Benchmark_and_65536_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 32768)
-}
-
-func Benchmark_and_65536_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 8192, 65536)
-}
-
-func Benchmark_and_65536_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 64)
-}
-
-func Benchmark_and_65536_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 128)
-}
-
-func Benchmark_and_65536_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 256)
-}
-
-func Benchmark_and_65536_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 512)
-}
-
-func Benchmark_and_65536_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 1024)
-}
-
-func Benchmark_and_65536_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 8192)
-}
-
-func Benchmark_and_65536_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 16384)
-}
-
-func Benchmark_and_65536_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 32768)
-}
-
-func Benchmark_and_65536_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 16384, 65536)
-}
-
-func Benchmark_and_65536_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 64)
-}
-
-func Benchmark_and_65536_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 128)
-}
-
-func Benchmark_and_65536_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 256)
-}
-
-func Benchmark_and_65536_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 512)
-}
-
-func Benchmark_and_65536_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 1024)
-}
-
-func Benchmark_and_65536_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 8192)
-}
-
-func Benchmark_and_65536_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 16384)
-}
-
-func Benchmark_and_65536_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 32768)
-}
-
-func Benchmark_and_65536_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 32768, 65536)
-}
-
-func Benchmark_and_65536_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 64)
-}
-
-func Benchmark_and_65536_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 128)
-}
-
-func Benchmark_and_65536_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 256)
-}
-
-func Benchmark_and_65536_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 512)
-}
-
-func Benchmark_and_65536_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 1024)
-}
-
-func Benchmark_and_65536_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 8192)
-}
-
-func Benchmark_and_65536_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 16384)
-}
-
-func Benchmark_and_65536_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 32768)
-}
-
-func Benchmark_and_65536_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 1024, 65536, 65536)
-}
-
-func Benchmark_and_65536_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 64)
-}
-
-func Benchmark_and_65536_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 128)
-}
-
-func Benchmark_and_65536_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 256)
-}
-
-func Benchmark_and_65536_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 512)
-}
-
-func Benchmark_and_65536_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 1024)
-}
-
-func Benchmark_and_65536_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 8192)
-}
-
-func Benchmark_and_65536_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 16384)
-}
-
-func Benchmark_and_65536_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 32768)
-}
-
-func Benchmark_and_65536_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 64, 65536)
-}
-
-func Benchmark_and_65536_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 64)
-}
-
-func Benchmark_and_65536_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 128)
-}
-
-func Benchmark_and_65536_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 256)
-}
-
-func Benchmark_and_65536_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 512)
-}
-
-func Benchmark_and_65536_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 1024)
-}
-
-func Benchmark_and_65536_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 8192)
-}
-
-func Benchmark_and_65536_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 16384)
-}
-
-func Benchmark_and_65536_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 32768)
-}
-
-func Benchmark_and_65536_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 128, 65536)
-}
-
-func Benchmark_and_65536_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 64)
-}
-
-func Benchmark_and_65536_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 128)
-}
-
-func Benchmark_and_65536_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 256)
-}
-
-func Benchmark_and_65536_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 512)
-}
-
-func Benchmark_and_65536_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 1024)
-}
-
-func Benchmark_and_65536_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 8192)
-}
-
-func Benchmark_and_65536_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 16384)
-}
-
-func Benchmark_and_65536_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 32768)
-}
-
-func Benchmark_and_65536_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 256, 65536)
-}
-
-func Benchmark_and_65536_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 64)
-}
-
-func Benchmark_and_65536_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 128)
-}
-
-func Benchmark_and_65536_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 256)
-}
-
-func Benchmark_and_65536_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 512)
-}
-
-func Benchmark_and_65536_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 1024)
-}
-
-func Benchmark_and_65536_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 8192)
-}
-
-func Benchmark_and_65536_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 16384)
-}
-
-func Benchmark_and_65536_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 32768)
-}
-
-func Benchmark_and_65536_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 512, 65536)
-}
-
-func Benchmark_and_65536_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 64)
-}
-
-func Benchmark_and_65536_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 128)
-}
-
-func Benchmark_and_65536_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 256)
-}
-
-func Benchmark_and_65536_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 512)
-}
-
-func Benchmark_and_65536_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 1024)
-}
-
-func Benchmark_and_65536_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 8192)
-}
-
-func Benchmark_and_65536_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 16384)
-}
-
-func Benchmark_and_65536_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 32768)
-}
-
-func Benchmark_and_65536_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 1024, 65536)
-}
-
-func Benchmark_and_65536_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 64)
-}
-
-func Benchmark_and_65536_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 128)
-}
-
-func Benchmark_and_65536_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 256)
-}
-
-func Benchmark_and_65536_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 512)
-}
-
-func Benchmark_and_65536_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 1024)
-}
-
-func Benchmark_and_65536_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 8192)
-}
-
-func Benchmark_and_65536_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 16384)
-}
-
-func Benchmark_and_65536_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 32768)
-}
-
-func Benchmark_and_65536_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 8192, 65536)
-}
-
-func Benchmark_and_65536_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 64)
-}
-
-func Benchmark_and_65536_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 128)
-}
-
-func Benchmark_and_65536_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 256)
-}
-
-func Benchmark_and_65536_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 512)
-}
-
-func Benchmark_and_65536_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 1024)
-}
-
-func Benchmark_and_65536_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 8192)
-}
-
-func Benchmark_and_65536_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 16384)
-}
-
-func Benchmark_and_65536_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 32768)
-}
-
-func Benchmark_and_65536_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 16384, 65536)
-}
-
-func Benchmark_and_65536_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 64)
-}
-
-func Benchmark_and_65536_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 128)
-}
-
-func Benchmark_and_65536_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 256)
-}
-
-func Benchmark_and_65536_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 512)
-}
-
-func Benchmark_and_65536_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 1024)
-}
-
-func Benchmark_and_65536_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 8192)
-}
-
-func Benchmark_and_65536_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 16384)
-}
-
-func Benchmark_and_65536_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 32768)
-}
-
-func Benchmark_and_65536_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 32768, 65536)
-}
-
-func Benchmark_and_65536_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 64)
-}
-
-func Benchmark_and_65536_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 128)
-}
-
-func Benchmark_and_65536_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 256)
-}
-
-func Benchmark_and_65536_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 512)
-}
-
-func Benchmark_and_65536_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 1024)
-}
-
-func Benchmark_and_65536_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 8192)
-}
-
-func Benchmark_and_65536_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 16384)
-}
-
-func Benchmark_and_65536_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 32768)
-}
-
-func Benchmark_and_65536_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "and", 65536, 65536, 65536, 65536)
-}
-
-func Benchmark_or_64_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 64)
-}
-
-func Benchmark_or_64_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 128)
-}
-
-func Benchmark_or_64_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 256)
-}
-
-func Benchmark_or_64_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 512)
-}
-
-func Benchmark_or_64_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 1024)
-}
-
-func Benchmark_or_64_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 8192)
-}
-
-func Benchmark_or_64_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 16384)
-}
-
-func Benchmark_or_64_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 32768)
-}
-
-func Benchmark_or_64_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 64, 65536)
-}
-
-func Benchmark_or_64_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 64)
-}
-
-func Benchmark_or_64_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 128)
-}
-
-func Benchmark_or_64_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 256)
-}
-
-func Benchmark_or_64_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 512)
-}
-
-func Benchmark_or_64_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 1024)
-}
-
-func Benchmark_or_64_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 8192)
-}
-
-func Benchmark_or_64_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 16384)
-}
-
-func Benchmark_or_64_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 32768)
-}
-
-func Benchmark_or_64_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 128, 65536)
-}
-
-func Benchmark_or_64_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 64)
-}
-
-func Benchmark_or_64_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 128)
-}
-
-func Benchmark_or_64_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 256)
-}
-
-func Benchmark_or_64_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 512)
-}
-
-func Benchmark_or_64_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 1024)
-}
-
-func Benchmark_or_64_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 8192)
-}
-
-func Benchmark_or_64_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 16384)
-}
-
-func Benchmark_or_64_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 32768)
-}
-
-func Benchmark_or_64_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 256, 65536)
-}
-
-func Benchmark_or_64_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 64)
-}
-
-func Benchmark_or_64_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 128)
-}
-
-func Benchmark_or_64_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 256)
-}
-
-func Benchmark_or_64_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 512)
-}
-
-func Benchmark_or_64_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 1024)
-}
-
-func Benchmark_or_64_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 8192)
-}
-
-func Benchmark_or_64_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 16384)
-}
-
-func Benchmark_or_64_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 32768)
-}
-
-func Benchmark_or_64_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 512, 65536)
-}
-
-func Benchmark_or_64_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 64)
-}
-
-func Benchmark_or_64_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 128)
-}
-
-func Benchmark_or_64_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 256)
-}
-
-func Benchmark_or_64_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 512)
-}
-
-func Benchmark_or_64_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 1024)
-}
-
-func Benchmark_or_64_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 8192)
-}
-
-func Benchmark_or_64_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 16384)
-}
-
-func Benchmark_or_64_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 32768)
-}
-
-func Benchmark_or_64_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 1024, 65536)
-}
-
-func Benchmark_or_64_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 64)
-}
-
-func Benchmark_or_64_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 128)
-}
-
-func Benchmark_or_64_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 256)
-}
-
-func Benchmark_or_64_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 512)
-}
-
-func Benchmark_or_64_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 1024)
-}
-
-func Benchmark_or_64_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 8192)
-}
-
-func Benchmark_or_64_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 16384)
-}
-
-func Benchmark_or_64_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 32768)
-}
-
-func Benchmark_or_64_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 8192, 65536)
-}
-
-func Benchmark_or_64_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 64)
-}
-
-func Benchmark_or_64_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 128)
-}
-
-func Benchmark_or_64_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 256)
-}
-
-func Benchmark_or_64_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 512)
-}
-
-func Benchmark_or_64_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 1024)
-}
-
-func Benchmark_or_64_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 8192)
-}
-
-func Benchmark_or_64_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 16384)
-}
-
-func Benchmark_or_64_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 32768)
-}
-
-func Benchmark_or_64_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 16384, 65536)
-}
-
-func Benchmark_or_64_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 64)
-}
-
-func Benchmark_or_64_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 128)
-}
-
-func Benchmark_or_64_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 256)
-}
-
-func Benchmark_or_64_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 512)
-}
-
-func Benchmark_or_64_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 1024)
-}
-
-func Benchmark_or_64_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 8192)
-}
-
-func Benchmark_or_64_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 16384)
-}
-
-func Benchmark_or_64_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 32768)
-}
-
-func Benchmark_or_64_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 32768, 65536)
-}
-
-func Benchmark_or_64_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 64)
-}
-
-func Benchmark_or_64_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 128)
-}
-
-func Benchmark_or_64_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 256)
-}
-
-func Benchmark_or_64_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 512)
-}
-
-func Benchmark_or_64_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 1024)
-}
-
-func Benchmark_or_64_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 8192)
-}
-
-func Benchmark_or_64_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 16384)
-}
-
-func Benchmark_or_64_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 32768)
-}
-
-func Benchmark_or_64_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 64, 65536, 65536)
-}
-
-func Benchmark_or_64_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 64)
-}
-
-func Benchmark_or_64_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 128)
-}
-
-func Benchmark_or_64_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 256)
-}
-
-func Benchmark_or_64_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 512)
-}
-
-func Benchmark_or_64_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 1024)
-}
-
-func Benchmark_or_64_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 8192)
-}
-
-func Benchmark_or_64_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 16384)
-}
-
-func Benchmark_or_64_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 32768)
-}
-
-func Benchmark_or_64_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 64, 65536)
-}
-
-func Benchmark_or_64_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 64)
-}
-
-func Benchmark_or_64_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 128)
-}
-
-func Benchmark_or_64_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 256)
-}
-
-func Benchmark_or_64_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 512)
-}
-
-func Benchmark_or_64_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 1024)
-}
-
-func Benchmark_or_64_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 8192)
-}
-
-func Benchmark_or_64_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 16384)
-}
-
-func Benchmark_or_64_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 32768)
-}
-
-func Benchmark_or_64_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 128, 65536)
-}
-
-func Benchmark_or_64_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 64)
-}
-
-func Benchmark_or_64_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 128)
-}
-
-func Benchmark_or_64_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 256)
-}
-
-func Benchmark_or_64_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 512)
-}
-
-func Benchmark_or_64_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 1024)
-}
-
-func Benchmark_or_64_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 8192)
-}
-
-func Benchmark_or_64_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 16384)
-}
-
-func Benchmark_or_64_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 32768)
-}
-
-func Benchmark_or_64_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 256, 65536)
-}
-
-func Benchmark_or_64_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 64)
-}
-
-func Benchmark_or_64_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 128)
-}
-
-func Benchmark_or_64_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 256)
-}
-
-func Benchmark_or_64_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 512)
-}
-
-func Benchmark_or_64_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 1024)
-}
-
-func Benchmark_or_64_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 8192)
-}
-
-func Benchmark_or_64_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 16384)
-}
-
-func Benchmark_or_64_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 32768)
-}
-
-func Benchmark_or_64_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 512, 65536)
-}
-
-func Benchmark_or_64_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 64)
-}
-
-func Benchmark_or_64_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 128)
-}
-
-func Benchmark_or_64_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 256)
-}
-
-func Benchmark_or_64_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 512)
-}
-
-func Benchmark_or_64_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 1024)
-}
-
-func Benchmark_or_64_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 8192)
-}
-
-func Benchmark_or_64_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 16384)
-}
-
-func Benchmark_or_64_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 32768)
-}
-
-func Benchmark_or_64_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 1024, 65536)
-}
-
-func Benchmark_or_64_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 64)
-}
-
-func Benchmark_or_64_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 128)
-}
-
-func Benchmark_or_64_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 256)
-}
-
-func Benchmark_or_64_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 512)
-}
-
-func Benchmark_or_64_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 1024)
-}
-
-func Benchmark_or_64_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 8192)
-}
-
-func Benchmark_or_64_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 16384)
-}
-
-func Benchmark_or_64_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 32768)
-}
-
-func Benchmark_or_64_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 8192, 65536)
-}
-
-func Benchmark_or_64_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 64)
-}
-
-func Benchmark_or_64_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 128)
-}
-
-func Benchmark_or_64_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 256)
-}
-
-func Benchmark_or_64_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 512)
-}
-
-func Benchmark_or_64_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 1024)
-}
-
-func Benchmark_or_64_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 8192)
-}
-
-func Benchmark_or_64_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 16384)
-}
-
-func Benchmark_or_64_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 32768)
-}
-
-func Benchmark_or_64_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 16384, 65536)
-}
-
-func Benchmark_or_64_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 64)
-}
-
-func Benchmark_or_64_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 128)
-}
-
-func Benchmark_or_64_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 256)
-}
-
-func Benchmark_or_64_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 512)
-}
-
-func Benchmark_or_64_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 1024)
-}
-
-func Benchmark_or_64_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 8192)
-}
-
-func Benchmark_or_64_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 16384)
-}
-
-func Benchmark_or_64_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 32768)
-}
-
-func Benchmark_or_64_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 32768, 65536)
-}
-
-func Benchmark_or_64_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 64)
-}
-
-func Benchmark_or_64_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 128)
-}
-
-func Benchmark_or_64_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 256)
-}
-
-func Benchmark_or_64_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 512)
-}
-
-func Benchmark_or_64_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 1024)
-}
-
-func Benchmark_or_64_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 8192)
-}
-
-func Benchmark_or_64_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 16384)
-}
-
-func Benchmark_or_64_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 32768)
-}
-
-func Benchmark_or_64_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 1024, 65536, 65536)
-}
-
-func Benchmark_or_64_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 64)
-}
-
-func Benchmark_or_64_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 128)
-}
-
-func Benchmark_or_64_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 256)
-}
-
-func Benchmark_or_64_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 512)
-}
-
-func Benchmark_or_64_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 1024)
-}
-
-func Benchmark_or_64_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 8192)
-}
-
-func Benchmark_or_64_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 16384)
-}
-
-func Benchmark_or_64_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 32768)
-}
-
-func Benchmark_or_64_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 64, 65536)
-}
-
-func Benchmark_or_64_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 64)
-}
-
-func Benchmark_or_64_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 128)
-}
-
-func Benchmark_or_64_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 256)
-}
-
-func Benchmark_or_64_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 512)
-}
-
-func Benchmark_or_64_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 1024)
-}
-
-func Benchmark_or_64_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 8192)
-}
-
-func Benchmark_or_64_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 16384)
-}
-
-func Benchmark_or_64_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 32768)
-}
-
-func Benchmark_or_64_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 128, 65536)
-}
-
-func Benchmark_or_64_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 64)
-}
-
-func Benchmark_or_64_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 128)
-}
-
-func Benchmark_or_64_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 256)
-}
-
-func Benchmark_or_64_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 512)
-}
-
-func Benchmark_or_64_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 1024)
-}
-
-func Benchmark_or_64_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 8192)
-}
-
-func Benchmark_or_64_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 16384)
-}
-
-func Benchmark_or_64_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 32768)
-}
-
-func Benchmark_or_64_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 256, 65536)
-}
-
-func Benchmark_or_64_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 64)
-}
-
-func Benchmark_or_64_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 128)
-}
-
-func Benchmark_or_64_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 256)
-}
-
-func Benchmark_or_64_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 512)
-}
-
-func Benchmark_or_64_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 1024)
-}
-
-func Benchmark_or_64_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 8192)
-}
-
-func Benchmark_or_64_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 16384)
-}
-
-func Benchmark_or_64_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 32768)
-}
-
-func Benchmark_or_64_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 512, 65536)
-}
-
-func Benchmark_or_64_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 64)
-}
-
-func Benchmark_or_64_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 128)
-}
-
-func Benchmark_or_64_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 256)
-}
-
-func Benchmark_or_64_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 512)
-}
-
-func Benchmark_or_64_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 1024)
-}
-
-func Benchmark_or_64_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 8192)
-}
-
-func Benchmark_or_64_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 16384)
-}
-
-func Benchmark_or_64_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 32768)
-}
-
-func Benchmark_or_64_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 1024, 65536)
-}
-
-func Benchmark_or_64_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 64)
-}
-
-func Benchmark_or_64_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 128)
-}
-
-func Benchmark_or_64_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 256)
-}
-
-func Benchmark_or_64_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 512)
-}
-
-func Benchmark_or_64_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 1024)
-}
-
-func Benchmark_or_64_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 8192)
-}
-
-func Benchmark_or_64_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 16384)
-}
-
-func Benchmark_or_64_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 32768)
-}
-
-func Benchmark_or_64_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 8192, 65536)
-}
-
-func Benchmark_or_64_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 64)
-}
-
-func Benchmark_or_64_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 128)
-}
-
-func Benchmark_or_64_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 256)
-}
-
-func Benchmark_or_64_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 512)
-}
-
-func Benchmark_or_64_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 1024)
-}
-
-func Benchmark_or_64_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 8192)
-}
-
-func Benchmark_or_64_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 16384)
-}
-
-func Benchmark_or_64_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 32768)
-}
-
-func Benchmark_or_64_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 16384, 65536)
-}
-
-func Benchmark_or_64_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 64)
-}
-
-func Benchmark_or_64_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 128)
-}
-
-func Benchmark_or_64_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 256)
-}
-
-func Benchmark_or_64_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 512)
-}
-
-func Benchmark_or_64_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 1024)
-}
-
-func Benchmark_or_64_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 8192)
-}
-
-func Benchmark_or_64_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 16384)
-}
-
-func Benchmark_or_64_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 32768)
-}
-
-func Benchmark_or_64_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 32768, 65536)
-}
-
-func Benchmark_or_64_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 64)
-}
-
-func Benchmark_or_64_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 128)
-}
-
-func Benchmark_or_64_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 256)
-}
-
-func Benchmark_or_64_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 512)
-}
-
-func Benchmark_or_64_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 1024)
-}
-
-func Benchmark_or_64_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 8192)
-}
-
-func Benchmark_or_64_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 16384)
-}
-
-func Benchmark_or_64_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 32768)
-}
-
-func Benchmark_or_64_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 64, 65536, 65536, 65536)
-}
-
-func Benchmark_or_1024_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 64)
-}
-
-func Benchmark_or_1024_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 128)
-}
-
-func Benchmark_or_1024_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 256)
-}
-
-func Benchmark_or_1024_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 512)
-}
-
-func Benchmark_or_1024_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 1024)
-}
-
-func Benchmark_or_1024_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 8192)
-}
-
-func Benchmark_or_1024_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 16384)
-}
-
-func Benchmark_or_1024_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 32768)
-}
-
-func Benchmark_or_1024_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 64, 65536)
-}
-
-func Benchmark_or_1024_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 64)
-}
-
-func Benchmark_or_1024_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 128)
-}
-
-func Benchmark_or_1024_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 256)
-}
-
-func Benchmark_or_1024_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 512)
-}
-
-func Benchmark_or_1024_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 1024)
-}
-
-func Benchmark_or_1024_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 8192)
-}
-
-func Benchmark_or_1024_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 16384)
-}
-
-func Benchmark_or_1024_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 32768)
-}
-
-func Benchmark_or_1024_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 128, 65536)
-}
-
-func Benchmark_or_1024_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 64)
-}
-
-func Benchmark_or_1024_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 128)
-}
-
-func Benchmark_or_1024_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 256)
-}
-
-func Benchmark_or_1024_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 512)
-}
-
-func Benchmark_or_1024_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 1024)
-}
-
-func Benchmark_or_1024_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 8192)
-}
-
-func Benchmark_or_1024_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 16384)
-}
-
-func Benchmark_or_1024_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 32768)
-}
-
-func Benchmark_or_1024_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 256, 65536)
-}
-
-func Benchmark_or_1024_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 64)
-}
-
-func Benchmark_or_1024_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 128)
-}
-
-func Benchmark_or_1024_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 256)
-}
-
-func Benchmark_or_1024_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 512)
-}
-
-func Benchmark_or_1024_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 1024)
-}
-
-func Benchmark_or_1024_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 8192)
-}
-
-func Benchmark_or_1024_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 16384)
-}
-
-func Benchmark_or_1024_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 32768)
-}
-
-func Benchmark_or_1024_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 512, 65536)
-}
-
-func Benchmark_or_1024_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 64)
-}
-
-func Benchmark_or_1024_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 128)
-}
-
-func Benchmark_or_1024_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 256)
-}
-
-func Benchmark_or_1024_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 512)
-}
-
-func Benchmark_or_1024_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 1024)
-}
-
-func Benchmark_or_1024_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 8192)
-}
-
-func Benchmark_or_1024_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 16384)
-}
-
-func Benchmark_or_1024_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 32768)
-}
-
-func Benchmark_or_1024_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 1024, 65536)
-}
-
-func Benchmark_or_1024_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 64)
-}
-
-func Benchmark_or_1024_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 128)
-}
-
-func Benchmark_or_1024_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 256)
-}
-
-func Benchmark_or_1024_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 512)
-}
-
-func Benchmark_or_1024_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 1024)
-}
-
-func Benchmark_or_1024_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 8192)
-}
-
-func Benchmark_or_1024_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 16384)
-}
-
-func Benchmark_or_1024_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 32768)
-}
-
-func Benchmark_or_1024_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 8192, 65536)
-}
-
-func Benchmark_or_1024_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 64)
-}
-
-func Benchmark_or_1024_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 128)
-}
-
-func Benchmark_or_1024_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 256)
-}
-
-func Benchmark_or_1024_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 512)
-}
-
-func Benchmark_or_1024_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 1024)
-}
-
-func Benchmark_or_1024_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 8192)
-}
-
-func Benchmark_or_1024_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 16384)
-}
-
-func Benchmark_or_1024_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 32768)
-}
-
-func Benchmark_or_1024_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 16384, 65536)
-}
-
-func Benchmark_or_1024_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 64)
-}
-
-func Benchmark_or_1024_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 128)
-}
-
-func Benchmark_or_1024_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 256)
-}
-
-func Benchmark_or_1024_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 512)
-}
-
-func Benchmark_or_1024_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 1024)
-}
-
-func Benchmark_or_1024_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 8192)
-}
-
-func Benchmark_or_1024_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 16384)
-}
-
-func Benchmark_or_1024_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 32768)
-}
-
-func Benchmark_or_1024_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 32768, 65536)
-}
-
-func Benchmark_or_1024_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 64)
-}
-
-func Benchmark_or_1024_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 128)
-}
-
-func Benchmark_or_1024_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 256)
-}
-
-func Benchmark_or_1024_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 512)
-}
-
-func Benchmark_or_1024_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 1024)
-}
-
-func Benchmark_or_1024_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 8192)
-}
-
-func Benchmark_or_1024_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 16384)
-}
-
-func Benchmark_or_1024_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 32768)
-}
-
-func Benchmark_or_1024_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 64, 65536, 65536)
-}
-
-func Benchmark_or_1024_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 64)
-}
-
-func Benchmark_or_1024_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 128)
-}
-
-func Benchmark_or_1024_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 256)
-}
-
-func Benchmark_or_1024_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 512)
-}
-
-func Benchmark_or_1024_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 1024)
-}
-
-func Benchmark_or_1024_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 8192)
-}
-
-func Benchmark_or_1024_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 16384)
-}
-
-func Benchmark_or_1024_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 32768)
-}
-
-func Benchmark_or_1024_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 64, 65536)
-}
-
-func Benchmark_or_1024_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 64)
-}
-
-func Benchmark_or_1024_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 128)
-}
-
-func Benchmark_or_1024_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 256)
-}
-
-func Benchmark_or_1024_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 512)
-}
-
-func Benchmark_or_1024_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 1024)
-}
-
-func Benchmark_or_1024_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 8192)
-}
-
-func Benchmark_or_1024_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 16384)
-}
-
-func Benchmark_or_1024_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 32768)
-}
-
-func Benchmark_or_1024_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 128, 65536)
-}
-
-func Benchmark_or_1024_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 64)
-}
-
-func Benchmark_or_1024_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 128)
-}
-
-func Benchmark_or_1024_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 256)
-}
-
-func Benchmark_or_1024_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 512)
-}
-
-func Benchmark_or_1024_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 1024)
-}
-
-func Benchmark_or_1024_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 8192)
-}
-
-func Benchmark_or_1024_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 16384)
-}
-
-func Benchmark_or_1024_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 32768)
-}
-
-func Benchmark_or_1024_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 256, 65536)
-}
-
-func Benchmark_or_1024_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 64)
-}
-
-func Benchmark_or_1024_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 128)
-}
-
-func Benchmark_or_1024_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 256)
-}
-
-func Benchmark_or_1024_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 512)
-}
-
-func Benchmark_or_1024_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 1024)
-}
-
-func Benchmark_or_1024_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 8192)
-}
-
-func Benchmark_or_1024_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 16384)
-}
-
-func Benchmark_or_1024_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 32768)
-}
-
-func Benchmark_or_1024_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 512, 65536)
-}
-
-func Benchmark_or_1024_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 64)
-}
-
-func Benchmark_or_1024_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 128)
-}
-
-func Benchmark_or_1024_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 256)
-}
-
-func Benchmark_or_1024_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 512)
-}
-
-func Benchmark_or_1024_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 1024)
-}
-
-func Benchmark_or_1024_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 8192)
-}
-
-func Benchmark_or_1024_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 16384)
-}
-
-func Benchmark_or_1024_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 32768)
-}
-
-func Benchmark_or_1024_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 1024, 65536)
-}
-
-func Benchmark_or_1024_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 64)
-}
-
-func Benchmark_or_1024_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 128)
-}
-
-func Benchmark_or_1024_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 256)
-}
-
-func Benchmark_or_1024_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 512)
-}
-
-func Benchmark_or_1024_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 1024)
-}
-
-func Benchmark_or_1024_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 8192)
-}
-
-func Benchmark_or_1024_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 16384)
-}
-
-func Benchmark_or_1024_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 32768)
-}
-
-func Benchmark_or_1024_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 8192, 65536)
-}
-
-func Benchmark_or_1024_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 64)
-}
-
-func Benchmark_or_1024_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 128)
-}
-
-func Benchmark_or_1024_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 256)
-}
-
-func Benchmark_or_1024_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 512)
-}
-
-func Benchmark_or_1024_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 1024)
-}
-
-func Benchmark_or_1024_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 8192)
-}
-
-func Benchmark_or_1024_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 16384)
-}
-
-func Benchmark_or_1024_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 32768)
-}
-
-func Benchmark_or_1024_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 16384, 65536)
-}
-
-func Benchmark_or_1024_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 64)
-}
-
-func Benchmark_or_1024_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 128)
-}
-
-func Benchmark_or_1024_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 256)
-}
-
-func Benchmark_or_1024_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 512)
-}
-
-func Benchmark_or_1024_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 1024)
-}
-
-func Benchmark_or_1024_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 8192)
-}
-
-func Benchmark_or_1024_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 16384)
-}
-
-func Benchmark_or_1024_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 32768)
-}
-
-func Benchmark_or_1024_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 32768, 65536)
-}
-
-func Benchmark_or_1024_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 64)
-}
-
-func Benchmark_or_1024_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 128)
-}
-
-func Benchmark_or_1024_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 256)
-}
-
-func Benchmark_or_1024_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 512)
-}
-
-func Benchmark_or_1024_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 1024)
-}
-
-func Benchmark_or_1024_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 8192)
-}
-
-func Benchmark_or_1024_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 16384)
-}
-
-func Benchmark_or_1024_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 32768)
-}
-
-func Benchmark_or_1024_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 1024, 65536, 65536)
-}
-
-func Benchmark_or_1024_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 64)
-}
-
-func Benchmark_or_1024_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 128)
-}
-
-func Benchmark_or_1024_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 256)
-}
-
-func Benchmark_or_1024_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 512)
-}
-
-func Benchmark_or_1024_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 1024)
-}
-
-func Benchmark_or_1024_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 8192)
-}
-
-func Benchmark_or_1024_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 16384)
-}
-
-func Benchmark_or_1024_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 32768)
-}
-
-func Benchmark_or_1024_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 64, 65536)
-}
-
-func Benchmark_or_1024_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 64)
-}
-
-func Benchmark_or_1024_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 128)
-}
-
-func Benchmark_or_1024_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 256)
-}
-
-func Benchmark_or_1024_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 512)
-}
-
-func Benchmark_or_1024_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 1024)
-}
-
-func Benchmark_or_1024_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 8192)
-}
-
-func Benchmark_or_1024_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 16384)
-}
-
-func Benchmark_or_1024_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 32768)
-}
-
-func Benchmark_or_1024_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 128, 65536)
-}
-
-func Benchmark_or_1024_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 64)
-}
-
-func Benchmark_or_1024_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 128)
-}
-
-func Benchmark_or_1024_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 256)
-}
-
-func Benchmark_or_1024_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 512)
-}
-
-func Benchmark_or_1024_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 1024)
-}
-
-func Benchmark_or_1024_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 8192)
-}
-
-func Benchmark_or_1024_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 16384)
-}
-
-func Benchmark_or_1024_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 32768)
-}
-
-func Benchmark_or_1024_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 256, 65536)
-}
-
-func Benchmark_or_1024_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 64)
-}
-
-func Benchmark_or_1024_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 128)
-}
-
-func Benchmark_or_1024_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 256)
-}
-
-func Benchmark_or_1024_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 512)
-}
-
-func Benchmark_or_1024_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 1024)
-}
-
-func Benchmark_or_1024_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 8192)
-}
-
-func Benchmark_or_1024_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 16384)
-}
-
-func Benchmark_or_1024_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 32768)
-}
-
-func Benchmark_or_1024_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 512, 65536)
-}
-
-func Benchmark_or_1024_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 64)
-}
-
-func Benchmark_or_1024_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 128)
-}
-
-func Benchmark_or_1024_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 256)
-}
-
-func Benchmark_or_1024_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 512)
-}
-
-func Benchmark_or_1024_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 1024)
-}
-
-func Benchmark_or_1024_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 8192)
-}
-
-func Benchmark_or_1024_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 16384)
-}
-
-func Benchmark_or_1024_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 32768)
-}
-
-func Benchmark_or_1024_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 1024, 65536)
-}
-
-func Benchmark_or_1024_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 64)
-}
-
-func Benchmark_or_1024_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 128)
-}
-
-func Benchmark_or_1024_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 256)
-}
-
-func Benchmark_or_1024_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 512)
-}
-
-func Benchmark_or_1024_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 1024)
-}
-
-func Benchmark_or_1024_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 8192)
-}
-
-func Benchmark_or_1024_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 16384)
-}
-
-func Benchmark_or_1024_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 32768)
-}
-
-func Benchmark_or_1024_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 8192, 65536)
-}
-
-func Benchmark_or_1024_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 64)
-}
-
-func Benchmark_or_1024_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 128)
-}
-
-func Benchmark_or_1024_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 256)
-}
-
-func Benchmark_or_1024_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 512)
-}
-
-func Benchmark_or_1024_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 1024)
-}
-
-func Benchmark_or_1024_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 8192)
-}
-
-func Benchmark_or_1024_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 16384)
-}
-
-func Benchmark_or_1024_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 32768)
-}
-
-func Benchmark_or_1024_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 16384, 65536)
-}
-
-func Benchmark_or_1024_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 64)
-}
-
-func Benchmark_or_1024_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 128)
-}
-
-func Benchmark_or_1024_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 256)
-}
-
-func Benchmark_or_1024_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 512)
-}
-
-func Benchmark_or_1024_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 1024)
-}
-
-func Benchmark_or_1024_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 8192)
-}
-
-func Benchmark_or_1024_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 16384)
-}
-
-func Benchmark_or_1024_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 32768)
-}
-
-func Benchmark_or_1024_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 32768, 65536)
-}
-
-func Benchmark_or_1024_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 64)
-}
-
-func Benchmark_or_1024_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 128)
-}
-
-func Benchmark_or_1024_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 256)
-}
-
-func Benchmark_or_1024_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 512)
-}
-
-func Benchmark_or_1024_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 1024)
-}
-
-func Benchmark_or_1024_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 8192)
-}
-
-func Benchmark_or_1024_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 16384)
-}
-
-func Benchmark_or_1024_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 32768)
-}
-
-func Benchmark_or_1024_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 1024, 65536, 65536, 65536)
-}
-
-func Benchmark_or_65536_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 64)
-}
-
-func Benchmark_or_65536_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 128)
-}
-
-func Benchmark_or_65536_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 256)
-}
-
-func Benchmark_or_65536_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 512)
-}
-
-func Benchmark_or_65536_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 1024)
-}
-
-func Benchmark_or_65536_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 8192)
-}
-
-func Benchmark_or_65536_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 16384)
-}
-
-func Benchmark_or_65536_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 32768)
-}
-
-func Benchmark_or_65536_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 64, 65536)
-}
-
-func Benchmark_or_65536_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 64)
-}
-
-func Benchmark_or_65536_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 128)
-}
-
-func Benchmark_or_65536_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 256)
-}
-
-func Benchmark_or_65536_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 512)
-}
-
-func Benchmark_or_65536_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 1024)
-}
-
-func Benchmark_or_65536_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 8192)
-}
-
-func Benchmark_or_65536_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 16384)
-}
-
-func Benchmark_or_65536_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 32768)
-}
-
-func Benchmark_or_65536_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 128, 65536)
-}
-
-func Benchmark_or_65536_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 64)
-}
-
-func Benchmark_or_65536_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 128)
-}
-
-func Benchmark_or_65536_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 256)
-}
-
-func Benchmark_or_65536_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 512)
-}
-
-func Benchmark_or_65536_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 1024)
-}
-
-func Benchmark_or_65536_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 8192)
-}
-
-func Benchmark_or_65536_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 16384)
-}
-
-func Benchmark_or_65536_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 32768)
-}
-
-func Benchmark_or_65536_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 256, 65536)
-}
-
-func Benchmark_or_65536_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 64)
-}
-
-func Benchmark_or_65536_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 128)
-}
-
-func Benchmark_or_65536_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 256)
-}
-
-func Benchmark_or_65536_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 512)
-}
-
-func Benchmark_or_65536_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 1024)
-}
-
-func Benchmark_or_65536_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 8192)
-}
-
-func Benchmark_or_65536_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 16384)
-}
-
-func Benchmark_or_65536_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 32768)
-}
-
-func Benchmark_or_65536_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 512, 65536)
-}
-
-func Benchmark_or_65536_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 64)
-}
-
-func Benchmark_or_65536_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 128)
-}
-
-func Benchmark_or_65536_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 256)
-}
-
-func Benchmark_or_65536_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 512)
-}
-
-func Benchmark_or_65536_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 1024)
-}
-
-func Benchmark_or_65536_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 8192)
-}
-
-func Benchmark_or_65536_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 16384)
-}
-
-func Benchmark_or_65536_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 32768)
-}
-
-func Benchmark_or_65536_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 1024, 65536)
-}
-
-func Benchmark_or_65536_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 64)
-}
-
-func Benchmark_or_65536_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 128)
-}
-
-func Benchmark_or_65536_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 256)
-}
-
-func Benchmark_or_65536_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 512)
-}
-
-func Benchmark_or_65536_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 1024)
-}
-
-func Benchmark_or_65536_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 8192)
-}
-
-func Benchmark_or_65536_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 16384)
-}
-
-func Benchmark_or_65536_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 32768)
-}
-
-func Benchmark_or_65536_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 8192, 65536)
-}
-
-func Benchmark_or_65536_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 64)
-}
-
-func Benchmark_or_65536_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 128)
-}
-
-func Benchmark_or_65536_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 256)
-}
-
-func Benchmark_or_65536_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 512)
-}
-
-func Benchmark_or_65536_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 1024)
-}
-
-func Benchmark_or_65536_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 8192)
-}
-
-func Benchmark_or_65536_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 16384)
-}
-
-func Benchmark_or_65536_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 32768)
-}
-
-func Benchmark_or_65536_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 16384, 65536)
-}
-
-func Benchmark_or_65536_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 64)
-}
-
-func Benchmark_or_65536_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 128)
-}
-
-func Benchmark_or_65536_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 256)
-}
-
-func Benchmark_or_65536_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 512)
-}
-
-func Benchmark_or_65536_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 1024)
-}
-
-func Benchmark_or_65536_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 8192)
-}
-
-func Benchmark_or_65536_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 16384)
-}
-
-func Benchmark_or_65536_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 32768)
-}
-
-func Benchmark_or_65536_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 32768, 65536)
-}
-
-func Benchmark_or_65536_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 64)
-}
-
-func Benchmark_or_65536_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 128)
-}
-
-func Benchmark_or_65536_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 256)
-}
-
-func Benchmark_or_65536_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 512)
-}
-
-func Benchmark_or_65536_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 1024)
-}
-
-func Benchmark_or_65536_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 8192)
-}
-
-func Benchmark_or_65536_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 16384)
-}
-
-func Benchmark_or_65536_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 32768)
-}
-
-func Benchmark_or_65536_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 64, 65536, 65536)
-}
-
-func Benchmark_or_65536_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 64)
-}
-
-func Benchmark_or_65536_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 128)
-}
-
-func Benchmark_or_65536_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 256)
-}
-
-func Benchmark_or_65536_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 512)
-}
-
-func Benchmark_or_65536_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 1024)
-}
-
-func Benchmark_or_65536_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 8192)
-}
-
-func Benchmark_or_65536_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 16384)
-}
-
-func Benchmark_or_65536_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 32768)
-}
-
-func Benchmark_or_65536_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 64, 65536)
-}
-
-func Benchmark_or_65536_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 64)
-}
-
-func Benchmark_or_65536_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 128)
-}
-
-func Benchmark_or_65536_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 256)
-}
-
-func Benchmark_or_65536_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 512)
-}
-
-func Benchmark_or_65536_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 1024)
-}
-
-func Benchmark_or_65536_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 8192)
-}
-
-func Benchmark_or_65536_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 16384)
-}
-
-func Benchmark_or_65536_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 32768)
-}
-
-func Benchmark_or_65536_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 128, 65536)
-}
-
-func Benchmark_or_65536_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 64)
-}
-
-func Benchmark_or_65536_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 128)
-}
-
-func Benchmark_or_65536_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 256)
-}
-
-func Benchmark_or_65536_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 512)
-}
-
-func Benchmark_or_65536_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 1024)
-}
-
-func Benchmark_or_65536_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 8192)
-}
-
-func Benchmark_or_65536_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 16384)
-}
-
-func Benchmark_or_65536_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 32768)
-}
-
-func Benchmark_or_65536_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 256, 65536)
-}
-
-func Benchmark_or_65536_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 64)
-}
-
-func Benchmark_or_65536_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 128)
-}
-
-func Benchmark_or_65536_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 256)
-}
-
-func Benchmark_or_65536_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 512)
-}
-
-func Benchmark_or_65536_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 1024)
-}
-
-func Benchmark_or_65536_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 8192)
-}
-
-func Benchmark_or_65536_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 16384)
-}
-
-func Benchmark_or_65536_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 32768)
-}
-
-func Benchmark_or_65536_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 512, 65536)
-}
-
-func Benchmark_or_65536_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 64)
-}
-
-func Benchmark_or_65536_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 128)
-}
-
-func Benchmark_or_65536_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 256)
-}
-
-func Benchmark_or_65536_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 512)
-}
-
-func Benchmark_or_65536_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 1024)
-}
-
-func Benchmark_or_65536_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 8192)
-}
-
-func Benchmark_or_65536_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 16384)
-}
-
-func Benchmark_or_65536_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 32768)
-}
-
-func Benchmark_or_65536_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 1024, 65536)
-}
-
-func Benchmark_or_65536_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 64)
-}
-
-func Benchmark_or_65536_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 128)
-}
-
-func Benchmark_or_65536_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 256)
-}
-
-func Benchmark_or_65536_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 512)
-}
-
-func Benchmark_or_65536_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 1024)
-}
-
-func Benchmark_or_65536_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 8192)
-}
-
-func Benchmark_or_65536_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 16384)
-}
-
-func Benchmark_or_65536_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 32768)
-}
-
-func Benchmark_or_65536_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 8192, 65536)
-}
-
-func Benchmark_or_65536_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 64)
-}
-
-func Benchmark_or_65536_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 128)
-}
-
-func Benchmark_or_65536_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 256)
-}
-
-func Benchmark_or_65536_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 512)
-}
-
-func Benchmark_or_65536_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 1024)
-}
-
-func Benchmark_or_65536_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 8192)
-}
-
-func Benchmark_or_65536_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 16384)
-}
-
-func Benchmark_or_65536_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 32768)
-}
-
-func Benchmark_or_65536_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 16384, 65536)
-}
-
-func Benchmark_or_65536_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 64)
-}
-
-func Benchmark_or_65536_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 128)
-}
-
-func Benchmark_or_65536_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 256)
-}
-
-func Benchmark_or_65536_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 512)
-}
-
-func Benchmark_or_65536_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 1024)
-}
-
-func Benchmark_or_65536_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 8192)
-}
-
-func Benchmark_or_65536_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 16384)
-}
-
-func Benchmark_or_65536_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 32768)
-}
-
-func Benchmark_or_65536_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 32768, 65536)
-}
-
-func Benchmark_or_65536_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 64)
-}
-
-func Benchmark_or_65536_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 128)
-}
-
-func Benchmark_or_65536_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 256)
-}
-
-func Benchmark_or_65536_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 512)
-}
-
-func Benchmark_or_65536_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 1024)
-}
-
-func Benchmark_or_65536_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 8192)
-}
-
-func Benchmark_or_65536_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 16384)
-}
-
-func Benchmark_or_65536_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 32768)
-}
-
-func Benchmark_or_65536_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 1024, 65536, 65536)
-}
-
-func Benchmark_or_65536_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 64)
-}
-
-func Benchmark_or_65536_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 128)
-}
-
-func Benchmark_or_65536_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 256)
-}
-
-func Benchmark_or_65536_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 512)
-}
-
-func Benchmark_or_65536_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 1024)
-}
-
-func Benchmark_or_65536_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 8192)
-}
-
-func Benchmark_or_65536_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 16384)
-}
-
-func Benchmark_or_65536_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 32768)
-}
-
-func Benchmark_or_65536_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 64, 65536)
-}
-
-func Benchmark_or_65536_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 64)
-}
-
-func Benchmark_or_65536_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 128)
-}
-
-func Benchmark_or_65536_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 256)
-}
-
-func Benchmark_or_65536_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 512)
-}
-
-func Benchmark_or_65536_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 1024)
-}
-
-func Benchmark_or_65536_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 8192)
-}
-
-func Benchmark_or_65536_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 16384)
-}
-
-func Benchmark_or_65536_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 32768)
-}
-
-func Benchmark_or_65536_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 128, 65536)
-}
-
-func Benchmark_or_65536_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 64)
-}
-
-func Benchmark_or_65536_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 128)
-}
-
-func Benchmark_or_65536_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 256)
-}
-
-func Benchmark_or_65536_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 512)
-}
-
-func Benchmark_or_65536_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 1024)
-}
-
-func Benchmark_or_65536_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 8192)
-}
-
-func Benchmark_or_65536_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 16384)
-}
-
-func Benchmark_or_65536_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 32768)
-}
-
-func Benchmark_or_65536_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 256, 65536)
-}
-
-func Benchmark_or_65536_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 64)
-}
-
-func Benchmark_or_65536_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 128)
-}
-
-func Benchmark_or_65536_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 256)
-}
-
-func Benchmark_or_65536_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 512)
-}
-
-func Benchmark_or_65536_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 1024)
-}
-
-func Benchmark_or_65536_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 8192)
-}
-
-func Benchmark_or_65536_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 16384)
-}
-
-func Benchmark_or_65536_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 32768)
-}
-
-func Benchmark_or_65536_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 512, 65536)
-}
-
-func Benchmark_or_65536_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 64)
-}
-
-func Benchmark_or_65536_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 128)
-}
-
-func Benchmark_or_65536_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 256)
-}
-
-func Benchmark_or_65536_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 512)
-}
-
-func Benchmark_or_65536_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 1024)
-}
-
-func Benchmark_or_65536_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 8192)
-}
-
-func Benchmark_or_65536_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 16384)
-}
-
-func Benchmark_or_65536_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 32768)
-}
-
-func Benchmark_or_65536_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 1024, 65536)
-}
-
-func Benchmark_or_65536_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 64)
-}
-
-func Benchmark_or_65536_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 128)
-}
-
-func Benchmark_or_65536_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 256)
-}
-
-func Benchmark_or_65536_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 512)
-}
-
-func Benchmark_or_65536_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 1024)
-}
-
-func Benchmark_or_65536_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 8192)
-}
-
-func Benchmark_or_65536_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 16384)
-}
-
-func Benchmark_or_65536_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 32768)
-}
-
-func Benchmark_or_65536_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 8192, 65536)
-}
-
-func Benchmark_or_65536_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 64)
-}
-
-func Benchmark_or_65536_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 128)
-}
-
-func Benchmark_or_65536_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 256)
-}
-
-func Benchmark_or_65536_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 512)
-}
-
-func Benchmark_or_65536_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 1024)
-}
-
-func Benchmark_or_65536_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 8192)
-}
-
-func Benchmark_or_65536_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 16384)
-}
-
-func Benchmark_or_65536_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 32768)
-}
-
-func Benchmark_or_65536_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 16384, 65536)
-}
-
-func Benchmark_or_65536_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 64)
-}
-
-func Benchmark_or_65536_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 128)
-}
-
-func Benchmark_or_65536_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 256)
-}
-
-func Benchmark_or_65536_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 512)
-}
-
-func Benchmark_or_65536_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 1024)
-}
-
-func Benchmark_or_65536_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 8192)
-}
-
-func Benchmark_or_65536_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 16384)
-}
-
-func Benchmark_or_65536_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 32768)
-}
-
-func Benchmark_or_65536_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 32768, 65536)
-}
-
-func Benchmark_or_65536_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 64)
-}
-
-func Benchmark_or_65536_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 128)
-}
-
-func Benchmark_or_65536_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 256)
-}
-
-func Benchmark_or_65536_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 512)
-}
-
-func Benchmark_or_65536_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 1024)
-}
-
-func Benchmark_or_65536_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 8192)
-}
-
-func Benchmark_or_65536_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 16384)
-}
-
-func Benchmark_or_65536_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 32768)
-}
-
-func Benchmark_or_65536_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "or", 65536, 65536, 65536, 65536)
-}
-
-func Benchmark_diff_64_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 64)
-}
-
-func Benchmark_diff_64_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 128)
-}
-
-func Benchmark_diff_64_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 256)
-}
-
-func Benchmark_diff_64_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 512)
-}
-
-func Benchmark_diff_64_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 1024)
-}
-
-func Benchmark_diff_64_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 8192)
-}
-
-func Benchmark_diff_64_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 16384)
-}
-
-func Benchmark_diff_64_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 32768)
-}
-
-func Benchmark_diff_64_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 64, 65536)
-}
-
-func Benchmark_diff_64_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 64)
-}
-
-func Benchmark_diff_64_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 128)
-}
-
-func Benchmark_diff_64_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 256)
-}
-
-func Benchmark_diff_64_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 512)
-}
-
-func Benchmark_diff_64_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 1024)
-}
-
-func Benchmark_diff_64_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 8192)
-}
-
-func Benchmark_diff_64_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 16384)
-}
-
-func Benchmark_diff_64_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 32768)
-}
-
-func Benchmark_diff_64_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 128, 65536)
-}
-
-func Benchmark_diff_64_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 64)
-}
-
-func Benchmark_diff_64_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 128)
-}
-
-func Benchmark_diff_64_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 256)
-}
-
-func Benchmark_diff_64_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 512)
-}
-
-func Benchmark_diff_64_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 1024)
-}
-
-func Benchmark_diff_64_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 8192)
-}
-
-func Benchmark_diff_64_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 16384)
-}
-
-func Benchmark_diff_64_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 32768)
-}
-
-func Benchmark_diff_64_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 256, 65536)
-}
-
-func Benchmark_diff_64_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 64)
-}
-
-func Benchmark_diff_64_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 128)
-}
-
-func Benchmark_diff_64_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 256)
-}
-
-func Benchmark_diff_64_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 512)
-}
-
-func Benchmark_diff_64_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 1024)
-}
-
-func Benchmark_diff_64_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 8192)
-}
-
-func Benchmark_diff_64_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 16384)
-}
-
-func Benchmark_diff_64_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 32768)
-}
-
-func Benchmark_diff_64_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 512, 65536)
-}
-
-func Benchmark_diff_64_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 64)
-}
-
-func Benchmark_diff_64_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 128)
-}
-
-func Benchmark_diff_64_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 256)
-}
-
-func Benchmark_diff_64_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 512)
-}
-
-func Benchmark_diff_64_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 1024)
-}
-
-func Benchmark_diff_64_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 8192)
-}
-
-func Benchmark_diff_64_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 16384)
-}
-
-func Benchmark_diff_64_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 32768)
-}
-
-func Benchmark_diff_64_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 1024, 65536)
-}
-
-func Benchmark_diff_64_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 64)
-}
-
-func Benchmark_diff_64_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 128)
-}
-
-func Benchmark_diff_64_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 256)
-}
-
-func Benchmark_diff_64_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 512)
-}
-
-func Benchmark_diff_64_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 1024)
-}
-
-func Benchmark_diff_64_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 8192)
-}
-
-func Benchmark_diff_64_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 16384)
-}
-
-func Benchmark_diff_64_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 32768)
-}
-
-func Benchmark_diff_64_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 8192, 65536)
-}
-
-func Benchmark_diff_64_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 64)
-}
-
-func Benchmark_diff_64_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 128)
-}
-
-func Benchmark_diff_64_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 256)
-}
-
-func Benchmark_diff_64_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 512)
-}
-
-func Benchmark_diff_64_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 1024)
-}
-
-func Benchmark_diff_64_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 8192)
-}
-
-func Benchmark_diff_64_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 16384)
-}
-
-func Benchmark_diff_64_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 32768)
-}
-
-func Benchmark_diff_64_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 16384, 65536)
-}
-
-func Benchmark_diff_64_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 64)
-}
-
-func Benchmark_diff_64_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 128)
-}
-
-func Benchmark_diff_64_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 256)
-}
-
-func Benchmark_diff_64_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 512)
-}
-
-func Benchmark_diff_64_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 1024)
-}
-
-func Benchmark_diff_64_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 8192)
-}
-
-func Benchmark_diff_64_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 16384)
-}
-
-func Benchmark_diff_64_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 32768)
-}
-
-func Benchmark_diff_64_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 32768, 65536)
-}
-
-func Benchmark_diff_64_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 64)
-}
-
-func Benchmark_diff_64_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 128)
-}
-
-func Benchmark_diff_64_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 256)
-}
-
-func Benchmark_diff_64_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 512)
-}
-
-func Benchmark_diff_64_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 1024)
-}
-
-func Benchmark_diff_64_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 8192)
-}
-
-func Benchmark_diff_64_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 16384)
-}
-
-func Benchmark_diff_64_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 32768)
-}
-
-func Benchmark_diff_64_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 64, 65536, 65536)
-}
-
-func Benchmark_diff_64_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 64)
-}
-
-func Benchmark_diff_64_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 128)
-}
-
-func Benchmark_diff_64_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 256)
-}
-
-func Benchmark_diff_64_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 512)
-}
-
-func Benchmark_diff_64_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 1024)
-}
-
-func Benchmark_diff_64_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 8192)
-}
-
-func Benchmark_diff_64_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 16384)
-}
-
-func Benchmark_diff_64_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 32768)
-}
-
-func Benchmark_diff_64_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 64, 65536)
-}
-
-func Benchmark_diff_64_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 64)
-}
-
-func Benchmark_diff_64_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 128)
-}
-
-func Benchmark_diff_64_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 256)
-}
-
-func Benchmark_diff_64_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 512)
-}
-
-func Benchmark_diff_64_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 1024)
-}
-
-func Benchmark_diff_64_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 8192)
-}
-
-func Benchmark_diff_64_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 16384)
-}
-
-func Benchmark_diff_64_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 32768)
-}
-
-func Benchmark_diff_64_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 128, 65536)
-}
-
-func Benchmark_diff_64_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 64)
-}
-
-func Benchmark_diff_64_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 128)
-}
-
-func Benchmark_diff_64_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 256)
-}
-
-func Benchmark_diff_64_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 512)
-}
-
-func Benchmark_diff_64_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 1024)
-}
-
-func Benchmark_diff_64_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 8192)
-}
-
-func Benchmark_diff_64_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 16384)
-}
-
-func Benchmark_diff_64_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 32768)
-}
-
-func Benchmark_diff_64_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 256, 65536)
-}
-
-func Benchmark_diff_64_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 64)
-}
-
-func Benchmark_diff_64_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 128)
-}
-
-func Benchmark_diff_64_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 256)
-}
-
-func Benchmark_diff_64_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 512)
-}
-
-func Benchmark_diff_64_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 1024)
-}
-
-func Benchmark_diff_64_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 8192)
-}
-
-func Benchmark_diff_64_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 16384)
-}
-
-func Benchmark_diff_64_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 32768)
-}
-
-func Benchmark_diff_64_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 512, 65536)
-}
-
-func Benchmark_diff_64_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 64)
-}
-
-func Benchmark_diff_64_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 128)
-}
-
-func Benchmark_diff_64_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 256)
-}
-
-func Benchmark_diff_64_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 512)
-}
-
-func Benchmark_diff_64_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 1024)
-}
-
-func Benchmark_diff_64_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 8192)
-}
-
-func Benchmark_diff_64_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 16384)
-}
-
-func Benchmark_diff_64_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 32768)
-}
-
-func Benchmark_diff_64_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 1024, 65536)
-}
-
-func Benchmark_diff_64_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 64)
-}
-
-func Benchmark_diff_64_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 128)
-}
-
-func Benchmark_diff_64_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 256)
-}
-
-func Benchmark_diff_64_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 512)
-}
-
-func Benchmark_diff_64_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 1024)
-}
-
-func Benchmark_diff_64_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 8192)
-}
-
-func Benchmark_diff_64_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 16384)
-}
-
-func Benchmark_diff_64_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 32768)
-}
-
-func Benchmark_diff_64_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 8192, 65536)
-}
-
-func Benchmark_diff_64_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 64)
-}
-
-func Benchmark_diff_64_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 128)
-}
-
-func Benchmark_diff_64_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 256)
-}
-
-func Benchmark_diff_64_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 512)
-}
-
-func Benchmark_diff_64_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 1024)
-}
-
-func Benchmark_diff_64_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 8192)
-}
-
-func Benchmark_diff_64_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 16384)
-}
-
-func Benchmark_diff_64_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 32768)
-}
-
-func Benchmark_diff_64_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 16384, 65536)
-}
-
-func Benchmark_diff_64_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 64)
-}
-
-func Benchmark_diff_64_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 128)
-}
-
-func Benchmark_diff_64_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 256)
-}
-
-func Benchmark_diff_64_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 512)
-}
-
-func Benchmark_diff_64_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 1024)
-}
-
-func Benchmark_diff_64_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 8192)
-}
-
-func Benchmark_diff_64_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 16384)
-}
-
-func Benchmark_diff_64_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 32768)
-}
-
-func Benchmark_diff_64_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 32768, 65536)
-}
-
-func Benchmark_diff_64_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 64)
-}
-
-func Benchmark_diff_64_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 128)
-}
-
-func Benchmark_diff_64_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 256)
-}
-
-func Benchmark_diff_64_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 512)
-}
-
-func Benchmark_diff_64_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 1024)
-}
-
-func Benchmark_diff_64_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 8192)
-}
-
-func Benchmark_diff_64_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 16384)
-}
-
-func Benchmark_diff_64_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 32768)
-}
-
-func Benchmark_diff_64_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 1024, 65536, 65536)
-}
-
-func Benchmark_diff_64_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 64)
-}
-
-func Benchmark_diff_64_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 128)
-}
-
-func Benchmark_diff_64_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 256)
-}
-
-func Benchmark_diff_64_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 512)
-}
-
-func Benchmark_diff_64_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 1024)
-}
-
-func Benchmark_diff_64_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 8192)
-}
-
-func Benchmark_diff_64_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 16384)
-}
-
-func Benchmark_diff_64_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 32768)
-}
-
-func Benchmark_diff_64_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 64, 65536)
-}
-
-func Benchmark_diff_64_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 64)
-}
-
-func Benchmark_diff_64_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 128)
-}
-
-func Benchmark_diff_64_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 256)
-}
-
-func Benchmark_diff_64_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 512)
-}
-
-func Benchmark_diff_64_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 1024)
-}
-
-func Benchmark_diff_64_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 8192)
-}
-
-func Benchmark_diff_64_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 16384)
-}
-
-func Benchmark_diff_64_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 32768)
-}
-
-func Benchmark_diff_64_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 128, 65536)
-}
-
-func Benchmark_diff_64_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 64)
-}
-
-func Benchmark_diff_64_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 128)
-}
-
-func Benchmark_diff_64_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 256)
-}
-
-func Benchmark_diff_64_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 512)
-}
-
-func Benchmark_diff_64_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 1024)
-}
-
-func Benchmark_diff_64_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 8192)
-}
-
-func Benchmark_diff_64_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 16384)
-}
-
-func Benchmark_diff_64_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 32768)
-}
-
-func Benchmark_diff_64_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 256, 65536)
-}
-
-func Benchmark_diff_64_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 64)
-}
-
-func Benchmark_diff_64_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 128)
-}
-
-func Benchmark_diff_64_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 256)
-}
-
-func Benchmark_diff_64_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 512)
-}
-
-func Benchmark_diff_64_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 1024)
-}
-
-func Benchmark_diff_64_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 8192)
-}
-
-func Benchmark_diff_64_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 16384)
-}
-
-func Benchmark_diff_64_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 32768)
-}
-
-func Benchmark_diff_64_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 512, 65536)
-}
-
-func Benchmark_diff_64_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 64)
-}
-
-func Benchmark_diff_64_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 128)
-}
-
-func Benchmark_diff_64_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 256)
-}
-
-func Benchmark_diff_64_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 512)
-}
-
-func Benchmark_diff_64_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 1024)
-}
-
-func Benchmark_diff_64_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 8192)
-}
-
-func Benchmark_diff_64_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 16384)
-}
-
-func Benchmark_diff_64_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 32768)
-}
-
-func Benchmark_diff_64_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 1024, 65536)
-}
-
-func Benchmark_diff_64_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 64)
-}
-
-func Benchmark_diff_64_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 128)
-}
-
-func Benchmark_diff_64_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 256)
-}
-
-func Benchmark_diff_64_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 512)
-}
-
-func Benchmark_diff_64_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 1024)
-}
-
-func Benchmark_diff_64_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 8192)
-}
-
-func Benchmark_diff_64_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 16384)
-}
-
-func Benchmark_diff_64_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 32768)
-}
-
-func Benchmark_diff_64_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 8192, 65536)
-}
-
-func Benchmark_diff_64_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 64)
-}
-
-func Benchmark_diff_64_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 128)
-}
-
-func Benchmark_diff_64_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 256)
-}
-
-func Benchmark_diff_64_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 512)
-}
-
-func Benchmark_diff_64_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 1024)
-}
-
-func Benchmark_diff_64_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 8192)
-}
-
-func Benchmark_diff_64_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 16384)
-}
-
-func Benchmark_diff_64_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 32768)
-}
-
-func Benchmark_diff_64_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 16384, 65536)
-}
-
-func Benchmark_diff_64_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 64)
-}
-
-func Benchmark_diff_64_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 128)
-}
-
-func Benchmark_diff_64_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 256)
-}
-
-func Benchmark_diff_64_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 512)
-}
-
-func Benchmark_diff_64_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 1024)
-}
-
-func Benchmark_diff_64_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 8192)
-}
-
-func Benchmark_diff_64_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 16384)
-}
-
-func Benchmark_diff_64_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 32768)
-}
-
-func Benchmark_diff_64_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 32768, 65536)
-}
-
-func Benchmark_diff_64_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 64)
-}
-
-func Benchmark_diff_64_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 128)
-}
-
-func Benchmark_diff_64_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 256)
-}
-
-func Benchmark_diff_64_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 512)
-}
-
-func Benchmark_diff_64_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 1024)
-}
-
-func Benchmark_diff_64_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 8192)
-}
-
-func Benchmark_diff_64_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 16384)
-}
-
-func Benchmark_diff_64_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 32768)
-}
-
-func Benchmark_diff_64_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 64, 65536, 65536, 65536)
-}
-
-func Benchmark_diff_1024_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 64)
-}
-
-func Benchmark_diff_1024_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 128)
-}
-
-func Benchmark_diff_1024_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 256)
-}
-
-func Benchmark_diff_1024_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 512)
-}
-
-func Benchmark_diff_1024_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 1024)
-}
-
-func Benchmark_diff_1024_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 8192)
-}
-
-func Benchmark_diff_1024_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 16384)
-}
-
-func Benchmark_diff_1024_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 32768)
-}
-
-func Benchmark_diff_1024_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 64, 65536)
-}
-
-func Benchmark_diff_1024_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 64)
-}
-
-func Benchmark_diff_1024_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 128)
-}
-
-func Benchmark_diff_1024_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 256)
-}
-
-func Benchmark_diff_1024_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 512)
-}
-
-func Benchmark_diff_1024_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 1024)
-}
-
-func Benchmark_diff_1024_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 8192)
-}
-
-func Benchmark_diff_1024_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 16384)
-}
-
-func Benchmark_diff_1024_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 32768)
-}
-
-func Benchmark_diff_1024_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 128, 65536)
-}
-
-func Benchmark_diff_1024_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 64)
-}
-
-func Benchmark_diff_1024_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 128)
-}
-
-func Benchmark_diff_1024_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 256)
-}
-
-func Benchmark_diff_1024_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 512)
-}
-
-func Benchmark_diff_1024_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 1024)
-}
-
-func Benchmark_diff_1024_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 8192)
-}
-
-func Benchmark_diff_1024_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 16384)
-}
-
-func Benchmark_diff_1024_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 32768)
-}
-
-func Benchmark_diff_1024_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 256, 65536)
-}
-
-func Benchmark_diff_1024_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 64)
-}
-
-func Benchmark_diff_1024_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 128)
-}
-
-func Benchmark_diff_1024_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 256)
-}
-
-func Benchmark_diff_1024_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 512)
-}
-
-func Benchmark_diff_1024_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 1024)
-}
-
-func Benchmark_diff_1024_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 8192)
-}
-
-func Benchmark_diff_1024_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 16384)
-}
-
-func Benchmark_diff_1024_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 32768)
-}
-
-func Benchmark_diff_1024_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 512, 65536)
-}
-
-func Benchmark_diff_1024_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 64)
-}
-
-func Benchmark_diff_1024_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 128)
-}
-
-func Benchmark_diff_1024_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 256)
-}
-
-func Benchmark_diff_1024_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 512)
-}
-
-func Benchmark_diff_1024_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 1024)
-}
-
-func Benchmark_diff_1024_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 8192)
-}
-
-func Benchmark_diff_1024_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 16384)
-}
-
-func Benchmark_diff_1024_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 32768)
-}
-
-func Benchmark_diff_1024_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 1024, 65536)
-}
-
-func Benchmark_diff_1024_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 64)
-}
-
-func Benchmark_diff_1024_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 128)
-}
-
-func Benchmark_diff_1024_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 256)
-}
-
-func Benchmark_diff_1024_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 512)
-}
-
-func Benchmark_diff_1024_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 1024)
-}
-
-func Benchmark_diff_1024_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 8192)
-}
-
-func Benchmark_diff_1024_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 16384)
-}
-
-func Benchmark_diff_1024_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 32768)
-}
-
-func Benchmark_diff_1024_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 8192, 65536)
-}
-
-func Benchmark_diff_1024_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 64)
-}
-
-func Benchmark_diff_1024_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 128)
-}
-
-func Benchmark_diff_1024_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 256)
-}
-
-func Benchmark_diff_1024_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 512)
-}
-
-func Benchmark_diff_1024_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 1024)
-}
-
-func Benchmark_diff_1024_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 8192)
-}
-
-func Benchmark_diff_1024_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 16384)
-}
-
-func Benchmark_diff_1024_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 32768)
-}
-
-func Benchmark_diff_1024_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 16384, 65536)
-}
-
-func Benchmark_diff_1024_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 64)
-}
-
-func Benchmark_diff_1024_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 128)
-}
-
-func Benchmark_diff_1024_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 256)
-}
-
-func Benchmark_diff_1024_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 512)
-}
-
-func Benchmark_diff_1024_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 1024)
-}
-
-func Benchmark_diff_1024_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 8192)
-}
-
-func Benchmark_diff_1024_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 16384)
-}
-
-func Benchmark_diff_1024_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 32768)
-}
-
-func Benchmark_diff_1024_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 32768, 65536)
-}
-
-func Benchmark_diff_1024_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 64)
-}
-
-func Benchmark_diff_1024_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 128)
-}
-
-func Benchmark_diff_1024_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 256)
-}
-
-func Benchmark_diff_1024_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 512)
-}
-
-func Benchmark_diff_1024_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 1024)
-}
-
-func Benchmark_diff_1024_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 8192)
-}
-
-func Benchmark_diff_1024_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 16384)
-}
-
-func Benchmark_diff_1024_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 32768)
-}
-
-func Benchmark_diff_1024_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 64, 65536, 65536)
-}
-
-func Benchmark_diff_1024_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 64)
-}
-
-func Benchmark_diff_1024_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 128)
-}
-
-func Benchmark_diff_1024_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 256)
-}
-
-func Benchmark_diff_1024_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 512)
-}
-
-func Benchmark_diff_1024_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 1024)
-}
-
-func Benchmark_diff_1024_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 8192)
-}
-
-func Benchmark_diff_1024_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 16384)
-}
-
-func Benchmark_diff_1024_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 32768)
-}
-
-func Benchmark_diff_1024_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 64, 65536)
-}
-
-func Benchmark_diff_1024_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 64)
-}
-
-func Benchmark_diff_1024_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 128)
-}
-
-func Benchmark_diff_1024_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 256)
-}
-
-func Benchmark_diff_1024_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 512)
-}
-
-func Benchmark_diff_1024_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 1024)
-}
-
-func Benchmark_diff_1024_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 8192)
-}
-
-func Benchmark_diff_1024_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 16384)
-}
-
-func Benchmark_diff_1024_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 32768)
-}
-
-func Benchmark_diff_1024_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 128, 65536)
-}
-
-func Benchmark_diff_1024_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 64)
-}
-
-func Benchmark_diff_1024_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 128)
-}
-
-func Benchmark_diff_1024_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 256)
-}
-
-func Benchmark_diff_1024_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 512)
-}
-
-func Benchmark_diff_1024_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 1024)
-}
-
-func Benchmark_diff_1024_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 8192)
-}
-
-func Benchmark_diff_1024_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 16384)
-}
-
-func Benchmark_diff_1024_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 32768)
-}
-
-func Benchmark_diff_1024_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 256, 65536)
-}
-
-func Benchmark_diff_1024_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 64)
-}
-
-func Benchmark_diff_1024_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 128)
-}
-
-func Benchmark_diff_1024_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 256)
-}
-
-func Benchmark_diff_1024_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 512)
-}
-
-func Benchmark_diff_1024_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 1024)
-}
-
-func Benchmark_diff_1024_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 8192)
-}
-
-func Benchmark_diff_1024_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 16384)
-}
-
-func Benchmark_diff_1024_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 32768)
-}
-
-func Benchmark_diff_1024_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 512, 65536)
-}
-
-func Benchmark_diff_1024_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 64)
-}
-
-func Benchmark_diff_1024_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 128)
-}
-
-func Benchmark_diff_1024_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 256)
-}
-
-func Benchmark_diff_1024_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 512)
-}
-
-func Benchmark_diff_1024_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 1024)
-}
-
-func Benchmark_diff_1024_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 8192)
-}
-
-func Benchmark_diff_1024_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 16384)
-}
-
-func Benchmark_diff_1024_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 32768)
-}
-
-func Benchmark_diff_1024_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 1024, 65536)
-}
-
-func Benchmark_diff_1024_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 64)
-}
-
-func Benchmark_diff_1024_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 128)
-}
-
-func Benchmark_diff_1024_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 256)
-}
-
-func Benchmark_diff_1024_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 512)
-}
-
-func Benchmark_diff_1024_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 1024)
-}
-
-func Benchmark_diff_1024_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 8192)
-}
-
-func Benchmark_diff_1024_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 16384)
-}
-
-func Benchmark_diff_1024_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 32768)
-}
-
-func Benchmark_diff_1024_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 8192, 65536)
-}
-
-func Benchmark_diff_1024_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 64)
-}
-
-func Benchmark_diff_1024_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 128)
-}
-
-func Benchmark_diff_1024_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 256)
-}
-
-func Benchmark_diff_1024_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 512)
-}
-
-func Benchmark_diff_1024_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 1024)
-}
-
-func Benchmark_diff_1024_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 8192)
-}
-
-func Benchmark_diff_1024_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 16384)
-}
-
-func Benchmark_diff_1024_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 32768)
-}
-
-func Benchmark_diff_1024_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 16384, 65536)
-}
-
-func Benchmark_diff_1024_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 64)
-}
-
-func Benchmark_diff_1024_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 128)
-}
-
-func Benchmark_diff_1024_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 256)
-}
-
-func Benchmark_diff_1024_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 512)
-}
-
-func Benchmark_diff_1024_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 1024)
-}
-
-func Benchmark_diff_1024_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 8192)
-}
-
-func Benchmark_diff_1024_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 16384)
-}
-
-func Benchmark_diff_1024_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 32768)
-}
-
-func Benchmark_diff_1024_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 32768, 65536)
-}
-
-func Benchmark_diff_1024_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 64)
-}
-
-func Benchmark_diff_1024_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 128)
-}
-
-func Benchmark_diff_1024_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 256)
-}
-
-func Benchmark_diff_1024_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 512)
-}
-
-func Benchmark_diff_1024_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 1024)
-}
-
-func Benchmark_diff_1024_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 8192)
-}
-
-func Benchmark_diff_1024_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 16384)
-}
-
-func Benchmark_diff_1024_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 32768)
-}
-
-func Benchmark_diff_1024_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 1024, 65536, 65536)
-}
-
-func Benchmark_diff_1024_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 64)
-}
-
-func Benchmark_diff_1024_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 128)
-}
-
-func Benchmark_diff_1024_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 256)
-}
-
-func Benchmark_diff_1024_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 512)
-}
-
-func Benchmark_diff_1024_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 1024)
-}
-
-func Benchmark_diff_1024_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 8192)
-}
-
-func Benchmark_diff_1024_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 16384)
-}
-
-func Benchmark_diff_1024_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 32768)
-}
-
-func Benchmark_diff_1024_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 64, 65536)
-}
-
-func Benchmark_diff_1024_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 64)
-}
-
-func Benchmark_diff_1024_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 128)
-}
-
-func Benchmark_diff_1024_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 256)
-}
-
-func Benchmark_diff_1024_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 512)
-}
-
-func Benchmark_diff_1024_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 1024)
-}
-
-func Benchmark_diff_1024_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 8192)
-}
-
-func Benchmark_diff_1024_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 16384)
-}
-
-func Benchmark_diff_1024_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 32768)
-}
-
-func Benchmark_diff_1024_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 128, 65536)
-}
-
-func Benchmark_diff_1024_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 64)
-}
-
-func Benchmark_diff_1024_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 128)
-}
-
-func Benchmark_diff_1024_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 256)
-}
-
-func Benchmark_diff_1024_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 512)
-}
-
-func Benchmark_diff_1024_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 1024)
-}
-
-func Benchmark_diff_1024_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 8192)
-}
-
-func Benchmark_diff_1024_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 16384)
-}
-
-func Benchmark_diff_1024_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 32768)
-}
-
-func Benchmark_diff_1024_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 256, 65536)
-}
-
-func Benchmark_diff_1024_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 64)
-}
-
-func Benchmark_diff_1024_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 128)
-}
-
-func Benchmark_diff_1024_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 256)
-}
-
-func Benchmark_diff_1024_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 512)
-}
-
-func Benchmark_diff_1024_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 1024)
-}
-
-func Benchmark_diff_1024_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 8192)
-}
-
-func Benchmark_diff_1024_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 16384)
-}
-
-func Benchmark_diff_1024_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 32768)
-}
-
-func Benchmark_diff_1024_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 512, 65536)
-}
-
-func Benchmark_diff_1024_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 64)
-}
-
-func Benchmark_diff_1024_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 128)
-}
-
-func Benchmark_diff_1024_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 256)
-}
-
-func Benchmark_diff_1024_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 512)
-}
-
-func Benchmark_diff_1024_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 1024)
-}
-
-func Benchmark_diff_1024_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 8192)
-}
-
-func Benchmark_diff_1024_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 16384)
-}
-
-func Benchmark_diff_1024_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 32768)
-}
-
-func Benchmark_diff_1024_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 1024, 65536)
-}
-
-func Benchmark_diff_1024_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 64)
-}
-
-func Benchmark_diff_1024_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 128)
-}
-
-func Benchmark_diff_1024_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 256)
-}
-
-func Benchmark_diff_1024_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 512)
-}
-
-func Benchmark_diff_1024_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 1024)
-}
-
-func Benchmark_diff_1024_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 8192)
-}
-
-func Benchmark_diff_1024_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 16384)
-}
-
-func Benchmark_diff_1024_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 32768)
-}
-
-func Benchmark_diff_1024_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 8192, 65536)
-}
-
-func Benchmark_diff_1024_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 64)
-}
-
-func Benchmark_diff_1024_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 128)
-}
-
-func Benchmark_diff_1024_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 256)
-}
-
-func Benchmark_diff_1024_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 512)
-}
-
-func Benchmark_diff_1024_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 1024)
-}
-
-func Benchmark_diff_1024_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 8192)
-}
-
-func Benchmark_diff_1024_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 16384)
-}
-
-func Benchmark_diff_1024_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 32768)
-}
-
-func Benchmark_diff_1024_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 16384, 65536)
-}
-
-func Benchmark_diff_1024_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 64)
-}
-
-func Benchmark_diff_1024_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 128)
-}
-
-func Benchmark_diff_1024_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 256)
-}
-
-func Benchmark_diff_1024_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 512)
-}
-
-func Benchmark_diff_1024_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 1024)
-}
-
-func Benchmark_diff_1024_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 8192)
-}
-
-func Benchmark_diff_1024_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 16384)
-}
-
-func Benchmark_diff_1024_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 32768)
-}
-
-func Benchmark_diff_1024_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 32768, 65536)
-}
-
-func Benchmark_diff_1024_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 64)
-}
-
-func Benchmark_diff_1024_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 128)
-}
-
-func Benchmark_diff_1024_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 256)
-}
-
-func Benchmark_diff_1024_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 512)
-}
-
-func Benchmark_diff_1024_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 1024)
-}
-
-func Benchmark_diff_1024_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 8192)
-}
-
-func Benchmark_diff_1024_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 16384)
-}
-
-func Benchmark_diff_1024_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 32768)
-}
-
-func Benchmark_diff_1024_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 1024, 65536, 65536, 65536)
-}
-
-func Benchmark_diff_65536_64_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 64)
-}
-
-func Benchmark_diff_65536_64_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 128)
-}
-
-func Benchmark_diff_65536_64_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 256)
-}
-
-func Benchmark_diff_65536_64_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 512)
-}
-
-func Benchmark_diff_65536_64_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 1024)
-}
-
-func Benchmark_diff_65536_64_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 8192)
-}
-
-func Benchmark_diff_65536_64_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 16384)
-}
-
-func Benchmark_diff_65536_64_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 32768)
-}
-
-func Benchmark_diff_65536_64_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 64, 65536)
-}
-
-func Benchmark_diff_65536_64_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 64)
-}
-
-func Benchmark_diff_65536_64_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 128)
-}
-
-func Benchmark_diff_65536_64_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 256)
-}
-
-func Benchmark_diff_65536_64_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 512)
-}
-
-func Benchmark_diff_65536_64_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 1024)
-}
-
-func Benchmark_diff_65536_64_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 8192)
-}
-
-func Benchmark_diff_65536_64_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 16384)
-}
-
-func Benchmark_diff_65536_64_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 32768)
-}
-
-func Benchmark_diff_65536_64_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 128, 65536)
-}
-
-func Benchmark_diff_65536_64_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 64)
-}
-
-func Benchmark_diff_65536_64_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 128)
-}
-
-func Benchmark_diff_65536_64_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 256)
-}
-
-func Benchmark_diff_65536_64_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 512)
-}
-
-func Benchmark_diff_65536_64_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 1024)
-}
-
-func Benchmark_diff_65536_64_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 8192)
-}
-
-func Benchmark_diff_65536_64_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 16384)
-}
-
-func Benchmark_diff_65536_64_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 32768)
-}
-
-func Benchmark_diff_65536_64_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 256, 65536)
-}
-
-func Benchmark_diff_65536_64_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 64)
-}
-
-func Benchmark_diff_65536_64_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 128)
-}
-
-func Benchmark_diff_65536_64_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 256)
-}
-
-func Benchmark_diff_65536_64_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 512)
-}
-
-func Benchmark_diff_65536_64_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 1024)
-}
-
-func Benchmark_diff_65536_64_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 8192)
-}
-
-func Benchmark_diff_65536_64_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 16384)
-}
-
-func Benchmark_diff_65536_64_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 32768)
-}
-
-func Benchmark_diff_65536_64_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 512, 65536)
-}
-
-func Benchmark_diff_65536_64_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 64)
-}
-
-func Benchmark_diff_65536_64_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 128)
-}
-
-func Benchmark_diff_65536_64_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 256)
-}
-
-func Benchmark_diff_65536_64_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 512)
-}
-
-func Benchmark_diff_65536_64_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 1024)
-}
-
-func Benchmark_diff_65536_64_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 8192)
-}
-
-func Benchmark_diff_65536_64_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 16384)
-}
-
-func Benchmark_diff_65536_64_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 32768)
-}
-
-func Benchmark_diff_65536_64_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 1024, 65536)
-}
-
-func Benchmark_diff_65536_64_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 64)
-}
-
-func Benchmark_diff_65536_64_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 128)
-}
-
-func Benchmark_diff_65536_64_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 256)
-}
-
-func Benchmark_diff_65536_64_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 512)
-}
-
-func Benchmark_diff_65536_64_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 1024)
-}
-
-func Benchmark_diff_65536_64_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 8192)
-}
-
-func Benchmark_diff_65536_64_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 16384)
-}
-
-func Benchmark_diff_65536_64_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 32768)
-}
-
-func Benchmark_diff_65536_64_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 8192, 65536)
-}
-
-func Benchmark_diff_65536_64_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 64)
-}
-
-func Benchmark_diff_65536_64_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 128)
-}
-
-func Benchmark_diff_65536_64_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 256)
-}
-
-func Benchmark_diff_65536_64_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 512)
-}
-
-func Benchmark_diff_65536_64_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 1024)
-}
-
-func Benchmark_diff_65536_64_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 8192)
-}
-
-func Benchmark_diff_65536_64_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 16384)
-}
-
-func Benchmark_diff_65536_64_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 32768)
-}
-
-func Benchmark_diff_65536_64_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 16384, 65536)
-}
-
-func Benchmark_diff_65536_64_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 64)
-}
-
-func Benchmark_diff_65536_64_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 128)
-}
-
-func Benchmark_diff_65536_64_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 256)
-}
-
-func Benchmark_diff_65536_64_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 512)
-}
-
-func Benchmark_diff_65536_64_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 1024)
-}
-
-func Benchmark_diff_65536_64_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 8192)
-}
-
-func Benchmark_diff_65536_64_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 16384)
-}
-
-func Benchmark_diff_65536_64_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 32768)
-}
-
-func Benchmark_diff_65536_64_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 32768, 65536)
-}
-
-func Benchmark_diff_65536_64_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 64)
-}
-
-func Benchmark_diff_65536_64_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 128)
-}
-
-func Benchmark_diff_65536_64_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 256)
-}
-
-func Benchmark_diff_65536_64_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 512)
-}
-
-func Benchmark_diff_65536_64_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 1024)
-}
-
-func Benchmark_diff_65536_64_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 8192)
-}
-
-func Benchmark_diff_65536_64_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 16384)
-}
-
-func Benchmark_diff_65536_64_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 32768)
-}
-
-func Benchmark_diff_65536_64_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 64, 65536, 65536)
-}
-
-func Benchmark_diff_65536_1024_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 64)
-}
-
-func Benchmark_diff_65536_1024_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 128)
-}
-
-func Benchmark_diff_65536_1024_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 256)
-}
-
-func Benchmark_diff_65536_1024_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 512)
-}
-
-func Benchmark_diff_65536_1024_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 1024)
-}
-
-func Benchmark_diff_65536_1024_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 8192)
-}
-
-func Benchmark_diff_65536_1024_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 16384)
-}
-
-func Benchmark_diff_65536_1024_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 32768)
-}
-
-func Benchmark_diff_65536_1024_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 64, 65536)
-}
-
-func Benchmark_diff_65536_1024_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 64)
-}
-
-func Benchmark_diff_65536_1024_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 128)
-}
-
-func Benchmark_diff_65536_1024_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 256)
-}
-
-func Benchmark_diff_65536_1024_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 512)
-}
-
-func Benchmark_diff_65536_1024_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 1024)
-}
-
-func Benchmark_diff_65536_1024_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 8192)
-}
-
-func Benchmark_diff_65536_1024_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 16384)
-}
-
-func Benchmark_diff_65536_1024_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 32768)
-}
-
-func Benchmark_diff_65536_1024_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 128, 65536)
-}
-
-func Benchmark_diff_65536_1024_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 64)
-}
-
-func Benchmark_diff_65536_1024_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 128)
-}
-
-func Benchmark_diff_65536_1024_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 256)
-}
-
-func Benchmark_diff_65536_1024_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 512)
-}
-
-func Benchmark_diff_65536_1024_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 1024)
-}
-
-func Benchmark_diff_65536_1024_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 8192)
-}
-
-func Benchmark_diff_65536_1024_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 16384)
-}
-
-func Benchmark_diff_65536_1024_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 32768)
-}
-
-func Benchmark_diff_65536_1024_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 256, 65536)
-}
-
-func Benchmark_diff_65536_1024_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 64)
-}
-
-func Benchmark_diff_65536_1024_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 128)
-}
-
-func Benchmark_diff_65536_1024_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 256)
-}
-
-func Benchmark_diff_65536_1024_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 512)
-}
-
-func Benchmark_diff_65536_1024_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 1024)
-}
-
-func Benchmark_diff_65536_1024_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 8192)
-}
-
-func Benchmark_diff_65536_1024_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 16384)
-}
-
-func Benchmark_diff_65536_1024_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 32768)
-}
-
-func Benchmark_diff_65536_1024_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 512, 65536)
-}
-
-func Benchmark_diff_65536_1024_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 64)
-}
-
-func Benchmark_diff_65536_1024_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 128)
-}
-
-func Benchmark_diff_65536_1024_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 256)
-}
-
-func Benchmark_diff_65536_1024_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 512)
-}
-
-func Benchmark_diff_65536_1024_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 1024)
-}
-
-func Benchmark_diff_65536_1024_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 8192)
-}
-
-func Benchmark_diff_65536_1024_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 16384)
-}
-
-func Benchmark_diff_65536_1024_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 32768)
-}
-
-func Benchmark_diff_65536_1024_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 1024, 65536)
-}
-
-func Benchmark_diff_65536_1024_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 64)
-}
-
-func Benchmark_diff_65536_1024_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 128)
-}
-
-func Benchmark_diff_65536_1024_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 256)
-}
-
-func Benchmark_diff_65536_1024_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 512)
-}
-
-func Benchmark_diff_65536_1024_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 1024)
-}
-
-func Benchmark_diff_65536_1024_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 8192)
-}
-
-func Benchmark_diff_65536_1024_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 16384)
-}
-
-func Benchmark_diff_65536_1024_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 32768)
-}
-
-func Benchmark_diff_65536_1024_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 8192, 65536)
-}
-
-func Benchmark_diff_65536_1024_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 64)
-}
-
-func Benchmark_diff_65536_1024_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 128)
-}
-
-func Benchmark_diff_65536_1024_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 256)
-}
-
-func Benchmark_diff_65536_1024_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 512)
-}
-
-func Benchmark_diff_65536_1024_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 1024)
-}
-
-func Benchmark_diff_65536_1024_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 8192)
-}
-
-func Benchmark_diff_65536_1024_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 16384)
-}
-
-func Benchmark_diff_65536_1024_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 32768)
-}
-
-func Benchmark_diff_65536_1024_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 16384, 65536)
-}
-
-func Benchmark_diff_65536_1024_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 64)
-}
-
-func Benchmark_diff_65536_1024_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 128)
-}
-
-func Benchmark_diff_65536_1024_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 256)
-}
-
-func Benchmark_diff_65536_1024_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 512)
-}
-
-func Benchmark_diff_65536_1024_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 1024)
-}
-
-func Benchmark_diff_65536_1024_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 8192)
-}
-
-func Benchmark_diff_65536_1024_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 16384)
-}
-
-func Benchmark_diff_65536_1024_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 32768)
-}
-
-func Benchmark_diff_65536_1024_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 32768, 65536)
-}
-
-func Benchmark_diff_65536_1024_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 64)
-}
-
-func Benchmark_diff_65536_1024_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 128)
-}
-
-func Benchmark_diff_65536_1024_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 256)
-}
-
-func Benchmark_diff_65536_1024_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 512)
-}
-
-func Benchmark_diff_65536_1024_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 1024)
-}
-
-func Benchmark_diff_65536_1024_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 8192)
-}
-
-func Benchmark_diff_65536_1024_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 16384)
-}
-
-func Benchmark_diff_65536_1024_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 32768)
-}
-
-func Benchmark_diff_65536_1024_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 1024, 65536, 65536)
-}
-
-func Benchmark_diff_65536_65536_64_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 64)
-}
-
-func Benchmark_diff_65536_65536_64_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 128)
-}
-
-func Benchmark_diff_65536_65536_64_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 256)
-}
-
-func Benchmark_diff_65536_65536_64_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 512)
-}
-
-func Benchmark_diff_65536_65536_64_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 1024)
-}
-
-func Benchmark_diff_65536_65536_64_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 8192)
-}
-
-func Benchmark_diff_65536_65536_64_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 16384)
-}
-
-func Benchmark_diff_65536_65536_64_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 32768)
-}
-
-func Benchmark_diff_65536_65536_64_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 64, 65536)
-}
-
-func Benchmark_diff_65536_65536_128_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 64)
-}
-
-func Benchmark_diff_65536_65536_128_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 128)
-}
-
-func Benchmark_diff_65536_65536_128_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 256)
-}
-
-func Benchmark_diff_65536_65536_128_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 512)
-}
-
-func Benchmark_diff_65536_65536_128_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 1024)
-}
-
-func Benchmark_diff_65536_65536_128_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 8192)
-}
-
-func Benchmark_diff_65536_65536_128_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 16384)
-}
-
-func Benchmark_diff_65536_65536_128_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 32768)
-}
-
-func Benchmark_diff_65536_65536_128_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 128, 65536)
-}
-
-func Benchmark_diff_65536_65536_256_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 64)
-}
-
-func Benchmark_diff_65536_65536_256_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 128)
-}
-
-func Benchmark_diff_65536_65536_256_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 256)
-}
-
-func Benchmark_diff_65536_65536_256_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 512)
-}
-
-func Benchmark_diff_65536_65536_256_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 1024)
-}
-
-func Benchmark_diff_65536_65536_256_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 8192)
-}
-
-func Benchmark_diff_65536_65536_256_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 16384)
-}
-
-func Benchmark_diff_65536_65536_256_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 32768)
-}
-
-func Benchmark_diff_65536_65536_256_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 256, 65536)
-}
-
-func Benchmark_diff_65536_65536_512_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 64)
-}
-
-func Benchmark_diff_65536_65536_512_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 128)
-}
-
-func Benchmark_diff_65536_65536_512_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 256)
-}
-
-func Benchmark_diff_65536_65536_512_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 512)
-}
-
-func Benchmark_diff_65536_65536_512_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 1024)
-}
-
-func Benchmark_diff_65536_65536_512_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 8192)
-}
-
-func Benchmark_diff_65536_65536_512_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 16384)
-}
-
-func Benchmark_diff_65536_65536_512_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 32768)
-}
-
-func Benchmark_diff_65536_65536_512_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 512, 65536)
-}
-
-func Benchmark_diff_65536_65536_1024_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 64)
-}
-
-func Benchmark_diff_65536_65536_1024_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 128)
-}
-
-func Benchmark_diff_65536_65536_1024_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 256)
-}
-
-func Benchmark_diff_65536_65536_1024_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 512)
-}
-
-func Benchmark_diff_65536_65536_1024_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 1024)
-}
-
-func Benchmark_diff_65536_65536_1024_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 8192)
-}
-
-func Benchmark_diff_65536_65536_1024_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 16384)
-}
-
-func Benchmark_diff_65536_65536_1024_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 32768)
-}
-
-func Benchmark_diff_65536_65536_1024_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 1024, 65536)
-}
-
-func Benchmark_diff_65536_65536_8192_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 64)
-}
-
-func Benchmark_diff_65536_65536_8192_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 128)
-}
-
-func Benchmark_diff_65536_65536_8192_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 256)
-}
-
-func Benchmark_diff_65536_65536_8192_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 512)
-}
-
-func Benchmark_diff_65536_65536_8192_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 1024)
-}
-
-func Benchmark_diff_65536_65536_8192_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 8192)
-}
-
-func Benchmark_diff_65536_65536_8192_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 16384)
-}
-
-func Benchmark_diff_65536_65536_8192_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 32768)
-}
-
-func Benchmark_diff_65536_65536_8192_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 8192, 65536)
-}
-
-func Benchmark_diff_65536_65536_16384_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 64)
-}
-
-func Benchmark_diff_65536_65536_16384_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 128)
-}
-
-func Benchmark_diff_65536_65536_16384_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 256)
-}
-
-func Benchmark_diff_65536_65536_16384_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 512)
-}
-
-func Benchmark_diff_65536_65536_16384_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 1024)
-}
-
-func Benchmark_diff_65536_65536_16384_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 8192)
-}
-
-func Benchmark_diff_65536_65536_16384_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 16384)
-}
-
-func Benchmark_diff_65536_65536_16384_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 32768)
-}
-
-func Benchmark_diff_65536_65536_16384_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 16384, 65536)
-}
-
-func Benchmark_diff_65536_65536_32768_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 64)
-}
-
-func Benchmark_diff_65536_65536_32768_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 128)
-}
-
-func Benchmark_diff_65536_65536_32768_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 256)
-}
-
-func Benchmark_diff_65536_65536_32768_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 512)
-}
-
-func Benchmark_diff_65536_65536_32768_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 1024)
-}
-
-func Benchmark_diff_65536_65536_32768_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 8192)
-}
-
-func Benchmark_diff_65536_65536_32768_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 16384)
-}
-
-func Benchmark_diff_65536_65536_32768_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 32768)
-}
-
-func Benchmark_diff_65536_65536_32768_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 32768, 65536)
-}
-
-func Benchmark_diff_65536_65536_65536_64(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 64)
-}
-
-func Benchmark_diff_65536_65536_65536_128(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 128)
-}
-
-func Benchmark_diff_65536_65536_65536_256(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 256)
-}
-
-func Benchmark_diff_65536_65536_65536_512(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 512)
-}
-
-func Benchmark_diff_65536_65536_65536_1024(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 1024)
-}
-
-func Benchmark_diff_65536_65536_65536_8192(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 8192)
-}
-
-func Benchmark_diff_65536_65536_65536_16384(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 16384)
-}
-
-func Benchmark_diff_65536_65536_65536_32768(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 32768)
-}
-
-func Benchmark_diff_65536_65536_65536_65536(b *testing.B) {
-	benchmarkDifferentCombinations(b, "diff", 65536, 65536, 65536, 65536)
-}
diff --git a/bitmap.go b/bitmap.go
index c457e8e62..9e14195ca 100644
--- a/bitmap.go
+++ b/bitmap.go
@@ -8,8 +8,11 @@ import (
 	"encoding/base64"
 	"encoding/binary"
 	"encoding/gob"
+	"encoding/json"
+	"io"
 
-	log "github.com/cihub/seelog"
+	"github.com/gogo/protobuf/proto"
+	"github.com/umbel/pilosa/internal"
 	"github.com/yasushi-saito/rbtree"
 )
 
@@ -43,6 +46,15 @@ func (b *Bitmap) Chunk(c *Chunk) *Chunk {
 // AddChunk adds c to the bitmap.
 func (b *Bitmap) AddChunk(c *Chunk) { b.tree.Insert(c) }
 
+// Chunks returns a list of all chunks.
+func (b *Bitmap) Chunks() []*Chunk {
+	var a []*Chunk
+	for itr := b.ChunkIterator(); !itr.Limit(); itr = itr.Next() {
+		a = append(a, itr.Item().Clone())
+	}
+	return a
+}
+
 // ChunkIterator returns an iterator for looping over the bitmap's chunks.
 func (b *Bitmap) ChunkIterator() *ChunkIterator {
 	return &ChunkIterator{b.tree.Min()}
@@ -58,18 +70,21 @@ func (b *Bitmap) Clone() *Bitmap {
 			break
 		}
 
-		node := itr.Item()
-		other.AddChunk(&Chunk{
-			Key:   node.Key,
-			Value: node.Value.copy(),
-		})
-
+		other.AddChunk(itr.Item().Clone())
 		itr = itr.Next()
 	}
 	return other
 }
 
-// IntersectionCount returns the number of itersections between b and other.
+// Merge adds chunks from other to b.
+// Chunks in b are overwritten if they exist in other.
+func (b *Bitmap) Merge(other *Bitmap) {
+	for itr := other.ChunkIterator(); !itr.Limit(); itr = itr.Next() {
+		b.AddChunk(itr.Item().Clone())
+	}
+}
+
+// IntersectionCount returns the number of intersections between b and other.
 func (b *Bitmap) IntersectionCount(other *Bitmap) uint64 {
 	itr0 := b.ChunkIterator()
 	itr1 := other.ChunkIterator()
@@ -91,8 +106,8 @@ func (b *Bitmap) IntersectionCount(other *Bitmap) uint64 {
 	return results
 }
 
-// Intersection returns the itersection of b and other.
-func (b *Bitmap) Intersection(other *Bitmap) *Bitmap {
+// Intersect returns the itersection of b and other.
+func (b *Bitmap) Intersect(other *Bitmap) *Bitmap {
 	itr0 := b.ChunkIterator()
 	itr1 := other.ChunkIterator()
 
@@ -107,7 +122,7 @@ func (b *Bitmap) Intersection(other *Bitmap) *Bitmap {
 		} else if itr0.Item().Key == itr1.Item().Key {
 			output.AddChunk(&Chunk{
 				Key:   itr0.Item().Key,
-				Value: itr0.Item().Value.intersection(itr1.Item().Value),
+				Value: itr0.Item().Value.intersect(itr1.Item().Value),
 			})
 			itr0 = itr0.Next()
 			itr1 = itr1.Next()
@@ -202,7 +217,7 @@ func (b *Bitmap) Difference(other *Bitmap) *Bitmap {
 				Value: itr0.Item().Value.difference(itr1.Item().Value),
 			}
 
-			// Could not add if all zero
+			// Do not add if all bits are zeroed.
 			if chunk.Value.bitcount() > 0 {
 				output.AddChunk(chunk)
 			}
@@ -236,35 +251,87 @@ func (b *Bitmap) ToRawCompressString() (string, int) {
 	return base64.StdEncoding.EncodeToString(bt.Bytes()), max_slice
 }
 
-// ToBytes returns a gob-encoded byte slice of b.
-func (b *Bitmap) ToBytes() []byte {
-	var buf bytes.Buffer
-	enc := gob.NewEncoder(&buf)
-	enc.Encode(b.tree.Len())
+// WriteTo writes the encoded bitmap to w.
+func (b *Bitmap) WriteTo(w io.Writer) (n int64, err error) {
+	// Wrap output in gzip compression.
+	z := gzip.NewWriter(w)
+
+	// Encode chunk count.
+	enc := gob.NewEncoder(w)
+	if err := enc.Encode(b.tree.Len()); err != nil {
+		return 0, err
+	}
+
+	// Encode all chunks.
 	for i := b.tree.Min(); !i.Limit(); i = i.Next() {
-		obj := i.Item().(*Chunk)
-		err := enc.Encode(obj)
-		if err != nil {
-			log.Warn(err)
+		if err := enc.Encode(i.Item().(*Chunk)); err != nil {
+			return 0, err
 		}
 	}
-	return buf.Bytes()
+
+	// Flush and close.
+	if err := z.Close(); err != nil {
+		return 0, err
+	}
+
+	return 0, nil
 }
 
-// FromBytes decodes a gob-encoded byte slice into b.
-func (b *Bitmap) FromBytes(raw []byte) {
-	buf := bytes.NewBuffer(raw)
-	dec := gob.NewDecoder(buf)
+// ReadFrom reads encoded bitmap data from r into b.
+func (b *Bitmap) ReadFrom(r io.Reader) (n int64, err error) {
+	// Uncompress from gzip format.
+	z, err := gzip.NewReader(r)
+	if err != nil {
+		return 0, err
+	}
+	dec := gob.NewDecoder(z)
 
+	// Read size from data.
 	var size int
-	dec.Decode(&size)
+	if err := dec.Decode(&size); err != nil {
+		return 0, err
+	}
+
+	// Read chunks into bitmap.
 	b.tree = rbtree.NewTree(rbtreeItemCompare)
 	for i := 0; i < size; i++ {
 		var chunk Chunk
-		dec.Decode(&chunk)
+		if err := dec.Decode(&chunk); err != nil {
+			return 0, err
+		}
 		b.AddChunk(&chunk)
 	}
 	b.SetCount(b.BitCount())
+
+	return 0, nil
+}
+
+// MarshalJSON returns a JSON-encoded byte slice of b.
+func (b *Bitmap) MarshalJSON() ([]byte, error) {
+	o := bitmapJSON{
+		Chunks: make([]chunkJSON, 0, b.tree.Len()),
+	}
+
+	for itr := b.ChunkIterator(); !itr.Limit(); itr = itr.Next() {
+		o.Chunks = append(o.Chunks, chunkJSON{Key: itr.Item().Key, Value: itr.Item().Value})
+	}
+
+	return json.Marshal(&o)
+}
+
+// MarshalBinary returns a gob-encoded byte slice of b.
+func (b *Bitmap) MarshalBinary() ([]byte, error) {
+	var buf bytes.Buffer
+	if _, err := b.WriteTo(&buf); err != nil {
+		return nil, err
+	}
+	return buf.Bytes(), nil
+}
+
+// UnmarshalBinary decodes a gob-encoded byte slice into b.
+func (b *Bitmap) UnmarshalBinary(data []byte) error {
+	_, err := b.ReadFrom(bytes.NewReader(data))
+	return err
 }
 
 // Bits returns the bits in b as a slice of ints.
@@ -291,7 +358,7 @@ func (b *Bitmap) Bits() []uint64 {
 }
 
 // SetBit sets the i-th bit of the bitmap.
-func (b *Bitmap) SetBit(i uint64) (bool, *Chunk, Address) {
+func (b *Bitmap) SetBit(i uint64) (changed bool) {
 	address := deref(i)
 
 	chunk := b.Chunk(&Chunk{address.ChunkKey, make(Blocks, 32)})
@@ -300,29 +367,29 @@ func (b *Bitmap) SetBit(i uint64) (bool, *Chunk, Address) {
 		b.AddChunk(chunk)
 	}
 
-	changed := chunk.Value.setBit(address.BlockIndex, address.Bit)
+	changed = chunk.Value.setBit(address.BlockIndex, address.Bit)
 	if changed {
 		b.bcount++
 	}
 
-	return changed, chunk, address
+	return changed
 }
 
 // ClearBit clears the i-th bit of the bitmap.
-func (b *Bitmap) ClearBit(i uint64) (bool, *Chunk, Address) {
+func (b *Bitmap) ClearBit(i uint64) (changed bool) {
 	address := deref(i)
 
 	chunk := b.Chunk(&Chunk{address.ChunkKey, make(Blocks, 32)})
 	if chunk == nil {
-		return false, nil, address
+		return false
 	}
 
-	changed := chunk.Value.clearBit(address.BlockIndex, address.Bit)
+	changed = chunk.Value.clearBit(address.BlockIndex, address.Bit)
 	if changed && b.bcount > 0 {
 		b.bcount--
 	}
 
-	return changed, chunk, address
+	return changed
 }
 
 // Len returns the number of chunks in b.
@@ -343,12 +410,75 @@ func (b *Bitmap) BitCount() uint64 {
 	return n
 }
 
+// encodeBitmap converts b into its internal representation.
+func encodeBitmap(b *Bitmap) *internal.Bitmap {
+	pb := &internal.Bitmap{}
+	for i := b.tree.Min(); !i.Limit(); i = i.Next() {
+		pb.Chunks = append(pb.Chunks, encodeChunk(i.Item().(*Chunk)))
+	}
+	return pb
+}
+
+// decodeBitmap converts b from its internal representation.
+func decodeBitmap(pb *internal.Bitmap) *Bitmap {
+	b := NewBitmap()
+	for _, chunk := range pb.GetChunks() {
+		b.AddChunk(decodeChunk(chunk))
+	}
+	b.SetCount(b.BitCount())
+	return b
+}
+
+// Union performs a union on a slice of bitmaps.
+func Union(bitmaps []*Bitmap) *Bitmap {
+	other := bitmaps[0]
+	for _, bm := range bitmaps[1:] {
+		other = other.Union(bm)
+	}
+	return other
+}
+
+// bitmapJSON is the JSON representation of Bitmap.
+type bitmapJSON struct {
+	Chunks []chunkJSON `json:"chunks"`
+}
+
 // Chunk represents a set of blocks in a Bitmap.
 type Chunk struct {
 	Key   uint64
 	Value Blocks
 }
 
+// Clone returns a copy of c.
+func (c *Chunk) Clone() *Chunk {
+	return &Chunk{
+		Key:   c.Key,
+		Value: c.Value.copy(),
+	}
+}
+
+// encodeChunks encodes c into its internal representation.
+func encodeChunk(c *Chunk) *internal.Chunk {
+	return &internal.Chunk{
+		Key:   proto.Uint64(c.Key),
+		Value: []uint64(c.Value),
+	}
+}
+
+// decodeChunk decodes c from its internal representation.
+func decodeChunk(pb *internal.Chunk) *Chunk {
+	return &Chunk{
+		Key:   pb.GetKey(),
+		Value: Blocks(pb.GetValue()),
+	}
+}
+
+// chunkJSON is the JSON representation of Chunk.
+type chunkJSON struct {
+	Key   uint64
+	Value []uint64
+}
+
 // ChunkIterator represents an object for iterating over chunks in a bitmap.
 type ChunkIterator struct {
 	itr rbtree.Iterator
@@ -383,6 +513,73 @@ func rbtreeItemCompare(a, b rbtree.Item) int {
 	return 0
 }
 
+type Blocks []uint64
+
+// NewBlocks returns a 32-length Block.
+func NewBlocks() Blocks {
+	return make(Blocks, 32)
+}
+
+func (a Blocks) bitcount() uint64 {
+	return popcntSlice(a)
+}
+
+func (a Blocks) union(other Blocks) Blocks {
+	ret := NewBlocks()
+	for i, _ := range a {
+		ret[i] = a[i] | other[i]
+	}
+	return ret
+}
+
+func (a Blocks) invert() Blocks {
+	other := NewBlocks()
+	for i, _ := range a {
+		other[i] = ^a[i]
+	}
+	return other
+}
+
+func (a Blocks) copy() Blocks {
+	other := NewBlocks()
+	for i, _ := range a {
+		other[i] = a[i]
+	}
+	return other
+}
+
+func (a Blocks) andcount(other Blocks) uint64 {
+	return popcntAndSliceAsm(a, other)
+}
+
+func (a Blocks) intersect(other Blocks) Blocks {
+	ret := NewBlocks()
+	for i, _ := range a {
+		ret[i] = a[i] & other[i]
+	}
+	return ret
+}
+
+func (a Blocks) difference(other Blocks) Blocks {
+	ret := NewBlocks()
+	for i, _ := range a {
+		ret[i] = a[i] &^ other[i]
+	}
+	return ret
+}
+
+func (a Blocks) setBit(i uint8, bit uint8) (changed bool) {
+	val := a[i] & (1 << bit)
+	a[i] |= 1 << bit
+	return val == 0
+}
+
+func (a Blocks) clearBit(i uint8, bit uint8) (changed bool) {
+	val := a[i] & (1 << bit)
+	a[i] &= ^(1 << bit)
+	return val != 0
+}
+
 // Address represents a location for a given chunk/block/bit.
 type Address struct {
 	ChunkKey   uint64
diff --git a/blocks.go b/blocks.go
deleted file mode 100644
index 6803b84aa..000000000
--- a/blocks.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package pilosa
-
-import (
-	"fmt"
-)
-
-type Blocks []uint64
-
-// NewBlocks returns a 32-length Block.
-func NewBlocks() Blocks {
-	return make(Blocks, 32)
-}
-
-func (a Blocks) bitcount() uint64 {
-	fmt.Println("bitcount:", a)
-	return popcntSlice(a)
-}
-
-func (a Blocks) union(other Blocks) Blocks {
-	ret := NewBlocks()
-	for i, _ := range a {
-		ret[i] = a[i] | other[i]
-	}
-	return ret
-}
-
-func (a Blocks) invert() Blocks {
-	other := NewBlocks()
-	for i, _ := range a {
-		other[i] = ^a[i]
-	}
-	return other
-}
-
-func (a Blocks) copy() Blocks {
-	other := NewBlocks()
-	for i, _ := range a {
-		other[i] = a[i]
-	}
-	return other
-}
-
-func (a Blocks) andcount(other Blocks) uint64 {
-	println("andcount")
-	return popcntAndSliceAsm(a, other)
-}
-
-func (a Blocks) intersection(other Blocks) Blocks {
-	ret := NewBlocks()
-	for i, _ := range a {
-		ret[i] = a[i] & other[i]
-	}
-	return ret
-}
-
-func (a Blocks) difference(other Blocks) Blocks {
-	ret := NewBlocks()
-	for i, _ := range a {
-		ret[i] = a[i] &^ other[i]
-	}
-	return ret
-}
-
-func (a Blocks) setBit(i uint8, bit uint8) (changed bool) {
-	val := a[i] & (1 << bit)
-	a[i] |= 1 << bit
-	return val == 0
-}
-
-func (a Blocks) clearBit(i uint8, bit uint8) (changed bool) {
-	val := a[i] & (1 << bit)
-	a[i] &= ^(1 << bit)
-	return val != 0
-}
diff --git a/brand.go b/brand.go
deleted file mode 100644
index c3c39ebe8..000000000
--- a/brand.go
+++ /dev/null
@@ -1,448 +0,0 @@
-package pilosa
-
-import (
-	"encoding/json"
-	"fmt"
-	"math/rand"
-	"sort"
-	"sync"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa/statsd"
-)
-
-var FragmentBase string
-
-var globalLock sync.Mutex
-
-type Pair struct {
-	Key, Count uint64
-}
-type Rank struct {
-	*Pair
-	bitmap   *Bitmap
-	category uint64
-}
-
-type RankList []*Rank
-
-func (p RankList) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-func (p RankList) Len() int           { return len(p) }
-func (p RankList) Less(i, j int) bool { return p[i].Count > p[j].Count }
-
-type Brand struct {
-	bitmap_cache     map[uint64]*Rank
-	db               string
-	frame            string
-	slice            int
-	storage          Storage
-	rankings         RankList
-	rank_count       int
-	threshold_value  uint64
-	threshold_length int
-	threshold_idx    int
-	skip             int
-	rank_time        time.Time
-}
-
-func NewBrand(db string, frame string, slice int, s Storage, threshold_len int, threshold int, skipp int) *Brand {
-	f := new(Brand)
-	f.storage = s
-	f.frame = frame
-	f.slice = slice
-	f.db = db
-	f.rank_count = 0
-	f.threshold_value = 0
-	f.threshold_length = threshold_len
-	f.threshold_idx = threshold
-	f.skip = skipp
-	f.Clear() //alloc the cache
-	return f
-
-}
-
-func (b *Brand) Clear() bool {
-	b.bitmap_cache = make(map[uint64]*Rank)
-	return true
-}
-
-func (b *Brand) Exists(bitmap_id uint64) bool {
-	_, ok := b.bitmap_cache[bitmap_id]
-	return ok
-}
-
-func (b *Brand) Get(bitmap_id uint64) *Bitmap {
-	if bm, ok := b.bitmap_cache[bitmap_id]; ok {
-		return bm.bitmap
-	}
-
-	// I should fetch the category here..need to come up with a good source
-	bm, filter := b.storage.Fetch(bitmap_id, b.db, b.frame, b.slice)
-	b.cache_it(bm, bitmap_id, filter)
-	return bm
-}
-
-func (b *Brand) Get_nocache(bitmap_id uint64) (*Bitmap, uint64) {
-	if bm, ok := b.bitmap_cache[bitmap_id]; ok {
-		return bm.bitmap, bm.category
-	}
-
-	//I should fetch the category here..need to come up with a good source
-	return b.storage.Fetch(bitmap_id, b.db, b.frame, b.slice)
-}
-
-func (b *Brand) GetFilter(bitmap_id, filter uint64) *Bitmap {
-	bm, old_filter := b.storage.Fetch(bitmap_id, b.db, b.frame, b.slice)
-	if filter == 0 {
-		filter = old_filter
-	}
-	b.cache_it(bm, bitmap_id, filter)
-	return bm
-}
-
-func (b *Brand) cache_it(bm *Bitmap, bitmap_id uint64, category uint64) {
-	if bm.Count() >= b.threshold_value {
-		b.bitmap_cache[bitmap_id] = &Rank{&Pair{bitmap_id, bm.Count()}, bm, category}
-		if len(b.bitmap_cache) > b.threshold_length {
-			log.Info("RANK:", len(b.bitmap_cache), b.threshold_length, b.threshold_value)
-			b.Rank()
-			b.trim()
-		}
-	}
-}
-
-func (b *Brand) trim() {
-	for k, item := range b.bitmap_cache {
-		if item.bitmap.Count() <= b.threshold_value {
-			delete(b.bitmap_cache, k)
-		}
-	}
-	log.Info("TRIM:", len(b.bitmap_cache), b.threshold_length)
-}
-
-func (b *Brand) SetBit(bitmap_id uint64, bit_pos uint64, filter uint64) bool {
-	bm1, ok := b.bitmap_cache[bitmap_id]
-	var bm *Bitmap
-	if ok {
-		bm = bm1.bitmap
-	} else {
-		bm = b.GetFilter(bitmap_id, filter) //aways overwrites what is in cass filter type
-	}
-	change, chunk, address := bm.SetBit(bit_pos)
-	if change {
-		val := chunk.Value[address.BlockIndex]
-		b.storage.StoreBit(bitmap_id, b.db, b.frame, b.slice, filter, address.ChunkKey, int32(address.BlockIndex), val, bm.Count())
-		b.rank_count++
-	}
-	return change
-}
-
-func (b *Brand) Rank() {
-	start := time.Now()
-	var list RankList
-	for k, item := range b.bitmap_cache {
-		list = append(list, &Rank{&Pair{k, item.bitmap.Count()}, item.bitmap, item.category})
-	}
-	sort.Sort(list)
-	b.rankings = list
-	if len(list) > b.threshold_idx {
-		item := list[b.threshold_idx]
-		b.threshold_value = item.bitmap.Count()
-	} else {
-		b.threshold_value = 1
-	}
-
-	b.rank_count = 0
-	delta := time.Since(start)
-	statsd.SendTimer("brand_Rank", delta.Nanoseconds())
-	b.rank_time = start
-}
-
-func packagePairs(r RankList) []Pair {
-	res := make([]Pair, r.Len())
-	for i, v := range r {
-		res[i] = Pair{v.Key, v.Count}
-	}
-	return res
-}
-
-func (b *Brand) Stats() interface{} {
-	total := uint64(0)
-	i := uint64(0)
-	bit_total := uint64(0)
-	for _, v := range b.bitmap_cache {
-		total += uint64(v.bitmap.Len()) * uint64(256)
-		i += 1
-		bit_total += v.Count
-	}
-	avg_bytes := uint64(0)
-	avg_bits := uint64(0)
-	if i > 0 {
-		avg_bytes = total / i
-		avg_bits = bit_total / i
-	}
-
-	stats := map[string]interface{}{
-		"total size of cache in bytes":       total,
-		"number of bitmaps":                  len(b.bitmap_cache),
-		"avg size of bitmap in space(bytes)": avg_bytes,
-		"avg size of bitmap in bits":         avg_bits,
-		"rank counter":                       b.rank_count,
-		"threshold_value":                    b.threshold_value,
-		"threshold_length":                   b.threshold_length,
-		"threshold_idx":                      b.threshold_idx,
-		"skip":                               b.skip}
-	return stats
-}
-
-func (b *Brand) Store(bitmap_id uint64, bm *Bitmap, filter uint64) error {
-	if err := b.storage.Store(bitmap_id, b.db, b.frame, b.slice, filter, bm); err != nil {
-		return err
-	}
-	b.cache_it(bm, bitmap_id, filter)
-	return nil
-}
-
-func (b *Brand) checkRank() {
-	if len(b.rankings) < 50 {
-		b.Rank()
-		return
-	}
-
-	if b.rank_count > 0 {
-		last := time.Since(b.rank_time) * time.Second
-		if last > 60*5 {
-			b.Rank()
-		}
-	}
-}
-func (b *Brand) TopN(src_bitmap *Bitmap, n int, categories []uint64) []Pair {
-	b.checkRank()
-	set := make(map[uint64]struct{})
-	for _, v := range categories {
-		set[v] = struct{}{}
-	}
-
-	return b.TopNCat(src_bitmap, n, set)
-}
-
-func dump(r RankList, n int) {
-	for i, v := range r {
-		log.Info(i, v)
-		if i > n {
-			return
-		}
-	}
-}
-
-func (b *Brand) TopNAll(n int, categories []uint64) []Pair {
-	log.Trace("TopNAll")
-
-	b.checkRank()
-	results := make([]Pair, 0, 0)
-
-	set := make(map[uint64]struct{})
-	needCat := false
-	for _, v := range categories {
-		set[v] = struct{}{}
-		needCat = true
-	}
-
-	count := 0
-	for _, pair := range b.rankings {
-		if needCat {
-			if _, ok := set[pair.category]; !ok {
-				continue
-			}
-		}
-
-		if count >= n {
-			break
-		}
-		if pair.Count > 0 {
-			results = append(results, Pair{pair.Key, pair.Count})
-		}
-		count++
-	}
-	return results
-}
-
-func (b *Brand) TopNCat(src_bitmap *Bitmap, n int, set map[uint64]struct{}) []Pair {
-	breakout := 1000
-	var (
-		o       *Rank
-		results RankList
-	)
-	counter := 0
-	x := 0
-
-	needCat := (len(set) > 0)
-	for i, pair := range b.rankings {
-		if needCat {
-			if _, ok := set[pair.category]; !ok {
-				continue
-			}
-		}
-
-		if counter > n {
-			break
-		}
-		bc := src_bitmap.IntersectionCount(pair.bitmap)
-		if bc > 0 {
-			results = append(results, &Rank{&Pair{pair.Key, bc}, nil, pair.category})
-			counter = counter + 1
-		}
-		x = i
-	}
-
-	sort.Sort(results)
-	if counter < n {
-		return packagePairs(results)
-	}
-	end := len(results) - 1
-	o = results[end]
-	current_threshold := o.Count
-
-	if current_threshold <= 10 {
-		return packagePairs(results)
-	}
-
-	results = append(results, o)
-
-	for i := x + 1; i < len(b.rankings); i++ {
-		o = b.rankings[i]
-
-		if needCat {
-			if _, ok := set[o.category]; !ok {
-				continue
-			}
-			counter = counter + 1
-		} else {
-			counter = counter + 1
-		}
-
-		if counter > breakout {
-			break
-		}
-
-		//if o.Count < current_threshold { //done
-		//need something to do with the size of initianl bitmap
-		if o.Count < current_threshold { //done
-			break
-
-		}
-
-		bc := src_bitmap.IntersectionCount(o.bitmap)
-
-		if bc > current_threshold {
-			if results[end-1].Count > bc {
-				results[end] = &Rank{&Pair{o.Key, bc}, nil, o.category}
-				current_threshold = bc
-			} else {
-				results[end+1] = &Rank{&Pair{o.Key, bc}, nil, o.category}
-				sort.Sort(results)
-				o = results[end]
-				current_threshold = o.Count
-			}
-		}
-	}
-	return packagePairs(results[:end])
-}
-func (b *Brand) getFileName() string {
-	base := FragmentBase
-	if base == "" {
-		base = "."
-	}
-
-	return fmt.Sprintf("%s/%s.%s.%d.json", base, b.db, b.frame, b.slice)
-}
-
-func (b *Brand) Persist() error {
-	log.Info("Brand Persist:", b.getFileName())
-	b.storage.Flush()
-	asize := len(b.bitmap_cache)
-
-	if asize == 0 {
-		log.Warn("Nothing to save ", b.getFileName())
-		return nil
-	}
-	w, err := createFile(b.getFileName())
-	if err != nil {
-		log.Warn("Error opening outfile ", b.getFileName())
-		log.Warn(err)
-		return err
-	}
-	defer w.Close()
-	defer b.storage.Close()
-
-	var list RankList
-	for k, item := range b.bitmap_cache {
-		list = append(list, &Rank{&Pair{k, item.bitmap.Count()}, item.bitmap, item.category})
-	}
-
-	sort.Sort(list)
-
-	results := make([]uint64, asize)
-	i := 0
-	for _, k := range list { //   map[uint64]*Rank
-		results[i] = k.Key
-		i += 1
-	}
-
-	encoder := json.NewEncoder(w)
-	return encoder.Encode(results)
-}
-
-func (b *Brand) Load(f *Fragment) {
-	log.Warn("Brand Load")
-	time.Sleep(time.Duration(rand.Intn(32)) * time.Second) //trying to avoid mass cassandra hit
-	r, err := openFile(b.getFileName())
-	if err != nil {
-		log.Warn("NO Brand Init File:", b.getFileName())
-		return
-	}
-	dec := json.NewDecoder(r)
-	var keys []uint64
-	if err := dec.Decode(&keys); err != nil {
-		return
-	}
-
-	globalLock.Lock()
-	defer globalLock.Unlock()
-
-	// probaly need to get a etcd lock too someday
-	for _, k := range keys {
-		b.Get(k)
-		time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond) //trying to avoid mass cassandra hit
-	}
-}
-
-func (b *Brand) ClearBit(bitmap_id uint64, bit_pos uint64) bool {
-	log.Trace("ClearBit", bitmap_id, bit_pos)
-	bm1, ok := b.bitmap_cache[bitmap_id]
-	var bm *Bitmap
-	filter := uint64(0)
-	if ok {
-		bm = bm1.bitmap
-		filter = bm1.category
-	} else {
-		bm, filter = b.Get_nocache(bitmap_id)
-		if bm.Count() == 0 {
-			return false //nothing to unset
-		}
-	}
-
-	changed, chunk, address := bm.ClearBit(bit_pos)
-	if changed {
-		val := chunk.Value[address.BlockIndex]
-		if val == 0 {
-			b.storage.RemoveBit(bitmap_id, b.db, b.frame, b.slice, filter, address.ChunkKey, int32(address.BlockIndex), bm.Count())
-		} else {
-			b.storage.StoreBit(bitmap_id, b.db, b.frame, b.slice, filter, address.ChunkKey, int32(address.BlockIndex), val, bm.Count())
-		}
-		b.rank_count++
-	}
-
-	return changed
-}
diff --git a/brand_test.go b/brand_test.go
deleted file mode 100644
index 6ff6a2895..000000000
--- a/brand_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package pilosa_test
-
-import (
-	"math/rand"
-	"testing"
-
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/statsd"
-	"github.com/umbel/pilosa/storage/mem"
-)
-
-var (
-	size      int
-	membrand  *pilosa.Brand
-	cassbrand *pilosa.Brand
-)
-
-func init() {
-	size = 1000
-
-	statsd.Setup()
-	// SetupCassandra()
-
-	membrand = pilosa.NewBrand("db", "frame", 0, mem.NewStorage(), size, size, 0)
-	for i := uint64(0); i < uint64(size); i++ {
-		membrand.SetBit(i, 0, 1)
-	}
-	// cassbrand = NewBrand("db", "frame", 0, NewCassStorage(), size, size, 0)
-	// for i := uint64(0); i < uint64(size); i++ {
-	// 	cassbrand.SetBit(i, 0, 1)
-	// }
-}
-
-func benchmarkBrand(b *testing.B, size int, fill int, brand *pilosa.Brand) {
-	println(b.N)
-	for i := 0; i < b.N; i++ {
-		bid := rand.Int() % size
-		profile := uint64(i % fill)
-		brand.SetBit(uint64(bid), profile, 1)
-	}
-}
-
-func BenchmarkBrandMemSetBitL2(b *testing.B) { benchmarkBrand(b, size, 1024*64, membrand) }
-func BenchmarkBrandCasSetBitL2(b *testing.B) { benchmarkBrand(b, size, 1024*64, cassbrand) }
diff --git a/cache.go b/cache.go
new file mode 100644
index 000000000..7040b124c
--- /dev/null
+++ b/cache.go
@@ -0,0 +1,262 @@
+package pilosa
+
+import (
+	"encoding/json"
+	"io"
+	"sort"
+	"time"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/golang/groupcache/lru"
+	"github.com/umbel/pilosa/internal"
+)
+
+// Cache represents a cache for bitmaps.
+type Cache interface {
+	io.WriterTo
+	io.ReaderFrom
+
+	Add(bitmapID, category uint64, bm *Bitmap)
+	Get(bitmapID uint64) (bm *Bitmap, ok bool)
+	Len() int
+
+	// Updates the cache, if necessary.
+	Invalidate()
+
+	// Returns a list of all key/count pairs.
+	Pairs() []Pair
+}
+
+// LRUCache represents a least recently used Cache implemenation.
+type LRUCache struct {
+	cache *lru.Cache
+	keys  map[uint64]struct{}
+}
+
+// NewLRUCache returns a new instance of LRUCache.
+func NewLRUCache(maxEntries int) *LRUCache {
+	c := &LRUCache{
+		cache: lru.New(maxEntries),
+		keys:  make(map[uint64]struct{}),
+	}
+	c.cache.OnEvicted = c.onEvicted
+	return c
+}
+
+// Get returns a bitmap with a given id.
+func (c *LRUCache) Add(bitmapID, category uint64, bm *Bitmap) {
+	c.cache.Add(bitmapID, bm)
+	c.keys[bitmapID] = struct{}{}
+}
+
+// Get returns a bitmap with a given id.
+func (c *LRUCache) Get(bitmapID uint64) (bm *Bitmap, ok bool) {
+	value, ok := c.cache.Get(bitmapID)
+	if !ok {
+		return nil, false
+	}
+	return value.(*Bitmap), true
+}
+
+// Len returns the number of items in the cache.
+func (c *LRUCache) Len() int { return c.cache.Len() }
+
+// Invalidate is a no-op.
+func (c *LRUCache) Invalidate() {}
+
+// Pairs returns all key/count pairs in the cache.
+func (c *LRUCache) Pairs() []Pair {
+	a := make([]Pair, 0, len(c.keys))
+	for k := range c.keys {
+		bm, _ := c.Get(k)
+
+		a = append(a, Pair{
+			Key:   k,
+			Count: bm.Count(),
+		})
+	}
+	return a
+}
+
+// WriteTo writes the cache to w.
+func (c *LRUCache) WriteTo(w io.Writer) (n int64, err error) {
+	// Write keys to slice.
+	a := make([]uint64, 0, len(c.keys))
+	for k := range c.keys {
+		a = append(a, k)
+	}
+
+	// Encode to file as array of keys.
+	if err := json.NewEncoder(w).Encode(a); err != nil {
+		return 0, err
+	}
+	return 0, nil
+}
+
+// ReadFrom read from r into the cache.
+func (c *LRUCache) ReadFrom(r io.Reader) (n int64, err error) {
+	var keys []uint64
+	if err := json.NewDecoder(r).Decode(&keys); err != nil {
+		return 0, err
+	}
+	panic("FIXME: TODO")
+}
+
+func (c *LRUCache) onEvicted(key lru.Key, _ interface{}) {
+	delete(c.keys, key.(uint64))
+}
+
+// Ensure LRUCache implements Cache.
+var _ Cache = &LRUCache{}
+
+// RankCache represents a cache with sorted entries.
+type RankCache struct {
+	entries  map[uint64]*Pair
+	rankings []Pair // cached, ordered list
+
+	updateN    int
+	updateTime time.Time
+
+	ThresholdLength int
+	ThresholdIndex  int
+	ThresholdValue  uint64
+}
+
+// NewRankCache returns a new instance of RankCache.
+func NewRankCache() *RankCache {
+	return &RankCache{
+		entries: make(map[uint64]*Pair),
+	}
+}
+
+// Get returns a bitmap with a given id.
+func (c *RankCache) Add(bitmapID, category uint64, bm *Bitmap) {
+	// Ignore if the bit count on the bitmap is below the threshold.
+	if bm.Count() < c.ThresholdValue {
+		return
+	}
+
+	// Add to cache.
+	c.entries[bitmapID] = &Pair{
+		Key:      bitmapID,
+		Count:    bm.Count(),
+		bitmap:   bm,
+		category: category,
+	}
+
+	// If size is larger than the threshold then trim it.
+	if len(c.entries) > c.ThresholdLength {
+		c.update()
+		for k, entry := range c.entries {
+			if entry.bitmap.Count() <= c.ThresholdValue {
+				delete(c.entries, k)
+			}
+		}
+	}
+}
+
+// Get returns a bitmap with a given id.
+func (c *RankCache) Get(bitmapID uint64) (bm *Bitmap, ok bool) {
+	entry, ok := c.entries[bitmapID]
+	if !ok {
+		return nil, false
+	}
+	return entry.bitmap, true
+}
+
+// Len returns the number of items in the cache.
+func (c *RankCache) Len() int { return len(c.entries) }
+
+// Invalidate reorders the entries, if necessary.
+func (c *RankCache) Invalidate() {
+	// Update if there aren't many items or it hasn't been updated recently.
+	if len(c.rankings) < 50 || (c.updateN > 0 && time.Since(c.updateTime) > 5*time.Minute) {
+		c.update()
+	}
+}
+
+// update reorders the entries by rank.
+func (c *RankCache) update() {
+	// Convert cache to a sorted list.
+	list := make([]Pair, 0, len(c.entries))
+	for k, item := range c.entries {
+		list = append(list, Pair{
+			Key:      k,
+			Count:    item.bitmap.Count(),
+			bitmap:   item.bitmap,
+			category: item.category,
+		})
+	}
+	sort.Sort(Pairs(list))
+
+	// Store the count of the item at the threshold index.
+	c.rankings = list
+	if len(c.rankings) > c.ThresholdIndex {
+		c.ThresholdValue = list[c.ThresholdIndex].bitmap.Count()
+	} else {
+		c.ThresholdValue = 1
+	}
+
+	// Reset counters.
+	c.updateTime, c.updateN = time.Now(), 0
+}
+
+// Pairs returns an ordered list of key/count pairs.
+func (c *RankCache) Pairs() []Pair { return c.rankings }
+
+// WriteTo writes the cache to w.
+func (c *RankCache) WriteTo(w io.Writer) (n int64, err error) {
+	panic("FIXME: TODO")
+}
+
+// ReadFrom read from r into the cache.
+func (c *RankCache) ReadFrom(r io.Reader) (n int64, err error) {
+	panic("FIXME: TODO")
+}
+
+// Ensure RankCache implements Cache.
+var _ Cache = &RankCache{}
+
+type Pair struct {
+	Key   uint64 `json:"key"`
+	Count uint64 `json:"count"`
+
+	bitmap   *Bitmap
+	category uint64
+}
+
+func encodePair(p Pair) *internal.Pair {
+	return &internal.Pair{
+		Key:   proto.Uint64(p.Key),
+		Count: proto.Uint64(p.Count),
+	}
+}
+
+func decodePair(pb *internal.Pair) Pair {
+	return Pair{
+		Key:   pb.GetKey(),
+		Count: pb.GetCount(),
+	}
+}
+
+type Pairs []Pair
+
+func (p Pairs) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
+func (p Pairs) Len() int           { return len(p) }
+func (p Pairs) Less(i, j int) bool { return p[i].Count > p[j].Count }
+
+func encodePairs(a Pairs) []*internal.Pair {
+	other := make([]*internal.Pair, len(a))
+	for i := range a {
+		other[i] = encodePair(a[i])
+	}
+	return other
+}
+
+func decodePairs(a []*internal.Pair) []Pair {
+	other := make([]Pair, len(a))
+	for i := range a {
+		other[i] = decodePair(a[i])
+	}
+	return other
+}
diff --git a/cluster.go b/cluster.go
new file mode 100644
index 000000000..efdadef98
--- /dev/null
+++ b/cluster.go
@@ -0,0 +1,123 @@
+package pilosa
+
+import (
+	"encoding/binary"
+	"hash/fnv"
+)
+
+const (
+	// DefaultPartitionN is the default number of partitions in a cluster.
+	DefaultPartitionN = 64
+
+	// DefaultReplicaN is the default number of replicas per partition.
+	DefaultReplicaN = 1
+)
+
+// Node represents a node in the cluster.
+type Node struct {
+	Host string
+}
+
+// Nodes represents a list of nodes.
+type Nodes []*Node
+
+// ContainsHost returns true if host matches on of the node's host.
+func (a Nodes) ContainsHost(host string) bool {
+	for _, n := range a {
+		if n.Host == host {
+			return true
+		}
+	}
+	return false
+}
+
+// Hosts returns a list of all hostnames.
+func (a Nodes) Hosts() []string {
+	hosts := make([]string, len(a))
+	for i, n := range a {
+		hosts[i] = n.Host
+	}
+	return hosts
+}
+
+// Cluster represents a collection of nodes.
+type Cluster struct {
+	Nodes []*Node
+
+	// Hashing algorithm used to assign partitions to nodes.
+	Hasher Hasher
+
+	// The number of partitions in the cluster.
+	PartitionN int
+
+	// The number of replicas a partition has.
+	ReplicaN int
+}
+
+// NewCluster returns a new instance of Cluster with defaults.
+func NewCluster() *Cluster {
+	return &Cluster{
+		Hasher:     &jmphasher{},
+		PartitionN: DefaultPartitionN,
+		ReplicaN:   DefaultReplicaN,
+	}
+}
+
+// Partition returns the partition that a slice belongs to.
+func (c *Cluster) Partition(slice uint64) int {
+	var buf [8]byte
+	binary.BigEndian.PutUint64(buf[:], slice)
+
+	// Hash the bytes and mod by partition count.
+	h := fnv.New64a()
+	h.Write(buf[:])
+	return int(h.Sum64() % uint64(c.PartitionN))
+}
+
+// SliceNodes returns a list of nodes that own a slice.
+func (c *Cluster) SliceNodes(slice uint64) []*Node {
+	return c.PartitionNodes(c.Partition(slice))
+}
+
+// PartitionNodes returns a list of nodes that own a partition.
+func (c *Cluster) PartitionNodes(partitionID int) []*Node {
+	// Default replica count to between one and the number of nodes.
+	// The replica count can be zero if there are no nodes.
+	replicaN := c.ReplicaN
+	if replicaN > len(c.Nodes) {
+		replicaN = len(c.Nodes)
+	} else if replicaN == 0 {
+		replicaN = 1
+	}
+
+	// Determine primary owner node.
+	index := c.Hasher.Hash(uint64(partitionID), len(c.Nodes))
+
+	// Collect nodes around the ring.
+	nodes := make([]*Node, replicaN)
+	for i := 0; i < replicaN; i++ {
+		nodes[i] = c.Nodes[(index+i)%len(c.Nodes)]
+	}
+
+	return nodes
+}
+
+// Hasher represents an interface to hash integers into buckets.
+type Hasher interface {
+	// Hashes the key into a number between [0,N).
+	Hash(key uint64, n int) int
+}
+
+// jmphasher represents an implementation of jmphash. Implements Hasher.
+type jmphasher struct{}
+
+// Hash returns the integer hash for the given key.
+func (h *jmphasher) Hash(key uint64, n int) int {
+	b, j := int64(-1), int64(0)
+	for j < int64(n) {
+		b = j
+		key = key*uint64(2862933555777941757) + 1
+		j = int64(float64(b+1) * (float64(int64(1)<<31) / float64((key>>33)+1)))
+	}
+	return int(b)
+}
diff --git a/cluster_test.go b/cluster_test.go
new file mode 100644
index 000000000..13a256fdf
--- /dev/null
+++ b/cluster_test.go
@@ -0,0 +1,90 @@
+package pilosa_test
+
+import (
+	"fmt"
+	"math/rand"
+	"reflect"
+	"testing"
+	"testing/quick"
+
+	"github.com/davecgh/go-spew/spew"
+	"github.com/umbel/pilosa"
+)
+
+// Ensure the cluster can fairly distribute partitions across the nodes.
+func TestCluster_Owners(t *testing.T) {
+	c := pilosa.Cluster{
+		Nodes: []*pilosa.Node{
+			{Host: "serverA:1000"},
+			{Host: "serverB:1000"},
+			{Host: "serverC:1000"},
+		},
+		Hasher:   NewModHasher(),
+		ReplicaN: 2,
+	}
+
+	// Verify nodes are distributed.
+	if a := c.PartitionNodes(0); !reflect.DeepEqual(a, []*pilosa.Node{c.Nodes[0], c.Nodes[1]}) {
+		t.Fatalf("unexpected owners: %s", spew.Sdump(a))
+	}
+
+	// Verify nodes go around the ring.
+	if a := c.PartitionNodes(2); !reflect.DeepEqual(a, []*pilosa.Node{c.Nodes[2], c.Nodes[0]}) {
+		t.Fatalf("unexpected owners: %s", spew.Sdump(a))
+	}
+}
+
+// Ensure the partitioner can assign a fragment to a partition.
+func TestCluster_Partition(t *testing.T) {
+	if err := quick.Check(func(slice uint64, partitionN int) bool {
+		c := pilosa.NewCluster()
+		c.PartitionN = partitionN
+
+		partitionID := c.Partition(slice)
+		if partitionID < 0 || partitionID > partitionN {
+			t.Errorf("partition out of range: slice=%d, p=%d, n=%d", slice, partitionID, partitionN)
+		}
+
+		return true
+	}, &quick.Config{
+		Values: func(values []reflect.Value, rand *rand.Rand) {
+			values[0] = reflect.ValueOf(uint64(rand.Uint32()))
+			values[1] = reflect.ValueOf(rand.Intn(1000) + 1)
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+}
+
+// NewCluster returns a cluster with n nodes and uses a mod-based hasher.
+func NewCluster(n int) *pilosa.Cluster {
+	c := pilosa.NewCluster()
+	c.ReplicaN = 1
+	c.Hasher = NewModHasher()
+
+	for i := 0; i < n; i++ {
+		c.Nodes = append(c.Nodes, &pilosa.Node{
+			Host: fmt.Sprintf("host%d", i),
+		})
+	}
+
+	return c
+}
+
+// ModHasher represents a simple, mod-based hashing.
+type ModHasher struct{}
+
+// NewModHasher returns a new instance of ModHasher with n buckets.
+func NewModHasher() *ModHasher { return &ModHasher{} }
+
+func (*ModHasher) Hash(key uint64, n int) int { return int(key) % n }
+
+// ConstHasher represents hash that always returns the same index.
+type ConstHasher struct {
+	i int
+}
+
+// NewConstHasher returns a new instance of ConstHasher that always returns i.
+func NewConstHasher(i int) *ConstHasher { return &ConstHasher{i: i} }
+
+func (h *ConstHasher) Hash(key uint64, n int) int { return h.i }
diff --git a/cmd/pilosa/config.go b/cmd/pilosa/config.go
index 37bf27534..ba57ef2b2 100644
--- a/cmd/pilosa/config.go
+++ b/cmd/pilosa/config.go
@@ -4,106 +4,55 @@ import (
 	"time"
 
 	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/statsd"
-	_ "github.com/umbel/pilosa/storage"
-	"github.com/umbel/pilosa/storage/cassandra"
-	"github.com/umbel/pilosa/transport"
 )
 
 const (
-	// DefaultLogPath is the default file path where the log will be written.
-	DefaultLogPath = "/tmps"
+	// DefaultHost is the default hostname to use.
+	DefaultHost = "localhost"
 
-	// DefaultLogLevel is the default logging level used by seelog.
-	DefaultLogLevel = "info"
-
-	// DefaultFragmentBase is the default path where fragments are stored.
-	DefaultFragmentBase = "/tmp/single"
-)
-
-var (
-	// DefaultSupportedFrames are the frames supported by default.
-	DefaultSupportedFrames = [...]string{"b.n", "t.t", "l.n", "d", "p.n"}
-
-	// DefaultETCDHosts are the default hosts to connect to.
-	DefaultETCDHosts = [...]string{"http://127.0.0.1:4001"}
+	// DefaultAddr is the default HTTP address to use.
+	DefaultAddr = ":15000"
 )
 
 // Config represents the configuration for the command.
 type Config struct {
-	ID   *pilosa.GUID `toml:"id"`
-	Host string       `toml:"host"`
+	Host string `toml:"host"`
+	Addr string `toml:"addr"`
 
-	TCP struct {
-		Port int `toml:"port"`
-	} `toml:"tcp"`
-
-	HTTP struct {
-		Port             int    `toml:"port"`
-		DefaultDB        string `toml:"default-db"`
-		RequestLogPath   string `toml:"request-log-path"`
-		SetBitLogEnabled bool   `toml:"set-bit-log-enabled"`
-	} `toml:"http"`
-
-	Log struct {
-		Path  string `toml:"path"`
-		Level string `toml:"level"`
-	}
-
-	Storage struct {
-		Backend  string   `toml:"backend"`
-		Hosts    []string `toml:"hosts"`
-		Keyspace string   `toml:"keyspace"`
-
-		FragmentBase    string   `toml:"fragment-base"`
-		SupportedFrames []string `toml:"supported-frames"`
-
-		CassandraTimeWindow   Duration `toml:"cassandra-time-window"`
-		CassandraMaxSizeBatch int      `toml:"cassandra-max-size-batch"`
-	} `toml:"storage"`
-
-	AWS struct {
-		AccessKeyID     string `toml:"access-key-id"`
-		SecretAccessKey string `toml:"secret-access-key"`
-	} `toml:"aws"`
-
-	LevelDB struct {
-		Path string `toml:"path"`
-	} `toml:"leveldb"`
-
-	Statsd struct {
-		Host string `toml:"host"`
-	} `toml:"statsd"`
+	Cluster struct {
+		ReplicaN int `toml:"replicas"`
+		Nodes    []struct {
+			Host string `toml:"host"`
+		} `toml:"nodes"`
+	} `toml:"cluster"`
 
 	Plugins struct {
 		Path string `toml:"path"`
 	} `toml:"plugins"`
-
-	ETCD struct {
-		Hosts                []string `toml:"hosts"`
-		FragmentAllocLockTTL Duration `toml:"fragment-alloc-lock-ttl"`
-	} `toml:"etcd"`
 }
 
 // NewConfig returns an instance of Config with default options.
-func NewConfig() Config {
-	var c Config
-	c.Host = "localhost"
-	c.TCP.Port = transport.DefaultTCPPort
-	c.HTTP.Port = transport.DefaultHTTPPort
-	c.Log.Path = DefaultLogPath
-	c.Storage.Backend = pilosa.DefaultBackend
-	c.Storage.Hosts = cassandra.DefaultHosts
-	c.Storage.Keyspace = cassandra.DefaultKeyspace
-	c.Storage.FragmentBase = DefaultFragmentBase
-	c.Storage.SupportedFrames = DefaultSupportedFrames[:]
-	c.Storage.CassandraTimeWindow = Duration(cassandra.DefaultFlushInterval)
-	c.Storage.CassandraMaxSizeBatch = cassandra.DefaultFlushThreshold
-	c.Statsd.Host = statsd.DefaultHost
-	c.ETCD.Hosts = DefaultETCDHosts[:]
+func NewConfig() *Config {
+	c := &Config{
+		Host: DefaultHost,
+		Addr: DefaultAddr,
+	}
+	c.Cluster.ReplicaN = pilosa.DefaultReplicaN
 	return c
 }
 
+// PilosaCluster returns a new instance of pilosa.Cluster based on the config.
+func (c *Config) PilosaCluster() *pilosa.Cluster {
+	cluster := pilosa.NewCluster()
+	cluster.ReplicaN = c.Cluster.ReplicaN
+
+	for _, n := range c.Cluster.Nodes {
+		cluster.Nodes = append(cluster.Nodes, &pilosa.Node{Host: n.Host})
+	}
+
+	return cluster
+}
+
 // Duration is a TOML wrapper type for time.Duration.
 type Duration time.Duration
 
diff --git a/cmd/pilosa/config_test.go b/cmd/pilosa/config_test.go
index 3ea0fda09..97ca8f605 100644
--- a/cmd/pilosa/config_test.go
+++ b/cmd/pilosa/config_test.go
@@ -1,157 +1,27 @@
 package main_test
 
 import (
-	"reflect"
 	"testing"
-	"time"
 
 	"github.com/BurntSushi/toml"
 	"github.com/umbel/pilosa/cmd/pilosa"
 )
 
-// Ensure the ID can be parsed as a GUID.
-func TestConfig_Parse_ID(t *testing.T) {
-	if c, err := ParseConfig(`
-id = "00000000-0000-0000-0000-000000000001"
-`); err != nil {
-		t.Fatal(err)
-	} else if c.ID == nil || c.ID.String() != `00000000-0000-0000-0000-000000000001` {
-		t.Fatalf("unexpected id: %s", c.ID)
-	}
-}
-
-// Ensure that parsing an invalid GUID returns an error.
-func TestConfig_Parse_ID_ErrInvalid(t *testing.T) {
-	if _, err := ParseConfig(`
-id = "x"
-`); err == nil || err.Error() != `Type mismatch for 'main.Config.id': invalid GUID "x"` {
-		t.Fatal(err)
-	}
-}
-
 // Ensure the host can be parsed.
 func TestConfig_Parse_Host(t *testing.T) {
-	if c, err := ParseConfig(`host = "localhost"`); err != nil {
+	if c, err := ParseConfig(`host = "local"`); err != nil {
 		t.Fatal(err)
-	} else if c.Host != "localhost" {
+	} else if c.Host != "local" {
 		t.Fatalf("unexpected host: %s", c.Host)
 	}
 }
 
-// Ensure the "tcp" config can be parsed.
-func TestConfig_Parse_TCP(t *testing.T) {
-	if c, err := ParseConfig(`
-[tcp]
-port = 123
-`); err != nil {
+// Ensure the addr can be parsed.
+func TestConfig_Parse_Addr(t *testing.T) {
+	if c, err := ParseConfig(`addr = ":80"`); err != nil {
 		t.Fatal(err)
-	} else if c.TCP.Port != 123 {
-		t.Fatalf("unexpected port: %s", c.TCP.Port)
-	}
-}
-
-// Ensure the "http" config can be parsed.
-func TestConfig_Parse_HTTP(t *testing.T) {
-	if c, err := ParseConfig(`
-[http]
-port = 123
-default-db = "xyz"
-request-log-path = "/path/to/log"
-set-bit-log-enabled = true
-`); err != nil {
-		t.Fatal(err)
-	} else if c.HTTP.Port != 123 {
-		t.Fatalf("unexpected port: %s", c.HTTP.Port)
-	} else if c.HTTP.DefaultDB != "xyz" {
-		t.Fatalf("unexpected default db: %s", c.HTTP.DefaultDB)
-	} else if c.HTTP.RequestLogPath != "/path/to/log" {
-		t.Fatalf("unexpected request log path: %s", c.HTTP.RequestLogPath)
-	} else if c.HTTP.SetBitLogEnabled != true {
-		t.Fatalf("unexpected set bit log enabled: %v", c.HTTP.SetBitLogEnabled)
-	}
-}
-
-// Ensure the "log" config can be parsed.
-func TestConfig_Parse_Log(t *testing.T) {
-	if c, err := ParseConfig(`
-[log]
-path = "/path/to/log"
-level = "debug"
-`); err != nil {
-		t.Fatal(err)
-	} else if c.Log.Path != "/path/to/log" {
-		t.Fatalf("unexpected path: %s", c.Log.Path)
-	} else if c.Log.Level != "debug" {
-		t.Fatalf("unexpected level: %s", c.Log.Level)
-	}
-}
-
-// Ensure the "storage" config can be parsed.
-func TestConfig_Parse_Storage(t *testing.T) {
-	if c, err := ParseConfig(`
-[storage]
-backend = "cassandra"
-hosts = ["server0", "server1"]
-keyspace = "pilosa"
-fragment-base = "/path/to/base"
-supported-frames = ["a", "b", "c"]
-cassandra-time-window = "5s"
-cassandra-max-size-batch = 50
-`); err != nil {
-		t.Fatal(err)
-	} else if c.Storage.Backend != "cassandra" {
-		t.Fatalf("unexpected backend: %s", c.Storage.Backend)
-	} else if !reflect.DeepEqual(c.Storage.Hosts, []string{"server0", "server1"}) {
-		t.Fatalf("unexpected hosts: %+v", c.Storage.Hosts)
-	} else if c.Storage.Keyspace != "pilosa" {
-		t.Fatalf("unexpected keyspace: %s", c.Storage.Keyspace)
-	} else if c.Storage.FragmentBase != "/path/to/base" {
-		t.Fatalf("unexpected fragment base: %s", c.Storage.FragmentBase)
-	} else if !reflect.DeepEqual(c.Storage.SupportedFrames, []string{"a", "b", "c"}) {
-		t.Fatalf("unexpected supported frames: %s", c.Storage.SupportedFrames)
-	} else if time.Duration(c.Storage.CassandraTimeWindow) != 5*time.Second {
-		t.Fatalf("unexpected cassandra time window: %s", time.Duration(c.Storage.CassandraTimeWindow))
-	} else if c.Storage.CassandraMaxSizeBatch != 50 {
-		t.Fatalf("unexpected cassandra max size batch: %s", c.Storage.CassandraMaxSizeBatch)
-	}
-}
-
-// Ensure the "aws" config can be parsed.
-func TestConfig_Parse_AWS(t *testing.T) {
-	if c, err := ParseConfig(`
-[aws]
-access-key-id = "abc"
-secret-access-key = "def"
-`); err != nil {
-		t.Fatal(err)
-	} else if c.AWS.AccessKeyID != "abc" {
-		t.Fatalf("unexpected access key id: %s", c.AWS.AccessKeyID)
-	} else if c.AWS.SecretAccessKey != "def" {
-		t.Fatalf("unexpected secret access key: %s", c.AWS.SecretAccessKey)
-	}
-}
-
-// Ensure the "leveldb" config can be parsed.
-func TestConfig_Parse_LevelDB(t *testing.T) {
-	if c, err := ParseConfig(`
-[leveldb]
-path = "/path/to/db"
-`); err != nil {
-		t.Fatal(err)
-	} else if c.LevelDB.Path != "/path/to/db" {
-		t.Fatalf("unexpected path: %s", c.LevelDB.Path)
-	}
-}
-
-// Ensure the "statsd" config can be parsed.
-func TestConfig_Parse_Statsd(t *testing.T) {
-	if c, err := ParseConfig(`
-[statsd]
-host = "localhost"
-`); err != nil {
-		t.Fatal(err)
-	} else if c.Statsd.Host != "localhost" {
-		t.Fatalf("unexpected host: %s", c.Statsd.Host)
+	} else if c.Addr != ":80" {
+		t.Fatalf("unexpected addr: %s", c.Addr)
 	}
 }
 
@@ -167,21 +37,6 @@ path = "/path/to/plugins"
 	}
 }
 
-// Ensure the "etcd" config can be parsed.
-func TestConfig_Parse_ETCD(t *testing.T) {
-	if c, err := ParseConfig(`
-[etcd]
-hosts = ["127.0.0.1"]
-fragment-alloc-lock-ttl = "5m"
-`); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(c.ETCD.Hosts, []string{"127.0.0.1"}) {
-		t.Fatalf("unexpected hosts: %+v", c.ETCD.Hosts)
-	} else if time.Duration(c.ETCD.FragmentAllocLockTTL) != 5*time.Minute {
-		t.Fatalf("unexpected fragment alloc lock ttl: %v", c.ETCD.FragmentAllocLockTTL)
-	}
-}
-
 // ParseConfig parses s into a config.
 func ParseConfig(s string) (main.Config, error) {
 	var c main.Config
diff --git a/cmd/pilosa/main.go b/cmd/pilosa/main.go
index 5addecc66..d67326c64 100644
--- a/cmd/pilosa/main.go
+++ b/cmd/pilosa/main.go
@@ -4,37 +4,64 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log"
+	"math/rand"
+	"net"
+	"net/http"
 	"os"
 	"runtime/pprof"
 	"time"
 
 	"github.com/BurntSushi/toml"
-	log "github.com/cihub/seelog"
-	"github.com/coreos/go-etcd/etcd"
-	"github.com/kr/s3/s3util"
 	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/core"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/dispatch"
-	"github.com/umbel/pilosa/executor"
-	"github.com/umbel/pilosa/hold"
-	"github.com/umbel/pilosa/statsd"
-	"github.com/umbel/pilosa/transport"
 )
 
 // Build holds the build information passed in at compile time.
 var Build string
 
+func init() {
+	if Build == "" {
+		Build = "v0.0.0"
+	}
+
+	rand.Seed(time.Now().UTC().UnixNano())
+}
+
 func main() {
 	m := NewMain()
-	if err := m.Run(os.Args[1:]...); err != nil {
-		fmt.Fprintln(m.Stderr, err.Error())
-		os.Exit(-1)
+	fmt.Fprintf(m.Stderr, "Pilosa %s\n", Build)
+
+	// Parse command line arguments.
+	if err := m.ParseFlags(os.Args[1:]); err != nil {
+		fmt.Fprintln(m.Stderr, err)
+		os.Exit(2)
 	}
+
+	// Execute the program.
+	if err := m.Run(); err != nil {
+		fmt.Fprintln(m.Stderr, err)
+		os.Exit(1)
+	}
+
+	// Wait indefinitely.
+	<-(chan struct{})(nil)
 }
 
 // Main represents the main program execution.
 type Main struct {
+	ln net.Listener
+
+	// Path to the configuration file.
+	ConfigPath string
+
+	// Configuration options.
+	Config *Config
+
+	// Profiling paths
+	CPUProfile string
+
+	// Standard input/output
+	Stdin  io.Reader
 	Stdout io.Writer
 	Stderr io.Writer
 }
@@ -42,6 +69,9 @@ type Main struct {
 // NewMain returns a new instance of Main.
 func NewMain() *Main {
 	return &Main{
+		Config: NewConfig(),
+
+		Stdin:  os.Stdin,
 		Stdout: os.Stdout,
 		Stderr: os.Stderr,
 	}
@@ -49,31 +79,16 @@ func NewMain() *Main {
 
 // Run executes the main program execution.
 func (m *Main) Run(args ...string) error {
-	defer log.Flush()
+	logger := log.New(m.Stderr, "", log.LstdFlags)
 
-	// Parse command line arguments.
-	opt, err := m.ParseFlags(args)
-	if err != nil {
-		return err
-	}
-
-	// Parse configuration.
-	config := NewConfig()
-	if opt.ConfigPath != "" {
-		if _, err := toml.DecodeFile(opt.ConfigPath, &config); err != nil {
-			return err
-		}
-	}
-
-	// Generate an ID if one is not specified in the config.
-	id := config.ID
-	if id == nil {
-		*id = pilosa.NewGUID()
+	// Notify user of config file.
+	if m.ConfigPath != "" {
+		fmt.Fprintf(m.Stdout, "Using config: %s\n", m.ConfigPath)
 	}
 
 	// Set up profiling.
-	if opt.CPUProfile != "" {
-		f, err := os.Create(opt.CPUProfile)
+	if m.CPUProfile != "" {
+		f, err := os.Create(m.CPUProfile)
 		if err != nil {
 			return err
 		}
@@ -82,127 +97,61 @@ func (m *Main) Run(args ...string) error {
 		defer pprof.StopCPUProfile()
 	}
 
-	// Pass configuration to packages.
-	// NOTE: This is temporary. These config options should be encapsulated in the types.
-	db.SupportedFrames = config.Storage.SupportedFrames
-	pilosa.FragmentBase = config.Storage.FragmentBase
-	pilosa.Backend = config.Storage.Backend
-	pilosa.LevelDBPath = config.LevelDB.Path
+	// Build cluster from config file.
+	cluster := m.Config.PilosaCluster()
 
-	// Initialize AWS storage.
-	s3util.DefaultConfig.AccessKey = config.AWS.AccessKeyID
-	s3util.DefaultConfig.SecretKey = config.AWS.SecretAccessKey
+	// Create index to store fragments.
+	index := pilosa.NewIndex()
 
-	// Initialize Statsd.
-	statsd.Host = config.Statsd.Host
-	statsd.Setup()
+	// Create executor for executing queries.
+	e := pilosa.NewExecutor(index)
+	e.Host = m.Config.Host
+	e.Cluster = cluster
 
-	// Initialize logging.
-	logger, _ := log.LoggerFromConfigAsBytes([]byte(SeelogProductionConfig(config.Log.Path, *id, config.Log.Level)))
-	log.ReplaceLogger(logger)
+	// Initialize HTTP handler.
+	h := pilosa.NewHandler()
+	h.Executor = e
+	h.LogOutput = m.Stderr
 
-	// Initialize etcd client.
-	etcdClient := etcd.NewClient(config.ETCD.Hosts)
+	// Open HTTP listener.
+	ln, err := net.Listen("tcp", m.Config.Addr)
+	if err != nil {
+		return err
+	}
+	m.ln = ln
 
-	// Initialize the cluster.
-	cluster := db.NewCluster()
+	// Serve HTTP.
+	go func() { logger.Print(http.Serve(ln, h)) }()
 
-	// Create index.
-	idx := pilosa.NewFragmentContainer()
-
-	// Initialize the holder.
-	hold := hold.NewHolder()
-
-	// Initialize process map.
-	processMap := core.NewProcessMap()
-
-	// Start process mapper.
-	processMapper := core.NewProcessMapper("/pilosa/0")
-	processMapper.ID = *id
-	processMapper.TCPPort = config.TCP.Port
-	processMapper.HTTPPort = config.HTTP.Port
-	processMapper.Host = config.Host
-	processMapper.ProcessMap = processMap
-	processMapper.EtcdClient = etcdClient
-
-	// Start topology mapper.
-	topologyMapper := core.NewTopologyMapper("/pilosa/0")
-	topologyMapper.Cluster = cluster
-	topologyMapper.ProcessMap = processMap
-	topologyMapper.EtcdClient = etcdClient
-	topologyMapper.Index = idx
-	topologyMapper.SupportedFrames = config.Storage.SupportedFrames
-	topologyMapper.FragmentAllocLockTTL = time.Duration(config.ETCD.FragmentAllocLockTTL)
-
-	// Start the transport.
-	transport := transport.NewTcpTransport(*id)
-	transport.Port = config.TCP.Port
-	transport.ProcessMap = processMap
-	go transport.Run()
-
-	// Create the pinger.
-	pinger := core.NewPinger(*id)
-	pinger.Hold = hold
-	pinger.Transport = transport
-
-	// Create the batcher.
-	batcher := core.NewBatcher(*id)
-	batcher.Cluster = cluster
-	batcher.Hold = hold
-	batcher.Transport = transport
-
-	// Start the web service.
-	core.RequestLogPath = config.HTTP.RequestLogPath
-	ws := core.NewWebService()
-	ws.ID = *id
-	ws.Port = config.HTTP.Port
-	ws.Version = Build
-	ws.DefaultDB = config.HTTP.DefaultDB
-	ws.SetBitLogEnabled = config.HTTP.SetBitLogEnabled
-	ws.Cluster = cluster
-	ws.TopologyMapper = topologyMapper
-	ws.Pinger = pinger
-	ws.Batcher = batcher
-
-	// Start the executor.
-	ex := executor.NewExecutor(*id)
-	ex.ProcessMap = processMap
-	ex.PluginsPath = config.Plugins.Path
-	ex.Hold = hold
-	ex.Index = idx
-
-	// Start the dispatcher.
-	dispatch := dispatch.NewDispatch()
-	dispatch.Executor = ex
-	dispatch.Hold = hold
-	dispatch.Index = idx
-	dispatch.Transport = transport
-	go dispatch.Run()
-
-	fmt.Printf("Pilosa %s\n", Build)
-
-	log.Warn("STOP")
+	fmt.Fprintf(m.Stderr, "Listening on http://%s\n", ln.Addr().String())
 
 	return nil
 }
 
+// Close shuts down the process.
+func (m *Main) Close() error {
+	if m.ln != nil {
+		m.ln.Close()
+	}
+	return nil
+}
+
 // ParseFlags parses command line flags from args.
-func (m *Main) ParseFlags(args []string) (Options, error) {
-	var opt Options
+func (m *Main) ParseFlags(args []string) error {
 	fs := flag.NewFlagSet("pilosa", flag.ContinueOnError)
 	fs.SetOutput(m.Stderr)
-	fs.StringVar(&opt.ConfigPath, "config", "", "config path")
-	fs.StringVar(&opt.CPUProfile, "cpuprofile", "", "write cpu profile to file")
-
+	fs.StringVar(&m.ConfigPath, "config", "", "config path")
+	fs.StringVar(&m.CPUProfile, "cpuprofile", "", "write cpu profile to file")
 	if err := fs.Parse(args); err != nil {
-		return opt, err
+		return err
 	}
 
-	return opt, nil
-}
+	// Load config, if specified.
+	if m.ConfigPath != "" {
+		if _, err := toml.DecodeFile(m.ConfigPath, &m.Config); err != nil {
+			return err
+		}
+	}
 
-// Options represents the command line options.
-type Options struct {
-	CPUProfile string
-	ConfigPath string
+	return nil
 }
diff --git a/cmd/pilosa/seelog.go b/cmd/pilosa/seelog.go
deleted file mode 100644
index b87c1c0cf..000000000
--- a/cmd/pilosa/seelog.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/umbel/pilosa"
-)
-
-func SeelogProductionConfig(path string, id pilosa.GUID, level string) string {
-	if path == "" {
-		path = "/tmp"
-	}
-
-	fname := fmt.Sprintf("%s/pilosa.%s", path, id.String())
-	//<seelog minlevel="debug" maxlevel="error">
-
-	s := fmt.Sprintf(`<seelog minlevel="%s">
-	<outputs>
-		<rollingfile type="size" filename="%s" maxsize="524288000" maxrolls="4" formatid="format1" />
-	</outputs> `, level, fname)
-
-	s += `<formats>
-	    <format id="format1" format="%Date/%Time [%LEV] %Msg%n"/>
-	 </formats>
-	</seelog>`
-
-	return s
-}
diff --git a/cmd/pilosactl/main.go b/cmd/pilosactl/main.go
new file mode 100644
index 000000000..56631a35d
--- /dev/null
+++ b/cmd/pilosactl/main.go
@@ -0,0 +1,65 @@
+package main
+
+import (
+	"errors"
+	"flag"
+	"fmt"
+	"io"
+	"os"
+)
+
+func main() {
+	m := NewMain()
+
+	// Parse command line arguments.
+	if err := m.ParseFlags(os.Args[1:]); err != nil {
+		fmt.Fprintln(m.Stderr, err)
+		os.Exit(2)
+	}
+
+	// Execute the program.
+	if err := m.Run(); err != nil {
+		fmt.Fprintln(m.Stderr, err)
+		os.Exit(1)
+	}
+}
+
+// Main represents the main program execution.
+type Main struct {
+	Command string
+
+	// Standard input/output
+	Stdin  io.Reader
+	Stdout io.Writer
+	Stderr io.Writer
+}
+
+// NewMain returns a new instance of Main.
+func NewMain() *Main {
+	return &Main{
+		Stdin:  os.Stdin,
+		Stdout: os.Stdout,
+		Stderr: os.Stderr,
+	}
+}
+
+// Run executes the main program execution.
+func (m *Main) Run() error {
+	panic("FIXME: implement commands")
+}
+
+// ParseFlags parses command line flags from args.
+func (m *Main) ParseFlags(args []string) error {
+	fs := flag.NewFlagSet("pilosactl", flag.ContinueOnError)
+	fs.SetOutput(m.Stderr)
+	if err := fs.Parse(args); err != nil {
+		return err
+	}
+
+	// Require command.
+	if fs.NArg() == 0 {
+		return errors.New("command required")
+	}
+
+	return nil
+}
diff --git a/cmd/pilosactl/main_test.go b/cmd/pilosactl/main_test.go
new file mode 100644
index 000000000..0fee6f5dc
--- /dev/null
+++ b/cmd/pilosactl/main_test.go
@@ -0,0 +1 @@
+package main_test
diff --git a/core/batch.go b/core/batch.go
deleted file mode 100644
index 647d0e59a..000000000
--- a/core/batch.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package core
-
-import (
-	"encoding/gob"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/hold"
-)
-
-type BatchRequest struct {
-	Id                *pilosa.GUID
-	Source            *pilosa.GUID
-	Fragment_id       pilosa.SUUID
-	Bitmap_id         uint64
-	Compressed_bitmap string
-	Filter            uint64
-}
-
-type BatchResponse struct {
-	Id *pilosa.GUID
-}
-
-func (self BatchResponse) ResultId() *pilosa.GUID {
-	return self.Id
-}
-func (self BatchResponse) ResultData() interface{} {
-	return self.Id
-}
-
-func init() {
-	gob.Register(BatchRequest{})
-	gob.Register(BatchResponse{})
-}
-
-type Batcher struct {
-	ID      pilosa.GUID
-	Cluster *db.Cluster
-	Hold    *hold.Holder
-
-	Transport interface {
-		Send(message *db.Message, host *pilosa.GUID)
-	}
-}
-
-func NewBatcher(id pilosa.GUID) *Batcher {
-	return &Batcher{ID: id}
-}
-
-func (b *Batcher) Batch(database_name, frame, compressed_bitmap string, bitmap_id uint64, slice int, filter uint64) error {
-	log.Trace("Batch:", "db:", database_name, " frame:", frame, " slice:", slice, " cb:", compressed_bitmap, " bid:", bitmap_id, "f:", filter)
-
-	//determine the fragment_id from database/frame/slice
-	database := b.Cluster.GetOrCreateDatabase(database_name)
-	oslice := database.GetOrCreateSlice(slice)
-	//need to find processid and fragment id for that slice
-
-	fragment, err := database.GetFragmentForBitmap(oslice, &db.Bitmap{Id: bitmap_id, FrameType: frame, Filter: filter})
-	if err == nil {
-		id := pilosa.NewGUID()
-		batch := db.Message{Data: BatchRequest{Id: &id, Source: &b.ID, Fragment_id: fragment.GetId(), Bitmap_id: bitmap_id, Compressed_bitmap: compressed_bitmap}}
-		dest_id := fragment.GetProcess().Id()
-		b.Transport.Send(&batch, &dest_id)
-
-		_, err = b.Hold.Get(&id, 60)
-	}
-
-	return err
-}
diff --git a/core/etcd.go b/core/etcd.go
deleted file mode 100644
index d2be6c597..000000000
--- a/core/etcd.go
+++ /dev/null
@@ -1,519 +0,0 @@
-package core
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"runtime/debug"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/coreos/go-etcd/etcd"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-)
-
-const (
-	DefaultFragmentAllocLockTTL = 14400 * time.Second
-)
-
-type TopologyMapper struct {
-	namespace string
-
-	ID         pilosa.GUID
-	Cluster    *db.Cluster
-	ProcessMap *ProcessMap
-
-	SupportedFrames      []string
-	FragmentAllocLockTTL time.Duration
-
-	EtcdClient interface {
-		CreateDir(key string, ttl uint64) (*etcd.Response, error)
-		Get(key string, sort, recursive bool) (*etcd.Response, error)
-		RawCreate(key string, value string, ttl uint64) (*etcd.RawResponse, error)
-		Set(key string, value string, ttl uint64) (*etcd.Response, error)
-		Watch(prefix string, waitIndex uint64, recursive bool, receiver chan *etcd.Response, stop chan bool) (*etcd.Response, error)
-	}
-
-	Index interface {
-		AddFragment(db string, frame string, slice int, id pilosa.SUUID)
-	}
-}
-
-func NewTopologyMapper(namespace string) *TopologyMapper {
-	return &TopologyMapper{
-		namespace:            namespace,
-		FragmentAllocLockTTL: DefaultFragmentAllocLockTTL,
-	}
-}
-
-func (self *TopologyMapper) Setup() {
-	log.Warn(self.namespace + "/db")
-	db_path := self.namespace + "/db"
-	resp, err := self.EtcdClient.Get(db_path, false, true)
-	if err != nil {
-		ee, ok := err.(*etcd.EtcdError)
-		if ok && ee.ErrorCode == 100 { // node does not exist
-			resp, err = self.EtcdClient.CreateDir(db_path, 0)
-			if err != nil {
-				log.Critical(err)
-				os.Exit(-1)
-			}
-		} else {
-			log.Critical(err)
-			os.Exit(-1)
-		}
-	}
-
-	//need to lock the world
-	for _, node := range flatten(resp.Node) {
-		err := self.handlenode(node)
-		if err != nil {
-			log.Warn(err)
-		}
-	}
-
-}
-func (self *TopologyMapper) Run() {
-
-	receiver := make(chan *etcd.Response)
-	go func() {
-		// TODO: add some terminating measure
-		// TODO: use modindex to make sure watch catches everything
-		for {
-			ns := self.namespace + "/db"
-			log.Warn(" ETCD watcher:", ns)
-			stop := make(chan bool)
-			resp, err := self.EtcdClient.Watch(ns, 0, true, receiver, stop)
-			log.Warn("TopologyMapper ETCD watcher", resp, err)
-		}
-	}()
-	go func() {
-		for resp := range receiver {
-			switch resp.Action {
-			case "set":
-				self.handlenode(resp.Node)
-			case "delete":
-				self.remove_fragment(resp.Node)
-			}
-			// TODO: handle deletes
-		}
-	}()
-}
-
-type Pair struct {
-	Key   string
-	Value int
-}
-
-// A slice of Pairs that implements sort.Interface to sort by Value.
-type PairList []Pair
-
-func (p PairList) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-func (p PairList) Len() int           { return len(p) }
-func (p PairList) Less(i, j int) bool { return p[i].Value < p[j].Value }
-
-func getLightestProcess(m map[string]int) (Pair, error) {
-
-	l := len(m)
-	if l == 0 {
-		return Pair{}, errors.New("No Processes")
-	}
-	processlist := make(PairList, l)
-	i := 0
-
-	for k, v := range m {
-		processlist[i] = Pair{k, v}
-		i++
-	}
-	sort.Sort(processlist)
-
-	return processlist[0], nil
-}
-
-func (self *TopologyMapper) GetProcessFragmentCounts() map[string]int {
-	m := make(map[string]int)
-	m[self.ID.String()] = 0 //at least have one process if none created
-	for k, _ := range self.ProcessMap.nodes {
-		p := k.String()
-		m[p] = 0 //at least have one process if none created
-	}
-
-	for _, dbs := range self.Cluster.GetDatabases() {
-		for _, fsi := range dbs.GetFrameSliceIntersects() {
-			for _, fragment := range fsi.GetFragments() {
-				process := fragment.GetProcess().Id().String()
-				if len(process) > 1 {
-					i := m[process]
-					i++
-					m[process] = i
-				}
-			}
-
-		}
-
-	}
-	return m
-}
-
-func (self *TopologyMapper) MakeFragments(db string, slice_int int) error {
-	lock_key := fmt.Sprintf("%s/lock/%s-%d", self.namespace, db, slice_int)
-	response, err := self.EtcdClient.RawCreate(lock_key, "0", uint64(self.FragmentAllocLockTTL.Seconds()))
-
-	if err == nil {
-		if response.StatusCode == 201 { //key created
-			log.Warn("MakeFragments:", db, slice_int)
-			m := self.GetProcessFragmentCounts()
-			p, err := getLightestProcess(m)
-			if err != nil {
-				log.Warn("MakeFragments: error finding process", db, slice_int, err)
-				return err
-			}
-
-			// PUT -d "value=5cb315c3-6e1d-4218-89b7-943d1dba985b" http://etcd0:4001/v2/keys/pilosa/0/db/29/frame/d/slice/5/fragment/a2b632fc4001b817/proces
-			for _, frame := range self.SupportedFrames {
-				err := self.AllocateFragment(p.Key, db, frame, slice_int)
-				if err != nil {
-					log.Warn(err)
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func (self *TopologyMapper) AllocateFragment(process_guid, db, frame string, slice_int int) error {
-	//get Lock to create the fragment
-	//figure out least loaded process..possibly check max process
-	//to create the node, just write off the items to etcd and the watch should spawn
-	//be nice if something would notify perhaps queue
-	//so i need db, frame, slice , fragment_id
-	fuid := pilosa.NewSUUID().String()
-	fragment_key := fmt.Sprintf("%s/db/%s/frame/%s/slice/%d/fragment/%s/process", self.namespace, db, frame, slice_int, fuid)
-	// need to check value to see how many we have left
-	log.Warn("ALLOC:", process_guid, len(process_guid))
-	if len(process_guid) > 1 {
-		_, err := self.EtcdClient.Set(fragment_key, process_guid, 0)
-		if err != nil {
-			return err
-		}
-		log.Warn("Fragment sent to etcd:", fragment_key, process_guid)
-	}
-
-	return nil
-
-}
-
-func (self *TopologyMapper) handlenode(node *etcd.Node) error {
-	key := node.Key[len(self.namespace)+1:]
-	bits := strings.Split(key, "/")
-	var database *db.Database
-	var frame *db.Frame
-	var fragment *db.Fragment
-	var fragment_id pilosa.SUUID
-	var slice *db.Slice
-	var slice_int int
-	var process_uuid pilosa.GUID
-	var process *db.Process
-	var err error
-
-	if len(bits) > 8 {
-		if bits[8] != "process" {
-			return errors.New("no process")
-		}
-
-		process_uuid, err = pilosa.ParseGUID(node.Value)
-		if err != nil {
-			log.Warn("Bad Process Guid", key)
-			return errors.New("No Process Id")
-		}
-	} else {
-		return err
-	}
-
-	if len(bits) <= 1 || bits[0] != "db" {
-		return nil
-	}
-	if len(bits) > 1 {
-		database = self.Cluster.GetOrCreateDatabase(bits[1])
-	}
-	if len(bits) > 2 {
-		if bits[2] != "frame" {
-			return errors.New("no frame")
-		}
-	}
-	if len(bits) > 3 {
-		frame = database.GetOrCreateFrame(bits[3])
-	}
-	if len(bits) > 4 {
-		if bits[4] != "slice" {
-			return errors.New("no slice")
-		}
-	}
-	if len(bits) > 5 {
-		slice_int, err = strconv.Atoi(bits[5])
-		if err != nil {
-			return err
-		}
-		slice = database.GetOrCreateSlice(slice_int)
-	}
-	if len(bits) > 6 {
-		if bits[6] != "fragment" {
-			return errors.New("no fragment")
-		}
-	}
-	if len(bits) > 7 {
-		fragment_id = pilosa.ParseSUUID(bits[7])
-		fragment = database.GetOrCreateFragment(frame, slice, fragment_id)
-	}
-
-	if len(bits) > 8 {
-		if bits[8] != "process" {
-			return errors.New("no process")
-		}
-
-		if err != nil {
-			log.Warn("Bad UUID:", process_uuid, key)
-			return err
-		}
-		process = db.NewProcess(&process_uuid)
-		fragment.SetProcess(process)
-
-		if self.ID.Equals(&process_uuid) {
-			self.Index.AddFragment(bits[1], bits[3], slice_int, fragment_id)
-		}
-
-	}
-	return err
-}
-func (self *TopologyMapper) remove_fragment(node *etcd.Node) error {
-	log.Warn(" hot remove_fragment (Not Supported yet):", node)
-	return nil
-}
-
-func flatten(node *etcd.Node) []*etcd.Node {
-	nodes := []*etcd.Node{node}
-	for i := 0; i < len(node.Nodes); i++ {
-		nodes = append(nodes, flatten(&node.Nodes[i])...)
-	}
-	return nodes
-}
-
-type Node struct {
-	id        *pilosa.GUID
-	ip        string
-	port_tcp  int
-	port_http int
-}
-
-type ProcessMap struct {
-	nodes map[pilosa.GUID]*db.Process
-	mutex sync.Mutex
-}
-
-func NewProcessMap() *ProcessMap {
-	p := ProcessMap{}
-	p.nodes = make(map[pilosa.GUID]*db.Process)
-	return &p
-}
-
-func (self *ProcessMap) AddProcess(process *db.Process) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	self.nodes[process.Id()] = process
-}
-
-func (self *ProcessMap) GetProcess(id *pilosa.GUID) (*db.Process, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	if id == nil {
-		debug.PrintStack()
-		return nil, errors.New("Nil process")
-	}
-	process, ok := self.nodes[*id]
-	if !ok {
-		return nil, errors.New("No such process")
-	}
-	return process, nil
-}
-
-func (self *ProcessMap) GetOrAddProcess(id *pilosa.GUID) *db.Process {
-	process, err := self.GetProcess(id)
-	if err != nil {
-		process = db.NewProcess(id)
-		self.AddProcess(process)
-	}
-	return process
-}
-
-func (self *ProcessMap) GetHost(id *pilosa.GUID) (string, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	process, ok := self.nodes[*id]
-	if !ok {
-		return "", errors.New("Process does not exist")
-	}
-	return process.Host(), nil
-}
-
-func (self *ProcessMap) GetPortTcp(id *pilosa.GUID) (int, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	process, ok := self.nodes[*id]
-	if !ok {
-		return 0, errors.New("Process does not exist")
-	}
-	return process.PortTcp(), nil
-}
-
-func (self *ProcessMap) GetPortHttp(id *pilosa.GUID) (int, error) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	process, ok := self.nodes[*id]
-	if !ok {
-		return 0, errors.New("Process does not exist")
-	}
-	return process.PortHttp(), nil
-}
-
-func (self *ProcessMap) GetMetadata() map[string]map[string]interface{} {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	out := make(map[string]map[string]interface{})
-	for id, process := range self.nodes {
-		pdata := make(map[string]interface{})
-		pdata["host"] = process.Host()
-		pdata["port_tcp"] = process.PortTcp()
-		pdata["port_http"] = process.PortHttp()
-		out[id.String()] = pdata
-	}
-	return out
-}
-
-type ProcessMapper struct {
-	receiver  chan etcd.Response
-	commands  chan ProcessMapperCommand
-	namespace string
-
-	ID         pilosa.GUID
-	ProcessMap *ProcessMap
-
-	TCPPort  int
-	HTTPPort int
-	Host     string
-
-	EtcdClient interface {
-		Get(key string, sort, recursive bool) (*etcd.Response, error)
-		Set(key string, value string, ttl uint64) (*etcd.Response, error)
-		Watch(prefix string, waitIndex uint64, recursive bool, receiver chan *etcd.Response, stop chan bool) (*etcd.Response, error)
-	}
-}
-
-func NewProcessMapper(namespace string) *ProcessMapper {
-	return &ProcessMapper{
-		receiver:  make(chan etcd.Response),
-		commands:  make(chan ProcessMapperCommand),
-		namespace: namespace,
-	}
-}
-
-type ProcessMapperCommand struct {
-	key string
-}
-
-func getKey(input string) string {
-	bits := strings.Split(input, "/")
-	return bits[len(bits)-1]
-}
-
-func (self *ProcessMapper) getnode(u *pilosa.GUID) *Node {
-	return new(Node)
-}
-
-func crash_on_error(err error) {
-	if err != nil {
-		log.Critical(err)
-		os.Exit(-1)
-	}
-}
-
-func (self *ProcessMapper) handlenode(node *etcd.Node) error {
-	var err error
-	var process *db.Process
-	key := node.Key[len(self.namespace)+1:]
-	bits := strings.Split(key, "/")
-	if len(bits) <= 1 || bits[0] != "process" {
-		return nil
-	}
-	if len(bits) >= 2 {
-		id_string := bits[1]
-		id, err := pilosa.ParseGUID(id_string)
-		if err != nil {
-			return errors.New("Invalid GUID: " + id_string + " (" + key + ")")
-		}
-		process = self.ProcessMap.GetOrAddProcess(&id)
-	}
-	if len(bits) >= 3 {
-		switch bits[2] {
-		case "port_tcp":
-			port_tcp, _ := strconv.Atoi(node.Value)
-			process.SetPortTcp(port_tcp)
-		case "port_http":
-			port_http, _ := strconv.Atoi(node.Value)
-			process.SetPortHttp(port_http)
-		case "host":
-			host := node.Value
-			process.SetHost(host)
-		}
-	}
-
-	return err
-}
-
-func (self *ProcessMapper) Run() {
-	path := self.namespace + "/process"
-	self_path := path + "/" + self.ID.String()
-
-	log.Warn("Writing configuration to etcd...")
-	log.Warn(self_path)
-
-	var err error
-	_, err = self.EtcdClient.Set(self_path+"/port_tcp", strconv.Itoa(self.TCPPort), 0)
-	crash_on_error(err)
-	_, err = self.EtcdClient.Set(self_path+"/port_http", strconv.Itoa(self.HTTPPort), 0)
-	crash_on_error(err)
-	_, err = self.EtcdClient.Set(self_path+"/host", self.Host, 0)
-	crash_on_error(err)
-
-	response, err := self.EtcdClient.Get(path, false, true)
-	for _, node := range flatten(response.Node) {
-		err := self.handlenode(node)
-		if err != nil {
-			out := spew.Sdump(node)
-			log.Warn(err, out)
-		}
-	}
-
-	receiver := make(chan *etcd.Response)
-	stop := make(chan bool)
-	go func() {
-		// TODO: error check and restart watcher
-		// TODO: use modindex to make sure watch catches everything
-		_, _ = self.EtcdClient.Watch(path, 0, true, receiver, stop)
-	}()
-
-	go func() {
-		for response = range receiver {
-			switch response.Action {
-			case "set":
-				self.handlenode(response.Node)
-			}
-			// TODO: handle deletes
-		}
-	}()
-}
diff --git a/core/http.go b/core/http.go
deleted file mode 100644
index e8d7d8f2c..000000000
--- a/core/http.go
+++ /dev/null
@@ -1,854 +0,0 @@
-package core
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/base64"
-	"encoding/gob"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httputil"
-	"os"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-
-	notify "github.com/bitly/go-notify"
-	log "github.com/cihub/seelog"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/gorilla/websocket"
-	"github.com/kr/s3/s3util"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/statsd"
-)
-
-const DefaultRequestLogPath = "/tmp/set_bit_log"
-
-var RequestLogPath = DefaultRequestLogPath
-
-type WebService struct {
-	end chan bool
-
-	ID               pilosa.GUID
-	Version          string
-	Port             int
-	DefaultDB        string
-	SetBitLogEnabled bool
-
-	Cluster    *db.Cluster
-	ProcessMap *ProcessMap
-
-	Batcher *Batcher
-
-	Executor interface {
-		RunPQL(database_name string, pql string) (interface{}, error)
-	}
-
-	Pinger interface {
-		Ping(process_id *pilosa.GUID) (*time.Duration, error)
-	}
-
-	TopologyMapper interface {
-		MakeFragments(db string, slice_int int) error
-	}
-
-	Transport interface {
-		Push(message *db.Message)
-	}
-}
-
-func NewWebService() *WebService {
-	return &WebService{
-		end: make(chan bool),
-	}
-}
-
-type Flusher struct {
-	flusher chan bool
-}
-
-func (self *Flusher) Handle(w http.ResponseWriter, r *http.Request) {
-	self.flusher <- true
-}
-
-func NewFlusher(flusher chan bool) http.HandlerFunc {
-	f := Flusher{flusher}
-	return f.Handle
-}
-
-type RequestLogger struct {
-	handler http.HandlerFunc
-	logger  chan []byte
-}
-
-func NewRequestLogger(handler http.HandlerFunc, logger chan []byte) http.HandlerFunc {
-	r := RequestLogger{handler, logger}
-	return r.Handle
-}
-
-func (self *RequestLogger) Handle(w http.ResponseWriter, r *http.Request) {
-
-	// Grab a dump of the incoming request
-	dump, err := httputil.DumpRequest(r, true /*dump the body also*/)
-	if err != nil {
-		log.Warn("Dump Failure", err)
-	}
-
-	self.handler(w, r)
-	self.logger <- dump
-}
-
-type LogRecord struct {
-	When     time.Time
-	Data_x64 string
-}
-
-func NewLogRecord(t time.Time, data []byte) LogRecord {
-	var b bytes.Buffer
-	w := gzip.NewWriter(&b)
-	w.Write(data)
-	w.Flush()
-	w.Close()
-	e := base64.StdEncoding.EncodeToString(b.Bytes())
-	x := LogRecord{t, e}
-	return x
-}
-
-func genFileName(id string) string {
-	//bucket/YYYY/MM/DDHHMMSS.id.log
-	t := time.Now()
-	//base := "http://pilosa.umbel.com.s3.amazonaws.com/bit_log"
-
-	return fmt.Sprintf("%s%s.%s.log", RequestLogPath, t.Format("/2006/01/02/15/04-05"), id)
-}
-
-func flush(requests []LogRecord, id string, records_to_dump int) {
-	dest := genFileName(id)
-	w, err := createFile(dest)
-	if err != nil {
-		log.Warn("Error opening outfile ", dest)
-		log.Warn(err)
-		return
-	}
-	defer w.Close()
-
-	encoder := json.NewEncoder(w)
-	for i := 0; i < records_to_dump; i++ {
-		encoder.Encode(requests[i])
-	}
-
-}
-
-func Logger(in chan []byte, end chan bool, id string, flusher chan bool) {
-	var buffer = make([]LogRecord, 2048, 2048)
-	i := 0
-	for {
-		select {
-		case raw := <-in:
-			logRecord := NewLogRecord(time.Now(), raw)
-			buffer[i] = logRecord
-			i += 1
-			if i > 2047 {
-				flush(buffer, id, i)
-				i = 0
-			}
-
-		case <-flusher:
-			if i > 0 {
-				flush(buffer, id, i)
-				i = 0
-			}
-		case <-end:
-			flush(buffer, id, i)
-			log.Info("Shutdown Logger")
-			return
-		}
-
-	}
-
-}
-
-func (self *WebService) Run() {
-	port_string := strconv.Itoa(self.Port)
-	log.Info("Serving HTTP on port:", port_string)
-	logger_chan := make(chan []byte, 1024)
-	flusher := make(chan bool)
-	mux := http.NewServeMux()
-	mux.HandleFunc("/message", self.HandleMessage)
-	mux.HandleFunc("/query", self.HandleQuery)
-	mux.HandleFunc("/stats", self.HandleStats)
-	mux.HandleFunc("/status", self.HandleStatus)
-	mux.HandleFunc("/info", self.HandleInfo)
-	mux.HandleFunc("/processes", self.HandleProcesses)
-	mux.HandleFunc("/listen/ws", self.HandleListenWS)
-	mux.HandleFunc("/listen/stream", self.HandleListenStream)
-	mux.HandleFunc("/listen", self.HandleListen)
-	mux.HandleFunc("/test", self.HandleTest)
-	mux.HandleFunc("/version", self.HandleVersion)
-	mux.HandleFunc("/ping", self.HandlePing)
-	mux.HandleFunc("/batch", self.HandleBatch)
-	mux.HandleFunc("/load", self.HandleLoad)
-	if self.SetBitLogEnabled {
-		mux.HandleFunc("/set_bits", NewRequestLogger(self.HandleSetBit, logger_chan))
-	} else {
-		mux.HandleFunc("/set_bits", self.HandleSetBit)
-	}
-	mux.HandleFunc("/clear_bits", self.HandleClearBit)
-	//mux.HandleFunc("/set_bits", self.HandleSetBit)
-	mux.HandleFunc("/flush", NewFlusher(flusher))
-	s := &http.Server{
-		Addr:    ":" + port_string,
-		Handler: mux,
-	}
-	go Logger(logger_chan, self.end, self.ID.String(), flusher)
-	s.ListenAndServe()
-}
-func (self *WebService) Shutdown() {
-	self.end <- true
-
-}
-
-func (self *WebService) HandleMessage(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	var message db.Message
-	decoder := json.NewDecoder(r.Body)
-	if decoder.Decode(&message) != nil {
-		http.Error(w, "Invalid JSON", http.StatusBadRequest)
-		return
-	}
-}
-
-func (self *WebService) HandleLoad(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var obj JsonObject
-
-	err := decoder.Decode(&obj)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	database_name, ok := obj["db"]
-	if !ok {
-		http.Error(w, "Provide a database (db)", http.StatusNotFound)
-		return
-	}
-	db := database_name.(string)
-
-	ms_, ok := obj["max_slice"]
-	if ok {
-		ms := int(ms_.(float64))
-		database := self.Cluster.GetOrCreateDatabase(db)
-		ns, _ := database.NumSlices()
-		if ns <= ms {
-			for i := ns; i <= ms; i++ {
-				log.Info("Load Create Slice ", i)
-				self.TopologyMapper.MakeFragments(db, i)
-			}
-			http.Error(w, "Needed Slices", http.StatusNotFound)
-			return
-		}
-
-	}
-
-	_, ok = obj["id"]
-	if !ok {
-		http.Error(w, "Provide a bitmap id (id)", http.StatusNotFound)
-		return
-	}
-	t := float64(obj["id"].(float64))
-	bitmap_id := uint64(t)
-
-	frame, ok := obj["frame"]
-	if !ok {
-		http.Error(w, "Provide a frame (frame)", http.StatusNotFound)
-		return
-	}
-	api_string, ok := obj["bitmap"]
-	if !ok {
-		http.Error(w, "Provide a compressed base64 bitmap (bitmap)", http.StatusNotFound)
-		return
-	}
-
-	_, ok = obj["filter"]
-	if !ok {
-		http.Error(w, "Provide a filter for categories", http.StatusNotFound)
-		return
-	}
-	t = float64(obj["filter"].(float64))
-	filter := uint64(t)
-
-	results := FromApiString(self.Batcher, database_name.(string), frame.(string), api_string.(string), bitmap_id, filter)
-
-	encoder := json.NewEncoder(w)
-	err = encoder.Encode(results)
-	if err != nil {
-		log.Warn("Error Load results")
-		log.Warn(spew.Sdump(r.Form))
-		err = encoder.Encode("Bad Batch Request")
-	}
-
-}
-func (self *WebService) HandleBatch(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	err := r.ParseForm()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	database_name := r.Form.Get("db")
-	if database_name == "" {
-		http.Error(w, "Provide a database (db)", http.StatusNotFound)
-		return
-	}
-
-	bitmap_id_string := r.Form.Get("id")
-	if bitmap_id_string == "" {
-		http.Error(w, "Provide a bitmap id (id)", http.StatusNotFound)
-		return
-	}
-	bitmap_id, _ := strconv.ParseUint(bitmap_id_string, 10, 64)
-
-	slice_string := r.Form.Get("slice")
-	if bitmap_id_string == "" {
-		http.Error(w, "Provide a slice (slice)", http.StatusNotFound)
-		return
-	}
-	slice, _ := strconv.ParseInt(slice_string, 10, 32)
-
-	frame := r.Form.Get("frame")
-	if bitmap_id_string == "" {
-		http.Error(w, "Provide a frame (frame)", http.StatusNotFound)
-		return
-	}
-
-	compressed_bitmap := r.Form.Get("bitmap")
-	if bitmap_id_string == "" {
-		http.Error(w, "Provide a compressed base64 bitmap (bitmap)", http.StatusNotFound)
-		return
-	}
-
-	filter_string := r.Form.Get("filter")
-	filter, _ := strconv.ParseInt(filter_string, 10, 32)
-	if bitmap_id_string == "" {
-		http.Error(w, "Provide a filter for categories", http.StatusNotFound)
-		return
-	}
-
-	results := self.Batcher.Batch(database_name, frame, compressed_bitmap, bitmap_id, int(slice), uint64(filter))
-
-	encoder := json.NewEncoder(w)
-	err = encoder.Encode(results)
-	if err != nil {
-		log.Warn("Error Batch results")
-		log.Warn(spew.Sdump(r.Form))
-		err = encoder.Encode("Bad Batch Request")
-	}
-
-}
-
-func (self *WebService) HandleQuery(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	statsd.SendInc("webservice_Query")
-	err := r.ParseForm()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-
-	database_name := r.Form.Get("db")
-	if database_name == "" {
-		database_name = self.DefaultDB
-	}
-	if database_name == "" {
-		http.Error(w, "Provide a database (db)", http.StatusNotFound)
-		return
-	}
-	if !self.Cluster.IsValidDatabase(database_name) {
-		http.Error(w, "Unknown Database:"+database_name, http.StatusNotFound)
-		return
-	}
-	pql := r.Form.Get("pql")
-	if pql == "" {
-		http.Error(w, "Provide a valid query string (pql)", http.StatusNotFound)
-		return
-	}
-	_, bits := r.Form["bits"]
-
-	log.Debug("PQL:", database_name, pql)
-	results, err := self.Executor.RunPQL(database_name, pql)
-	if err != nil {
-		log.Warn("PQL Exec Error:", err.Error(), database_name, pql)
-		http.Error(w, "Error encoding: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-	switch r := results.(type) { //a hack to handle empty sets
-	case []pilosa.Pair:
-		if len(r) == 0 {
-			results = []int{}
-
-		}
-	case []byte: //can i figure out the type of the compressed string here?
-		if bits {
-			reader, _ := gzip.NewReader(bytes.NewReader(r))
-			b, _ := ioutil.ReadAll(reader)
-			result := pilosa.NewBitmap()
-			result.FromBytes(b)
-			results = result.Bits()
-		}
-
-	}
-
-	if results == nil {
-		log.Warn("Empty results:", database_name, pql)
-		http.Error(w, "Error encoding: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-	if err != nil {
-		http.Error(w, "Error running query: "+err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	encoder := json.NewEncoder(w)
-	err = encoder.Encode(results)
-	if err != nil {
-		log.Warn("Encode Error :", database_name, pql, err.Error())
-		return
-	}
-
-}
-
-type JsonObject map[string]interface{}
-
-// post this json to the body
-//the frame type with extension ".t" are handled a bit differnt
-// it generats the timestamp based bitmap_ids
-//[{ "db": "3", "frame":"b.n","profile_id": 122,"filter":0, "bitmap_id":123},
-//	{ "db": "3", "frame":"b.n","profile_id": 122,"filter":2, "bitmap_id":124},
-//	{ "db": "3", "frame":"t.t","profile_id": 122,"filter":2, "bitmap_id":124, "timestamp":"2014-04-03 13:01:04"}]'
-//
-func bitmaps(frame string, obj JsonObject) chan uint64 {
-	c := make(chan uint64)
-
-	go func() {
-		const shortFormT = "2006-01-02T15:04:05"
-		const shortFormS = "2006-01-02 15:04:05"
-		t := float64(obj["bitmap_id"].(float64))
-		base_id := uint64(t)
-
-		if strings.HasSuffix(frame, ".t") {
-			timestamp, present := obj["timestamp"].(string)
-
-			if !present || timestamp == "2014-01-01 00:00:00" { //skip the default timestamp
-				c <- base_id
-			} else {
-				quantum := pilosa.YMDH
-				if val, ok := obj["time_granularity"]; ok {
-					switch val {
-					case "Y":
-						quantum = pilosa.Y
-					case "M":
-						quantum = pilosa.YM
-					case "D":
-						quantum = pilosa.YMD
-					}
-				}
-				shortForm := shortFormS
-				if strings.Contains(timestamp, "T") {
-					shortForm = shortFormT
-				}
-				atime, _ := time.Parse(shortForm, timestamp)
-
-				for i, id := range pilosa.GetTimeIds(base_id, atime, quantum) {
-					c <- id
-					if i > 10 {
-						log.Warn("TO MANY TIMEIDS", base_id, atime, quantum)
-						break
-					}
-				}
-			}
-		} else {
-			c <- base_id
-		}
-
-		close(c)
-	}()
-
-	return c
-}
-
-type SBResult struct {
-	Bitmap_id  uint64
-	Frame      string
-	Filter     uint64
-	Profile_id uint64
-	Result     interface{}
-}
-
-func init() {
-	gob.Register(SBResult{})
-}
-
-func (self *WebService) HandleClearBit(w http.ResponseWriter, r *http.Request) {
-	self.HandleBit(w, r, false)
-}
-func (self *WebService) HandleSetBit(w http.ResponseWriter, r *http.Request) {
-	self.HandleBit(w, r, true)
-}
-
-func (self *WebService) HandleBit(w http.ResponseWriter, r *http.Request, ToSet bool) {
-	if r.Method != "POST" {
-		http.Error(w, "Only POST allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	decoder := json.NewDecoder(r.Body)
-	var args []JsonObject
-
-	err := decoder.Decode(&args)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	//[{ "db": "3", "frame":"brand.","profile_id": 122,"filter":0, "bitmap_id":123}]
-	var results []SBResult
-	if len(args) > 4096 {
-		log.Warn("Request too large:", len(args))
-		http.Error(w, "Request To large", http.StatusBadRequest)
-		return
-	}
-
-	//remoteSetBit := NewRemoteSetBit()
-	//remoteSetBit.ID = self.ID
-	//remoteSetBit.ProcessMap = self.ProcessMap
-	//remoteSetBit.Hold = self.Hold
-	//remoteSetBit.Transport = self.Transport
-
-	for _, obj := range args {
-		if obj["profile_id"] == nil {
-			http.Error(w, "Missing Profile", http.StatusBadRequest)
-			return
-		}
-		t := float64(obj["profile_id"].(float64))
-		profile_id := uint64(t)
-
-		if obj["db"] == nil {
-			http.Error(w, "Missing db", http.StatusBadRequest)
-			return
-		}
-		dbs := obj["db"].(string)
-
-		if obj["frame"] == nil {
-			http.Error(w, "Missing Frame", http.StatusBadRequest)
-			return
-
-		}
-		frame := obj["frame"].(string)
-
-		if obj["filter"] == nil {
-			http.Error(w, "Missing Filter", http.StatusBadRequest)
-			return
-		}
-		t = float64(obj["filter"].(float64))
-		filter := uint64(t)
-		for bitmap_id := range bitmaps(frame, obj) {
-
-			var pql string
-			if ToSet {
-				pql = fmt.Sprintf("set(%d, %s, %d, %d)", bitmap_id, frame, filter, profile_id)
-			} else {
-				pql = fmt.Sprintf("clear(%d, %s, %d, %d)", bitmap_id, frame, filter, profile_id)
-			}
-			result, err := self.Executor.RunPQL(dbs, pql)
-			bundle := SBResult{bitmap_id, frame, filter, profile_id, result}
-			results = append(results, bundle)
-
-			if err != nil {
-				log.Warn("Error running set_bit", dbs, frame, profile_id, ToSet)
-				http.Error(w, err.Error(), http.StatusInternalServerError)
-				return
-			}
-
-		}
-	}
-	encoder := json.NewEncoder(w)
-	err = encoder.Encode(results)
-	if err != nil {
-		log.Warn("JSON SetBit ERROR:", err, ToSet)
-		return
-	}
-
-}
-
-func (self *WebService) HandleStats(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	encoder := json.NewEncoder(w)
-	m := &runtime.MemStats{}
-	runtime.ReadMemStats(m)
-
-	err := encoder.Encode(m)
-	if err != nil {
-		log.Warn("Error encoding stats")
-		http.Error(w, "Error econding stats", http.StatusMethodNotAllowed)
-	}
-}
-
-func (self *WebService) HandleInfo(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	spew.Fdump(w, self.Cluster)
-}
-
-func (self *WebService) HandleVersion(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-
-	fmt.Fprintf(w, "Pilosa v.("+self.Version+")\n")
-}
-
-func (self *WebService) HandleTest(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	spew.Dump("TEST!")
-
-	msg := new(db.Message)
-	msg.Data = "mystring"
-	self.Transport.Push(msg)
-
-	msg2 := new(db.Message)
-	msg2.Data = 789
-	self.Transport.Push(msg2)
-}
-
-func (self *WebService) HandleProcesses(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	encoder := json.NewEncoder(w)
-	processes := self.ProcessMap.GetMetadata()
-	err := encoder.Encode(processes)
-	if err != nil {
-		http.Error(w, "Error Encoding", http.StatusBadRequest)
-	}
-}
-
-func (self *WebService) HandlePing(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Only GET allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	err := r.ParseForm()
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	process_string := r.Form.Get("process")
-	process_id, err := pilosa.ParseGUID(process_string)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	_, err = self.ProcessMap.GetProcess(&process_id)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-	duration, err := self.Pinger.Ping(&process_id)
-	if err != nil {
-		spew.Fdump(w, err)
-		return
-	}
-	encoder := json.NewEncoder(w)
-	encoder.Encode(map[string]float64{"duration": duration.Seconds()})
-}
-
-func (self *WebService) HandleListen(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte(`
-	<html><head><title>Pilosa - streaming client</title></head><body>
-	<style type="text/css">
-		dt.inbox { background-color: #efe; }
-		dt.outbox { background-color: #eef; }
-	</style>
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-	<script type="text/javascript">
-		$dl = $("<dl/>")
-		$dl.on('click', 'dt', function(e) {
-			$(this).next().toggle()
-		})
-		$("body").append($dl)
-		ws = new WebSocket("ws://" + window.location.host + "/listen/ws")
-		ws.onmessage = function(mes) {
-			obj = JSON.parse(mes.data)
-			if (obj.host) {
-				$dl.append('<dt class="outbox">&rarr;' + obj.type + ' (to: ' + obj.host + ')</dt>')
-			} else {
-				$dl.append('<dt class="inbox">&larr;' + obj.type + '</dt>')
-			}
-			$dl.append('<dd style="display:none;"><pre>' + obj.dump + obj.host + '</pre></dd>')
-		}
-	</script>
-	</body></html>
-	`))
-}
-
-func (self *WebService) streamer(writer func(map[string]interface{}) error) {
-	inbox := make(chan interface{}, 10)
-	outbox := make(chan interface{}, 10)
-	notify.Start("inbox", inbox)
-	notify.Start("outbox", outbox)
-	var obj interface{}
-	var data interface{}
-	var inmessage *db.Message
-	var outmessage *db.Envelope
-	var host string
-	for {
-		select {
-		case obj = <-outbox:
-			outmessage = obj.(*db.Envelope)
-			data = outmessage.Message.Data
-			host = outmessage.Host.String()
-		case obj = <-inbox:
-			inmessage = obj.(*db.Message)
-			data = inmessage.Data
-			host = ""
-		}
-
-		typ := reflect.TypeOf(data)
-
-		err := writer(map[string]interface{}{
-			"type": typ.String(),
-			"dump": spew.Sdump(data),
-			"host": host,
-		})
-		if err != nil {
-			log.Info("stopping")
-			notify.Stop("inbox", inbox)
-			notify.Stop("outbox", outbox)
-			drain(inbox)
-			drain(outbox)
-			return
-		}
-	}
-}
-
-func (self *WebService) HandleListenWS(w http.ResponseWriter, r *http.Request) {
-	defer func() {
-		err := recover()
-		out := spew.Sdump(err)
-		log.Info(out)
-	}()
-	ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
-	if _, ok := err.(websocket.HandshakeError); ok {
-		http.Error(w, "Not a websocket handshake", 400)
-		return
-	} else if err != nil {
-		log.Warn(err)
-		return
-	}
-	self.streamer(func(data map[string]interface{}) error {
-		return ws.WriteJSON(data)
-	})
-}
-
-func drain(ch chan interface{}) {
-	for {
-		switch {
-		case <-ch:
-		default:
-			return
-		}
-	}
-}
-
-func (self *WebService) HandleListenStream(w http.ResponseWriter, r *http.Request) {
-	defer func() {
-		err := recover()
-		spew.Dump(err)
-	}()
-	writer := json.NewEncoder(w)
-	flusher := w.(http.Flusher)
-	self.streamer(func(data map[string]interface{}) error {
-		err := writer.Encode(data)
-		flusher.Flush()
-		return err
-	})
-}
-
-func (self *WebService) HandleStatus(w http.ResponseWriter, r *http.Request) {
-	w.Write([]byte(`
-	<html><head><title>Pilosa - status</title></head><body>
-	<style type="text/css">
-	td {
-		background: #eee;
-	}
-	</style>
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
-	<script type="text/javascript">
-		$table = $("<table><tr><th>process id</th><th>host</th><th>tcp port</th><th>http port</th><th>latency</th></tr></table>")
-		$("body").append($table)
-		$.ajax('/processes', {
-			dataType: "json",
-			success: function(resp) {
-				$.each(resp, function(index, value) {
-					$table.append('<tr><td>' + index + '</td><td>' + value.host + '</td><td>' + value.port_tcp + '</td><td>' + value.port_http + '</td><td><button class="pinger"/></td></tr>')
-				})
-			}
-		})
-		$table.on('click', 'button.pinger', function(e) {
-			var $td = $(this).parent()
-			var $tr = $td.parent()
-			var id = $tr.children('td').eq(0).text()
-
-			$.ajax('/ping?process=' +  id, {
-				dataType: 'json',
-				success: function(resp) {
-					$td.html(resp.duration)
-				}
-			})
-		})
-	</script>
-	</body></html>
-	`))
-}
-
-func createFile(s string) (io.WriteCloser, error) {
-	if isURL(s) {
-		return s3util.Create(s, nil, nil)
-	}
-	return os.Create(s)
-}
-
-func isURL(s string) bool {
-	return strings.HasPrefix(s, "http://") || strings.HasPrefix(s, "https://")
-}
diff --git a/core/load.go b/core/load.go
deleted file mode 100644
index a98f871ef..000000000
--- a/core/load.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package core
-
-// #cgo  CFLAGS:-mpopcnt
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/base64"
-	"encoding/binary"
-	"errors"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-)
-
-func copy_raw(src [32]uint64) pilosa.Blocks {
-	o := make(pilosa.Blocks, 32)
-	for k, v := range src {
-		o[k] = v
-	}
-	return o
-}
-func sendBitmap(batcher *Batcher, bitmap *pilosa.Bitmap, db string, frame string, bitmap_id, filter uint64, slice int, finish chan error) {
-	if slice < 0 {
-		log.Warn("Bad split", db, frame, slice, bitmap_id)
-		finish <- errors.New("BadSplit")
-		return
-	}
-
-	// Compress bitmap.
-	var b bytes.Buffer
-	w := gzip.NewWriter(&b)
-	w.Write(bitmap.ToBytes())
-	w.Flush()
-	w.Close()
-	buf := base64.StdEncoding.EncodeToString(b.Bytes())
-
-	results := batcher.Batch(db, frame, buf, bitmap_id, slice, filter)
-	finish <- results
-}
-
-func FromApiString(batcher *Batcher, db string, frame string, api_string string, bitmap_id, filter uint64) string {
-	compressed_data, err := base64.StdEncoding.DecodeString(api_string)
-	if err != nil {
-		log.Warn(err)
-		return "Bad"
-	}
-	reader, err := gzip.NewReader(bytes.NewReader(compressed_data))
-	if err != nil {
-		log.Warn(err)
-		return "Bad"
-	}
-	var numChunks uint64
-	err = binary.Read(reader, binary.LittleEndian, &numChunks)
-	if err != nil {
-		log.Warn(err)
-		return "Bad"
-	}
-	first := true
-	bitmap := pilosa.NewBitmap()
-	last_slice := pilosa.CounterMask
-	sent_count := 0
-	finish := make(chan error)
-
-	for i := uint64(0); i < numChunks; i++ {
-		var raw struct {
-			Key   uint64
-			Block [32]uint64
-		}
-		binary.Read(reader, binary.LittleEndian, &raw)
-		slice := raw.Key >> 5
-		if slice != last_slice {
-			if first {
-				first = false
-			} else {
-				//make async later
-				sent_count += 1
-				go sendBitmap(batcher, bitmap, db, frame, bitmap_id, filter, int(last_slice), finish)
-				bitmap = pilosa.NewBitmap()
-			}
-			last_slice = slice
-		}
-		o := copy_raw(raw.Block)
-		chunk := &pilosa.Chunk{Key: raw.Key, Value: o}
-		bitmap.AddChunk(chunk)
-
-	}
-	sent_count += 1
-	go sendBitmap(batcher, bitmap, db, frame, bitmap_id, filter, int(last_slice), finish)
-	for i := 0; i < sent_count; i++ {
-		<-finish
-	}
-	return "OK"
-
-}
diff --git a/core/ping.go b/core/ping.go
deleted file mode 100644
index 0d281580f..000000000
--- a/core/ping.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package core
-
-import (
-	"encoding/gob"
-	"time"
-
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-)
-
-type PingRequest struct {
-	Id     *pilosa.GUID
-	Source *pilosa.GUID
-}
-
-type PongRequest struct {
-	Id *pilosa.GUID
-}
-
-func (self PongRequest) ResultId() *pilosa.GUID {
-	return self.Id
-}
-func (self PongRequest) ResultData() interface{} {
-	return self.Id
-}
-
-func init() {
-	gob.Register(PingRequest{})
-	gob.Register(PongRequest{})
-}
-
-type Pinger struct {
-	ID pilosa.GUID
-
-	Hold interface {
-		Get(id *pilosa.GUID, timeout time.Duration) (interface{}, error)
-	}
-
-	Transport interface {
-		Send(message *db.Message, host *pilosa.GUID)
-	}
-}
-
-func NewPinger(id pilosa.GUID) *Pinger {
-	return &Pinger{
-		ID: id,
-	}
-}
-
-func (self *Pinger) Ping(process_id *pilosa.GUID) (*time.Duration, error) {
-	id := pilosa.NewGUID()
-	ping := db.Message{Data: PingRequest{Id: &id, Source: &self.ID}}
-	start := time.Now()
-	self.Transport.Send(&ping, process_id)
-	_, err := self.Hold.Get(&id, 60*time.Second)
-	if err != nil {
-		return nil, err
-	}
-	end := time.Now()
-	dur := end.Sub(start)
-	return &dur, nil
-}
diff --git a/core/remotebits.go b/core/remotebits.go
deleted file mode 100644
index 47649b7e6..000000000
--- a/core/remotebits.go
+++ /dev/null
@@ -1,127 +0,0 @@
-package core
-
-import (
-	"encoding/gob"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-)
-
-type RemoteSetBit struct {
-	requests []remote_task
-	cluster  map[*pilosa.GUID][]BitmapRequestItem
-
-	ID         pilosa.GUID
-	ProcessMap *ProcessMap
-
-	Hold interface {
-		Get(id *pilosa.GUID, timeout int) (interface{}, error)
-	}
-
-	Transport interface {
-		Send(message *db.Message, host *pilosa.GUID)
-	}
-}
-
-func init() {
-	gob.Register(BitmapRequestItem{})
-	gob.Register(BitsRequest{})
-	gob.Register(BitsResponse{})
-}
-
-type BitsRequest struct {
-	Bits            []BitmapRequestItem
-	ReturnProcessId pilosa.GUID
-	QueryId         pilosa.GUID
-	DestProcessId   pilosa.GUID
-}
-type BitmapRequestItem struct {
-	Fragment_id pilosa.SUUID
-	Bitmap_id   uint64
-	Profile_id  uint64
-	Filter      uint64
-	Frame       string
-	SetUnset    bool
-}
-
-func NewRemoteSetBit() *RemoteSetBit {
-	obj := new(RemoteSetBit)
-	obj.cluster = make(map[*pilosa.GUID][]BitmapRequestItem)
-	return obj
-}
-
-func (self *RemoteSetBit) Request() {
-	self.requests = make([]remote_task, 0)
-	source_process, _ := self.ProcessMap.GetProcess(&self.ID)
-	for process, request := range self.cluster {
-		random_id := pilosa.NewGUID()
-		msg := new(db.Message)
-		msg.Data = BitsRequest{
-			Bits:            request,
-			ReturnProcessId: source_process.Id(),
-			QueryId:         random_id,
-			DestProcessId:   *process,
-		}
-		wait := len(request) * 10
-		if wait < 10 {
-			wait = 10
-		}
-		self.requests = append(self.requests, remote_task{random_id, wait})
-		self.Transport.Send(msg, process)
-	}
-
-}
-
-type remote_task struct {
-	id        pilosa.GUID
-	wait_time int
-}
-
-func (self *RemoteSetBit) MergeResults(local_results []SBResult) []SBResult {
-	answers := make(chan []SBResult)
-	for _, task := range self.requests {
-		go func(task remote_task) {
-			value, err := self.Hold.Get(&task.id, task.wait_time) //eiher need to be the frame process or the handler process?
-			if value == nil {
-				log.Warn("Bad RemoteSetBit Result:", err)
-				empty := make([]SBResult, 0, 0)
-				answers <- empty
-
-			} else {
-				answers <- value.([]SBResult)
-			}
-		}(task)
-	}
-	for i := 0; i < len(self.requests); i++ {
-		batch := <-answers
-		for _, item := range batch {
-			local_results = append(local_results, item)
-		}
-	}
-	close(answers)
-	return local_results
-
-}
-
-func (self *RemoteSetBit) Add(frag *db.Fragment, bitmap_id, profile_id, filter uint64, frame string, SetUnset bool) {
-	x, found := self.cluster[frag.GetProcessId()]
-	if !found {
-		x = make([]BitmapRequestItem, 0)
-	}
-	x = append(x, BitmapRequestItem{frag.GetId(), bitmap_id, profile_id, filter, frame, SetUnset})
-	self.cluster[frag.GetProcessId()] = x
-
-}
-
-type BitsResponse struct {
-	Id    *pilosa.GUID
-	Items []SBResult
-}
-
-func (self *BitsResponse) ResultId() *pilosa.GUID {
-	return self.Id
-}
-func (self *BitsResponse) ResultData() interface{} {
-	return self.Items
-}
diff --git a/core/stopper.go b/core/stopper.go
deleted file mode 100644
index 5569d2e21..000000000
--- a/core/stopper.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package core
-
-import (
-	"sync"
-)
-
-type Stopper struct {
-	TermChans []chan int
-	DoneChans []chan int
-	Mutex     sync.RWMutex
-}
-
-func (stopper *Stopper) Stop() {
-	var i chan int
-	var o chan int
-	stopper.Mutex.RLock()
-	for _, i = range stopper.TermChans {
-		go func(i chan int) {
-			i <- 1
-		}(i)
-	}
-	for _, o = range stopper.DoneChans {
-		<-o
-	}
-	stopper.Mutex.RUnlock()
-	return
-}
-
-func (stopper *Stopper) GetExitChannels() (chan int, chan int) {
-	termchan := make(chan int, 1)
-	donechan := make(chan int, 1)
-	stopper.Mutex.Lock()
-	stopper.TermChans = append(stopper.TermChans, termchan)
-	stopper.DoneChans = append(stopper.DoneChans, donechan)
-	stopper.Mutex.Unlock()
-	return termchan, donechan
-}
diff --git a/db/constants.go b/db/constants.go
deleted file mode 100644
index d2fbdd0eb..000000000
--- a/db/constants.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package db
-
-const SLICE_WIDTH = 65536
diff --git a/db/db.go b/db/db.go
deleted file mode 100644
index cb4ee081e..000000000
--- a/db/db.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package db
-
-import (
-	"encoding/gob"
-
-	"github.com/umbel/pilosa"
-)
-
-type Message struct {
-	Data interface{} `json:"data"`
-}
-
-type Envelope struct {
-	Message *Message
-	Host    *pilosa.GUID
-}
-
-type HoldResult interface {
-	ResultId() *pilosa.GUID
-	ResultData() interface{}
-}
-
-func init() {
-	gob.Register(Message{})
-}
diff --git a/db/topology.go b/db/topology.go
deleted file mode 100644
index 29e8667fd..000000000
--- a/db/topology.go
+++ /dev/null
@@ -1,446 +0,0 @@
-package db
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-
-	log "github.com/cihub/seelog"
-	"github.com/stathat/consistent"
-	"github.com/umbel/pilosa"
-)
-
-// SupportedFrames is a list of frame types that are supported.
-var SupportedFrames = []string{"default"}
-
-var FrameDoesNotExistError = errors.New("Frame does not exist.")
-var InvalidFrameError = errors.New("Invalid frame.")
-var SliceDoesNotExistError = errors.New("Slice does not exist.")
-var FragmentDoesNotExistError = errors.New("Fragment does not exist.")
-var FrameSliceIntersectDoesNotExistError = errors.New("FrameSliceIntersect does not exist.")
-
-type Location struct {
-	ProcessId  *pilosa.GUID
-	FragmentId pilosa.SUUID
-}
-
-type Process struct {
-	id        *pilosa.GUID
-	host      string
-	port_tcp  int
-	port_http int
-	mutex     sync.Mutex
-}
-
-func NewProcess(id *pilosa.GUID) *Process {
-	return &Process{id: id}
-}
-
-func (self *Process) Id() pilosa.GUID {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	return *self.id
-}
-
-func (self *Process) Host() string {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	return self.host
-}
-
-func (self *Process) SetHost(host string) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	self.host = host
-}
-
-func (self *Process) PortTcp() int {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	return self.port_tcp
-}
-
-func (self *Process) SetPortTcp(port int) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	self.port_tcp = port
-}
-
-func (self *Process) PortHttp() int {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	return self.port_http
-}
-
-func (self *Process) SetPortHttp(port int) {
-	self.mutex.Lock()
-	defer self.mutex.Unlock()
-	self.port_http = port
-}
-
-/////////// CLUSTERS
-//////////////////////////////////////////////////////////////////////
-
-// Represents the entire cluster, and a reference to the Node this instance is
-// running on
-type Cluster struct {
-	databases map[string]*Database
-	mutex     sync.Mutex
-}
-
-func NewCluster() *Cluster {
-	cluster := Cluster{}
-	cluster.databases = make(map[string]*Database)
-	return &cluster
-}
-func (self *Cluster) GetDatabases() map[string]*Database {
-	return self.databases
-
-}
-
-func (self *Cluster) IsValidDatabase(dbname string) bool {
-	for name, _ := range self.GetDatabases() {
-		if name == dbname {
-			return true
-		}
-
-	}
-	return false
-}
-
-/////////// DATABASES
-//////////////////////////////////////////////////////////////////////
-
-// A database is a collection of all the frames within a given profile space
-type Database struct {
-	Name                   string
-	frames                 []*Frame
-	slices                 []*Slice
-	frame_slice_intersects []*FrameSliceIntersect
-	mutex                  sync.Mutex
-}
-
-func (self *Database) GetFrameSliceIntersects() []*FrameSliceIntersect {
-	return self.frame_slice_intersects
-}
-
-// Add a database to a cluster
-func (c *Cluster) addDatabase(name string) *Database {
-	database := Database{Name: name}
-	if c.databases == nil {
-		c.databases = make(map[string]*Database)
-	}
-	c.databases[name] = &database
-	return &database
-}
-
-func (c *Cluster) getDatabase(name string) (*Database, error) {
-	value, ok := c.databases[name]
-	if !ok {
-		return nil, errors.New("The database does not exist!")
-	} else {
-		return value, nil
-	}
-}
-
-func (c *Cluster) GetOrCreateDatabase(name string) *Database {
-	c.mutex.Lock()
-	defer c.mutex.Unlock()
-	database, err := c.getDatabase(name)
-	if err == nil {
-		return database
-	}
-	return c.addDatabase(name)
-}
-
-func stringInSlice(a string, list []string) bool {
-	for _, b := range list {
-		if b == a {
-			return true
-		}
-	}
-	return false
-}
-
-func (d *Database) IsValidFrame(name string) bool {
-	return stringInSlice(name, SupportedFrames)
-}
-
-// Count the number of slices in a database
-func (d *Database) NumSlices() (int, error) {
-	if len(d.slices) < 1 {
-		return 0, errors.New("Database is empty")
-	}
-	return len(d.slices), nil
-}
-
-// return the slice_ids that are in a database
-func (d *Database) SliceIds() ([]int, error) {
-	var rtn []int
-	for _, slice := range d.slices {
-		rtn = append(rtn, slice.id)
-	}
-	return rtn, nil
-}
-
-///////// FRAMES
-//////////////////////////////////////////////////////////////////////
-
-// A frame is a collection of slices in a given category
-// (brands, demographics, etc), specific to a database
-type Frame struct {
-	name string
-}
-
-// Get a frame from a database
-func (d *Database) getFrame(name string) (*Frame, error) {
-	// should we check here for supported frames?
-	if !d.IsValidFrame(name) {
-		return nil, InvalidFrameError
-	}
-	for _, frame := range d.frames {
-		if frame.name == name {
-			return frame, nil
-		}
-	}
-	return nil, FrameDoesNotExistError
-}
-
-// Add a frame to a database
-func (d *Database) addFrame(name string) *Frame {
-	frame := Frame{name: name}
-	d.frames = append(d.frames, &frame)
-	// add intersections
-	for _, slice := range d.slices {
-		d.AddFrameSliceIntersect(&frame, slice)
-	}
-	return &frame
-}
-
-func (d *Database) GetOrCreateFrame(name string) *Frame {
-	d.mutex.Lock()
-	defer d.mutex.Unlock()
-	frame, err := d.getFrame(name)
-	if err == nil {
-		return frame
-	}
-	return d.addFrame(name)
-}
-
-///////// SLICES
-///////////////////////////////////////////////////////////////////////////
-
-// A slice is the vertical combination of every fragment.
-type Slice struct {
-	id int
-}
-
-func (self *Slice) Id() int {
-	return self.id
-}
-
-// Get a slice from a database
-func (d *Database) getSlice(slice_id int) (*Slice, error) {
-	for _, slice := range d.slices {
-		if slice.id == slice_id {
-			return slice, nil
-		}
-	}
-	return nil, SliceDoesNotExistError
-}
-
-// Add a slice to a database
-func (d *Database) addSlice(slice_id int) *Slice {
-	slice := Slice{id: slice_id}
-	d.slices = append(d.slices, &slice)
-	// add intersections
-	for _, frame := range d.frames {
-		d.AddFrameSliceIntersect(frame, &slice)
-	}
-	return &slice
-}
-
-func (d *Database) GetOrCreateSlice(slice_id int) *Slice {
-	d.mutex.Lock()
-	defer d.mutex.Unlock()
-	slice, err := d.getSlice(slice_id)
-	if err == nil {
-		return slice
-	}
-	return d.addSlice(slice_id)
-}
-
-///////// FRAME-SLICE INTERSECT
-////////////////////////////////////////////////////////////////
-
-type FrameSliceIntersect struct {
-	frame     *Frame
-	slice     *Slice
-	fragments []*Fragment
-	hashring  *consistent.Consistent
-}
-
-func (d *Database) AddFrameSliceIntersect(frame *Frame, slice *Slice) *FrameSliceIntersect {
-	frameslice := FrameSliceIntersect{frame: frame, slice: slice}
-	d.frame_slice_intersects = append(d.frame_slice_intersects, &frameslice)
-	frameslice.hashring = consistent.New()
-	frameslice.hashring.NumberOfReplicas = 16
-	return &frameslice
-}
-
-func (d *Database) GetFrameSliceIntersect(frame *Frame, slice *Slice) (*FrameSliceIntersect, error) {
-	for _, frameslice := range d.frame_slice_intersects {
-		if frameslice.frame == frame && frameslice.slice == slice {
-			return frameslice, nil
-		}
-	}
-	log.Warn("Missing FrameSliceIntersect:", d.Name, frame, slice)
-	return nil, FrameSliceIntersectDoesNotExistError
-}
-
-func (self *FrameSliceIntersect) GetFragments() []*Fragment {
-	return self.fragments
-}
-
-func (d *Database) GetFragment(fragment_id pilosa.SUUID) (*Fragment, error) {
-	for _, fsi := range d.frame_slice_intersects {
-		f, err := fsi.GetFragment(fragment_id)
-		if err == nil {
-			return f, nil
-		}
-	}
-	return nil, FragmentDoesNotExistError
-}
-func (self *FrameSliceIntersect) GetFragment(fragment_id pilosa.SUUID) (*Fragment,
-	error) {
-	for _, fragment := range self.fragments {
-		if fragment.id == fragment_id {
-			return fragment, nil
-		}
-	}
-	return nil, FragmentDoesNotExistError
-}
-
-func (self *FrameSliceIntersect) AddFragment(fragment *Fragment) {
-	self.fragments = append(self.fragments, fragment)
-	self.hashring.Add(fragment.id.String())
-}
-
-///////// FRAGMENTS
-//////////////////////////////////////////////////////////////////////////
-
-// A fragment is a collection of bitmaps within a slice. The fragment contains a
-// reference to the responsible node for that fragment. The node is in the form
-// ip:port
-type Fragment struct {
-	id      pilosa.SUUID
-	process *Process
-}
-
-func (self *Fragment) GetId() pilosa.SUUID {
-	return self.id
-}
-
-func (self *Fragment) GetProcess() *Process {
-	return self.process
-}
-
-func (self *Fragment) GetProcessId() *pilosa.GUID {
-	return self.process.id
-}
-
-func (self *Fragment) GetLocation() *Location {
-	return &Location{self.process.id, self.id}
-}
-
-// rename this one
-func (d *Database) GetFragmentForBitmap(slice *Slice, bitmap *Bitmap) (*Fragment, error) {
-	frame, err := d.getFrame(bitmap.FrameType)
-	if err != nil {
-		log.Warn("Missing FrameType", bitmap.FrameType, d.Name, slice)
-		log.Warn(err)
-		return nil, err
-	}
-	fsi, err := d.GetFrameSliceIntersect(frame, slice)
-	if err != nil {
-		log.Warn("Missing frame,slice", frame, slice)
-		log.Warn(err)
-		return nil, err
-	}
-	frag_id_s, err := fsi.hashring.Get(fmt.Sprintf("%d", bitmap.Id))
-	if err != nil {
-		log.Warn("ERROR FSI.GET:", bitmap.Id, bitmap.FrameType, d.Name, frame, slice)
-		log.Warn(err)
-		return nil, err
-	}
-	frag_id := pilosa.ParseSUUID(frag_id_s)
-	return fsi.GetFragment(frag_id)
-}
-
-func (d *Database) GetFragmentForFrameSlice(frame *Frame, slice *Slice) (*Fragment, error) {
-	fsi, err := d.GetFrameSliceIntersect(frame, slice)
-	if err != nil {
-		log.Warn("Missing frame,slice", frame, slice)
-		log.Warn(err)
-		return nil, err
-	}
-	frag_id_s, err := fsi.hashring.Get("0")
-	// we don't need a specific bitmap in here because we're assuming the hashring only has a single element
-	if err != nil {
-		log.Warn("ERROR FSI.GET:", d.Name, frame, slice)
-		log.Warn(err)
-		return nil, err
-	}
-	frag_id := pilosa.ParseSUUID(frag_id_s)
-	return fsi.GetFragment(frag_id)
-}
-
-func (d *Database) getFragment(frame *Frame, slice *Slice, fragment_id pilosa.SUUID) (*Fragment, error) {
-	fsi, err := d.GetFrameSliceIntersect(frame, slice)
-	if err != nil {
-		log.Warn(err)
-		return nil, err
-	}
-	return fsi.GetFragment(fragment_id)
-}
-
-func (d *Database) addFragment(frame *Frame, slice *Slice, fragment_id pilosa.SUUID) *Fragment {
-	fsi, err := d.GetFrameSliceIntersect(frame, slice)
-	if err != nil {
-		log.Warn("database.addFragment", err)
-		return nil
-	}
-	fragment := Fragment{id: fragment_id}
-	fsi.AddFragment(&fragment)
-	return &fragment
-}
-
-func (d *Database) GetOrCreateFragment(frame *Frame, slice *Slice, fragment_id pilosa.SUUID) *Fragment {
-	d.mutex.Lock()
-	defer d.mutex.Unlock()
-	fragment, err := d.getFragment(frame, slice, fragment_id)
-	if err == nil {
-		return fragment
-	}
-	return d.addFragment(frame, slice, fragment_id)
-}
-
-func (f *Fragment) SetProcess(process *Process) {
-	f.process = process
-}
-func GetSlice(profile_id uint64) int {
-	return int(profile_id / SLICE_WIDTH)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////
-// Get a slice from a database
-
-func (d *Database) GetSliceForProfile(profile_id uint64) (*Slice, error) {
-	return d.getSlice(GetSlice(profile_id))
-}
-
-type Bitmap struct {
-	Id        uint64
-	FrameType string
-	Filter    uint64
-}
diff --git a/db/topology_test.go b/db/topology_test.go
deleted file mode 100644
index 54495ba01..000000000
--- a/db/topology_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package db_test
-
-import (
-	"testing"
-
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/util"
-)
-
-func TestCluster(t *testing.T) {
-	c := db.NewCluster()
-	d := c.GetOrCreateDatabase("main")
-
-	f := d.GetOrCreateFrame("general")
-	sl := d.GetOrCreateSlice(0)
-	d.GetOrCreateFragment(f, sl, util.Id())
-}
diff --git a/dispatch/dispatch.go b/dispatch/dispatch.go
deleted file mode 100644
index db20fa9ce..000000000
--- a/dispatch/dispatch.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package dispatch
-
-import (
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/core"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/executor"
-	"github.com/umbel/pilosa/query"
-)
-
-type Dispatch struct {
-	Executor interface {
-		NewJob(job *db.Message)
-	}
-
-	Hold interface {
-		Set(id *pilosa.GUID, value interface{}, timeout time.Duration)
-	}
-
-	Index interface {
-		ClearBit(fragID pilosa.SUUID, bitmapID uint64, pos uint64) (bool, error)
-		LoadBitmap(fragID pilosa.SUUID, bitmapID uint64, compressedBitmap string, filter uint64)
-		SetBit(fragID pilosa.SUUID, bitmapID uint64, pos uint64, category uint64) (bool, error)
-		TopFillBatch(args []pilosa.FillArgs) ([]pilosa.Pair, error)
-	}
-
-	Transport interface {
-		Receive() *db.Message
-		Send(message *db.Message, host *pilosa.GUID)
-	}
-}
-
-func NewDispatch() *Dispatch {
-	return &Dispatch{}
-}
-
-func (self *Dispatch) Init() error {
-	log.Warn("Starting Dispatcher")
-	return nil
-}
-
-func (self *Dispatch) Close() {
-	log.Warn("Shutting down Dispatcher")
-}
-
-// The Local Route
-
-func (d *Dispatch) Run() {
-	log.Warn("Dispatch Run...")
-	for {
-		message := d.Transport.Receive()
-
-		switch data := message.Data.(type) {
-		case core.BatchRequest:
-			log.Trace("Dispatch.Run BatchRequest")
-			response := db.Message{Data: core.BatchResponse{Id: data.Id}}
-			d.Index.LoadBitmap(data.Fragment_id, data.Bitmap_id, data.Compressed_bitmap, data.Filter)
-			d.Transport.Send(&response, data.Source)
-
-		case core.BitsRequest:
-			log.Trace("Dispatch.Run BitsRequest")
-			var results []core.SBResult
-			result := false
-
-			for _, v := range data.Bits {
-				if v.SetUnset {
-					result, _ = d.Index.SetBit(v.Fragment_id, v.Bitmap_id, v.Profile_id, uint64(v.Filter))
-				} else {
-					result, _ = d.Index.ClearBit(v.Fragment_id, v.Bitmap_id, v.Profile_id)
-				}
-				bundle := core.SBResult{Bitmap_id: v.Bitmap_id, Frame: v.Frame, Filter: v.Filter, Profile_id: v.Profile_id, Result: result}
-				results = append(results, bundle)
-			}
-			response := db.Message{Data: core.BitsResponse{Id: &data.QueryId, Items: results}}
-			d.Transport.Send(&response, &data.ReturnProcessId)
-
-		case core.PingRequest:
-			log.Trace("Dispatch.Run Ping")
-			pong := db.Message{Data: core.PongRequest{Id: data.Id}}
-			d.Transport.Send(&pong, data.Source)
-
-		case db.HoldResult:
-			log.Trace("Dispatch.Run HoldResult")
-			d.Hold.Set(data.ResultId(), data.ResultData(), 30*time.Second)
-
-		case query.PortableQueryStep:
-			log.Trace("Dispatch.Run PortableQueryStep")
-			go d.Executor.NewJob(message)
-
-		case executor.TopFill:
-			log.Trace("Dispatch.Run TopFill")
-			go d.topFillHandler(message)
-
-		case core.BitsResponse:
-			d.Hold.Set(data.ResultId(), data.ResultData(), 30*time.Second)
-
-		default:
-			spew.Dump(data)
-			log.Warn("Unprocessed message", data)
-		}
-	}
-}
-
-func (d *Dispatch) topFillHandler(m *db.Message) {
-	topfill := m.Data.(executor.TopFill)
-	topn, err := d.Index.TopFillBatch(topfill.Args)
-	if err != nil {
-		log.Warn("TopFillHandler:", err)
-	}
-
-	d.Transport.Send(&db.Message{
-		Data: query.FillResult{
-			BaseQueryResult: &query.BaseQueryResult{
-				Id:   &topfill.QueryId,
-				Data: topn,
-			},
-		},
-	}, &topfill.ReturnProcessId)
-}
diff --git a/etc/default.yaml b/etc/default.yaml
deleted file mode 100644
index 2e2c8dc05..000000000
--- a/etc/default.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-id: 0d92507d-1646-44f8-be81-79d79c1df623
-host: localhost
-port_tcp: 12001
-port_http: 15001
-log_path: /tmp
-fragment_base: /tmp/single
-storage_backend: cassandra
-cassandra_host: localhost
-cassandra_keyspace: pilosa
-supported_frames:
- - b.n
- - t.t
- - l.n
- - d
- - p.n
-etcd_servers:
- - http://127.0.0.1:4001
diff --git a/executor.go b/executor.go
new file mode 100644
index 000000000..01eb7da61
--- /dev/null
+++ b/executor.go
@@ -0,0 +1,316 @@
+package pilosa
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/umbel/pilosa/internal"
+	"github.com/umbel/pilosa/pql"
+)
+
+// DefaultFrame is the frame used if one is not specified.
+const DefaultFrame = "general"
+
+// ErrDatabaseRequired is returned when no database is specified.
+var ErrDatabaseRequired = errors.New("database required")
+
+// Executor recursively executes calls in a PQL query across all slices.
+type Executor struct {
+	index *Index
+
+	// Local hostname.
+	Host string
+
+	// Cluster configuration
+	Cluster *Cluster
+
+	// Client used for remote HTTP requests.
+	HTTPClient *http.Client
+}
+
+// NewExecutor returns a new instance of Executor.
+func NewExecutor(index *Index) *Executor {
+	return &Executor{
+		index:      index,
+		HTTPClient: http.DefaultClient,
+	}
+}
+
+// Index returns the index that the executor runs against.
+func (e *Executor) Index() *Index { return e.index }
+
+// Execute executes a PQL query.
+func (e *Executor) Execute(db string, q *pql.Query, slices []uint64) (interface{}, error) {
+	// Verify that a database is set.
+	if db == "" {
+		return nil, ErrDatabaseRequired
+	}
+
+	// If slices aren't specified, then include all of them.
+	if len(slices) == 0 {
+		// Round up the number of slices.
+		sliceN := (e.index.SliceN() % uint64(len(e.Cluster.Nodes))) + uint64(len(e.Cluster.Nodes))
+
+		// Generate a slices of all slices.
+		slices = make([]uint64, sliceN+1)
+		for i := range slices {
+			slices[i] = uint64(i)
+		}
+	}
+
+	return e.executeCall(db, q.Root, slices)
+}
+
+// executeCall executes a call.
+func (e *Executor) executeCall(db string, c pql.Call, slices []uint64) (interface{}, error) {
+	switch c := c.(type) {
+	case pql.BitmapCall:
+		return e.executeBitmapCall(db, c, slices)
+	case *pql.Count:
+		return e.executeCount(db, c, slices)
+	case *pql.TopN:
+		return e.executeTopN(db, c, slices)
+	default:
+		panic("unreachable")
+	}
+}
+
+// executeBitmapCall executes a call that returns a bitmap.
+func (e *Executor) executeBitmapCall(db string, c pql.BitmapCall, slices []uint64) (*Bitmap, error) {
+	other := NewBitmap()
+	for node, nodeSlices := range e.slicesByNode(slices) {
+		// Execute locally if the hostname matches.
+		if node.Host == e.Host {
+			for _, slice := range nodeSlices {
+				bm, err := e.executeBitmapCallSlice(db, c, slice)
+				if err != nil {
+					return nil, err
+				}
+				other.Merge(bm)
+			}
+			continue
+		}
+
+		// Otherwise execute remotely.
+		res, err := e.exec(node, db, &pql.Query{Root: c}, nodeSlices)
+		if err != nil {
+			return nil, err
+		}
+		other.Merge(res.(*Bitmap))
+	}
+	return other, nil
+}
+
+// executeBitmapCallSlice executes a bitmap call for a single slice.
+func (e *Executor) executeBitmapCallSlice(db string, c pql.BitmapCall, slice uint64) (*Bitmap, error) {
+	switch c := c.(type) {
+	case *pql.Difference:
+		return e.executeDifferenceSlice(db, c, slice)
+	case *pql.Get:
+		return e.executeGetSlice(db, c, slice)
+	case *pql.Intersect:
+		return e.executeIntersectSlice(db, c, slice)
+	case *pql.Range:
+		return e.executeRangeSlice(db, c, slice)
+	case *pql.Union:
+		return e.executeUnionSlice(db, c, slice)
+	default:
+		panic("unreachable")
+	}
+}
+
+// executeTopN executes a top-n() call.
+func (e *Executor) executeTopN(db string, c *pql.TopN, slices []uint64) ([]Pair, error) {
+	panic("FIXME: calculate top n from each slice")
+}
+
+// executeDifferenceSlice executes a difference() call for a local slice.
+func (e *Executor) executeDifferenceSlice(db string, c *pql.Difference, slice uint64) (*Bitmap, error) {
+	var other *Bitmap
+	for i, input := range c.Inputs {
+		bm, err := e.executeBitmapCallSlice(db, input, slice)
+		if err != nil {
+			return nil, err
+		}
+
+		if i == 0 {
+			other = bm
+		} else {
+			other = other.Difference(bm)
+		}
+	}
+	return other, nil
+}
+
+func (e *Executor) executeGetSlice(db string, c *pql.Get, slice uint64) (*Bitmap, error) {
+	frame := c.Frame
+	if frame == "" {
+		frame = DefaultFrame
+	}
+
+	f := e.Index().Fragment(db, frame, slice)
+	return f.Bitmap(c.ID), nil
+}
+
+// executeIntersectSlice executes a intersect() call for a local slice.
+func (e *Executor) executeIntersectSlice(db string, c *pql.Intersect, slice uint64) (*Bitmap, error) {
+	var other *Bitmap
+	for i, input := range c.Inputs {
+		bm, err := e.executeBitmapCallSlice(db, input, slice)
+		if err != nil {
+			return nil, err
+		}
+
+		if i == 0 {
+			other = bm
+		} else {
+			other = other.Intersect(bm)
+		}
+	}
+	return other, nil
+}
+
+// executeRangeSlice executes a range() call for a local slice.
+func (e *Executor) executeRangeSlice(db string, c *pql.Range, slice uint64) (*Bitmap, error) {
+	panic("FIXME")
+}
+
+// executeUnionSlice executes a union() call for a local slice.
+func (e *Executor) executeUnionSlice(db string, c *pql.Union, slice uint64) (*Bitmap, error) {
+	var other *Bitmap
+	for i, input := range c.Inputs {
+		bm, err := e.executeBitmapCallSlice(db, input, slice)
+		if err != nil {
+			return nil, err
+		}
+
+		if i == 0 {
+			other = bm
+		} else {
+			other = other.Union(bm)
+		}
+	}
+	return other, nil
+}
+
+// executeCount executes a count() call.
+func (e *Executor) executeCount(db string, c *pql.Count, slices []uint64) (uint64, error) {
+	var n uint64
+	for node, nodeSlices := range e.slicesByNode(slices) {
+		// Execute locally if the hostname matches.
+		if node.Host == e.Host {
+			for _, slice := range nodeSlices {
+				bm, err := e.executeBitmapCallSlice(db, c.Input, slice)
+				if err != nil {
+					return 0, err
+				}
+				n += bm.Count()
+			}
+			continue
+		}
+
+		// Otherwise execute remotely.
+		res, err := e.exec(node, db, &pql.Query{Root: c}, nodeSlices)
+		if err != nil {
+			return 0, err
+		}
+		n += res.(uint64)
+	}
+	return n, nil
+}
+
+// exec executes a PQL query remotely for a set of slices on a node.
+func (e *Executor) exec(node *Node, db string, q *pql.Query, slices []uint64) (result interface{}, err error) {
+	// Encode request object.
+	buf, err := proto.Marshal(&internal.QueryRequest{
+		DB:     proto.String(db),
+		Query:  proto.String(q.String()),
+		Slices: slices,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// Create HTTP request.
+	req, err := http.NewRequest("POST", (&url.URL{
+		Scheme: "http",
+		Host:   node.Host,
+		Path:   "/query",
+	}).String(), bytes.NewReader(buf))
+	if err != nil {
+		return nil, err
+	}
+
+	// Require protobuf encoding.
+	req.Header.Set("Accept", "application/x-protobuf")
+	req.Header.Set("Content-Type", "application/x-protobuf")
+
+	// Send request to remote node.
+	resp, err := e.HTTPClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	// Read response into buffer.
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return nil, err
+	}
+
+	// Check status code.
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("invalid status: code=%d, err=%s", resp.StatusCode, body)
+	}
+
+	// Decode response object.
+	var pb internal.QueryResponse
+	if err := proto.Unmarshal(body, &pb); err != nil {
+		return nil, err
+	}
+
+	// Return an error, if specified on response.
+	if err := decodeError(pb.GetErr()); err != nil {
+		return nil, err
+	}
+
+	// Return appropriate data for the query.
+	switch q.Root.(type) {
+	case pql.BitmapCall:
+		return decodeBitmap(pb.GetBitmap()), nil
+	case *pql.TopN:
+		return decodePairs(pb.GetPairs()), nil
+	case *pql.Count:
+		return pb.GetN(), nil
+	default:
+		panic(fmt.Sprintf("invalid node for remote exec: %T", q.Root))
+	}
+}
+
+// slicesByNode returns a mapping of nodes to slices.
+//
+// NOTE: Currently the only primary node is used.
+func (e *Executor) slicesByNode(slices []uint64) map[*Node][]uint64 {
+	m := make(map[*Node][]uint64)
+	for _, slice := range slices {
+		nodes := e.Cluster.SliceNodes(slice)
+
+		node := nodes[0]
+		m[node] = append(m[node], slice)
+	}
+	return m
+}
+
+// decodeError returns an error representation of s if s is non-blank.
+// Returns nil if s is blank.
+func decodeError(s string) error {
+	if s == "" {
+		return nil
+	}
+	return errors.New(s)
+}
diff --git a/executor/executor.go b/executor/executor.go
deleted file mode 100644
index 4f16d6d10..000000000
--- a/executor/executor.go
+++ /dev/null
@@ -1,800 +0,0 @@
-package executor
-
-import (
-	"encoding/gob"
-	"sort"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/core"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/query"
-)
-
-const DefaultTimeout = 30 * time.Second
-
-type Executor struct {
-	inbox chan *db.Message
-
-	ID          pilosa.GUID
-	Cluster     *db.Cluster
-	ProcessMap  *core.ProcessMap
-	PluginsPath string
-
-	Hold interface {
-		Get(id *pilosa.GUID, timeout time.Duration) (interface{}, error)
-		Set(id *pilosa.GUID, value interface{}, timeout time.Duration)
-	}
-
-	Index interface {
-		ClearBit(frag_id pilosa.SUUID, bitmap_id uint64, pos uint64) (bool, error)
-		Count(frag_id pilosa.SUUID, bitmap pilosa.BitmapHandle) (uint64, error)
-		Difference(frag_id pilosa.SUUID, bh []pilosa.BitmapHandle) (pilosa.BitmapHandle, error)
-		FromBytes(frag_id pilosa.SUUID, bytes []byte) (pilosa.BitmapHandle, error)
-		Get(frag_id pilosa.SUUID, bitmap_id uint64) (pilosa.BitmapHandle, error)
-		GetBytes(frag_id pilosa.SUUID, bh pilosa.BitmapHandle) ([]byte, error)
-		Intersect(frag_id pilosa.SUUID, bh []pilosa.BitmapHandle) (pilosa.BitmapHandle, error)
-		Range(frag_id pilosa.SUUID, bitmap_id uint64, start, end time.Time) (pilosa.BitmapHandle, error)
-		SetBit(frag_id pilosa.SUUID, bitmap_id uint64, pos uint64, category uint64) (bool, error)
-		TopN(frag_id pilosa.SUUID, bh pilosa.BitmapHandle, n int, categories []uint64) ([]pilosa.Pair, error)
-		TopNAll(frag_id pilosa.SUUID, n int, categories []uint64) ([]pilosa.Pair, error)
-		Union(frag_id pilosa.SUUID, bh []pilosa.BitmapHandle) (pilosa.BitmapHandle, error)
-	}
-
-	TopologyMapper interface {
-		MakeFragments(db string, slice_int int) error
-	}
-
-	Transport interface {
-		Send(*db.Message, *pilosa.GUID)
-	}
-}
-
-func NewExecutor(id pilosa.GUID) *Executor {
-	log.Trace("NewExector")
-	return &Executor{inbox: make(chan *db.Message)}
-}
-
-func (self *Executor) Init() error {
-	log.Trace("Executor.Init()")
-	return nil
-}
-
-func (self *Executor) Close() {
-	log.Trace("Executor.Close()")
-}
-
-func (self *Executor) NewJob(job *db.Message) {
-	log.Trace("NewJob", job)
-	switch job.Data.(type) {
-	case query.CountQueryStep:
-		self.CountQueryStepHandler(job)
-	case query.TopNQueryStep:
-		self.TopNQueryStepHandler(job)
-	case query.UnionQueryStep:
-		self.UnionQueryStepHandler(job)
-	case query.IntersectQueryStep:
-		self.IntersectQueryStepHandler(job)
-	case query.DifferenceQueryStep:
-		self.DifferenceQueryStepHandler(job)
-	case query.CatQueryStep:
-		self.CatQueryStepHandler(job)
-	case query.GetQueryStep:
-		self.GetQueryStepHandler(job)
-	case query.SetQueryStep:
-		self.SetQueryStepHandler(job)
-	case query.ClearQueryStep:
-		self.ClearQueryStepHandler(job)
-	case query.RangeQueryStep:
-		self.RangeQueryStepHandler(job)
-	case query.StashQueryStep:
-		self.StashQueryStepHandler(job)
-	default:
-		log.Warn("unknown")
-		log.Warn(spew.Sdump(job.Data))
-	}
-}
-
-func (self *Executor) CountQueryStepHandler(msg *db.Message) {
-	log.Trace("CountQueryStepHandler")
-	//spew.Dump("COUNT QUERYSTEP")
-	qs := msg.Data.(query.CountQueryStep)
-	input := qs.Input
-	value, _ := self.Hold.Get(input, DefaultTimeout)
-	var bh pilosa.BitmapHandle
-	switch val := value.(type) {
-	case pilosa.BitmapHandle:
-		bh = val
-	case []byte:
-		bh, _ = self.Index.FromBytes(qs.Location.FragmentId, val)
-	}
-	count, err := self.Index.Count(qs.Location.FragmentId, bh)
-	if err != nil {
-		spew.Dump(err)
-	}
-	//spew.Dump("SLICE COUNT", count)
-	result_message := db.Message{
-		Data: query.CountQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: count},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) TopNQueryStepHandler(msg *db.Message) {
-	qs := msg.Data.(query.TopNQueryStep)
-	var bh pilosa.BitmapHandle
-	var topnPackage TopNPackage
-
-	// if we have an input, hold for it. if we don't, we assume an all() query
-	if qs.Input == nil {
-		topn, err := self.Index.TopNAll(qs.Location.FragmentId, qs.N*2, qs.Filters)
-		if err != nil {
-			log.Warn(spew.Sdump(err))
-		}
-		topnPackage = TopNPackage{*qs.Location.ProcessId, qs.Location.FragmentId, topn, bh}
-	} else {
-		input := qs.Input
-		value, _ := self.Hold.Get(input, 10)
-		//var bh pilosa.BitmapHandle
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			bh = val
-		case []byte:
-			bh, _ = self.Index.FromBytes(qs.Location.FragmentId, val)
-		}
-
-		topn, err := self.Index.TopN(qs.Location.FragmentId, bh, qs.N*2, qs.Filters)
-		if err != nil {
-			log.Warn(spew.Sdump(err))
-		}
-		topnPackage = TopNPackage{*qs.Location.ProcessId, qs.Location.FragmentId, topn, bh}
-	}
-
-	result_message := db.Message{
-		Data: query.TopNQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: topnPackage},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) UnionQueryStepHandler(msg *db.Message) {
-	log.Trace("UnionQueryStepHandler")
-	//spew.Dump("UNION QUERYSTEP")
-
-	qs := msg.Data.(query.UnionQueryStep)
-	var handles []pilosa.BitmapHandle
-	// create a list of bitmap handles
-	for _, input := range qs.Inputs {
-		value, _ := self.Hold.Get(input, DefaultTimeout)
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			handles = append(handles, val)
-		case []byte:
-			bh, _ := self.Index.FromBytes(qs.Location.FragmentId, val)
-			handles = append(handles, bh)
-		}
-	}
-
-	bh, err := self.Index.Union(qs.Location.FragmentId, handles)
-	if err != nil {
-		spew.Dump(err)
-	}
-
-	var result interface{}
-	if qs.LocIsDest() {
-		result = bh
-	} else {
-		bm, err := self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-		}
-		result = bm
-	}
-	result_message := db.Message{
-		Data: query.UnionQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) IntersectQueryStepHandler(msg *db.Message) {
-	log.Trace("IntersectQueryStepHandler")
-	//spew.Dump("INTERSECT QUERYSTEP")
-	qs := msg.Data.(query.IntersectQueryStep)
-	var handles []pilosa.BitmapHandle
-	// create a list of bitmap handles
-	for _, input := range qs.Inputs {
-		value, _ := self.Hold.Get(input, DefaultTimeout)
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			handles = append(handles, val)
-		case []byte:
-			bh, _ := self.Index.FromBytes(qs.Location.FragmentId, val)
-			handles = append(handles, bh)
-		}
-	}
-
-	bh, err := self.Index.Intersect(qs.Location.FragmentId, handles)
-	if err != nil {
-		spew.Dump(err)
-	}
-
-	var result interface{}
-	if qs.LocIsDest() {
-		result = bh
-	} else {
-		bm, err := self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-		}
-		result = bm
-	}
-	result_message := db.Message{
-		Data: query.IntersectQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) DifferenceQueryStepHandler(msg *db.Message) {
-	log.Trace("DifferenceQueryStepHandler")
-	//spew.Dump("DIFFERENCE QUERYSTEP")
-	qs := msg.Data.(query.DifferenceQueryStep)
-	var handles []pilosa.BitmapHandle
-	// create a list of bitmap handles
-	for _, input := range qs.Inputs {
-		value, _ := self.Hold.Get(input, DefaultTimeout)
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			handles = append(handles, val)
-		case []byte:
-			bh, _ := self.Index.FromBytes(qs.Location.FragmentId, val)
-			handles = append(handles, bh)
-		}
-	}
-
-	bh, err := self.Index.Difference(qs.Location.FragmentId, handles)
-	if err != nil {
-		spew.Dump(err)
-	}
-
-	var result interface{}
-	if qs.LocIsDest() {
-		result = bh
-	} else {
-		bm, err := self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-		}
-		result = bm
-	}
-	result_message := db.Message{
-		Data: query.DifferenceQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) CatQueryStepHandler(msg *db.Message) {
-	log.Trace("CatQueryStepHandler")
-	qs := msg.Data.(query.CatQueryStep)
-	var handles []pilosa.BitmapHandle
-	return_type := "bitmap-handles"
-	var sum uint64
-	merge_map := make(map[uint64]uint64)
-	slice_map := make(map[uint64]map[pilosa.SUUID]struct{})
-	all_slice := make(map[pilosa.SUUID]struct {
-		process pilosa.GUID
-		handle  pilosa.BitmapHandle
-	})
-
-	// either create a list of bitmap handles to cat (i.e. union), or sum the integer values
-	part := make(chan interface{})
-	num_parts := len(qs.Inputs)
-
-	for _, input := range qs.Inputs {
-		go func(id *pilosa.GUID, part chan interface{}) {
-			value, _ := self.Hold.Get(id, DefaultTimeout)
-			part <- value
-		}(input, part)
-	}
-
-	//for _, input := range qs.Inputs {
-	check_pair := false
-	for i := 0; i < num_parts; i++ {
-		value := <-part
-
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			handles = append(handles, val)
-		case []byte:
-			bh, _ := self.Index.FromBytes(qs.Location.FragmentId, val)
-			handles = append(handles, bh)
-		case uint64:
-			//spew.Dump(val)
-			return_type = "sum"
-			sum += val
-		case TopNPackage:
-			return_type = "pair-list"
-			var e struct{}
-			for _, pair := range val.Pairs {
-				//merge_map[pair.Key] += pair.Count
-				if pair.Key == 0 {
-					continue //skip
-				}
-				merge_map[pair.Key] += pair.Count
-				mm, ok := slice_map[pair.Key]
-				if !ok {
-					mm = make(map[pilosa.SUUID]struct{})
-					slice_map[pair.Key] = mm
-				}
-				mm[val.FragmentId] = e
-			}
-			all_slice[val.FragmentId] = struct {
-				process pilosa.GUID
-				handle  pilosa.BitmapHandle
-			}{val.ProcessId, val.HBitmap}
-			check_pair = true
-		}
-	}
-	if check_pair { //no point in doing this for non top-n handling
-		tasks := BuildTask(merge_map, slice_map, all_slice)
-		self.FetchMissing(tasks)
-		for k, v := range self.GatherResults(tasks) {
-			merge_map[k] += v
-		}
-	}
-
-	// either return the sum, or return the compressed bitmap resulting from the cat (union)
-	var result interface{}
-	if return_type == "sum" {
-		result = sum
-	} else if return_type == "bitmap-handles" {
-		bh, err := self.Index.Union(qs.Location.FragmentId, handles)
-		result, err = self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-		}
-	} else if return_type == "pair-list" {
-		rank_list := make(pilosa.RankList, 0, len(merge_map))
-		for k, v := range merge_map {
-			if k == 0 || v == 0 {
-				continue //shouldn't be getting 0 keys or values anyway
-			}
-			rank := new(pilosa.Rank)
-			rank.Pair = &pilosa.Pair{Key: k, Count: v}
-			rank_list = append(rank_list, rank)
-		}
-		sort.Sort(rank_list) // kinda seems like this copy is wasteful..i'll ponder
-		items_size := min(len(merge_map), qs.N)
-		pair_list := make([]pilosa.Pair, 0, items_size+1)
-		for i, r := range rank_list {
-			if i < items_size {
-				pair_list = append(pair_list, *r.Pair)
-			} else {
-				break
-			}
-		}
-		result = pair_list
-	} else {
-		result = "NONE"
-	}
-	result_message := db.Message{
-		Data: query.CatQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) SendRequest(process_id pilosa.GUID, t *Task) {
-	args := make([]pilosa.FillArgs, len(t.f), len(t.f))
-	for _, v := range t.f {
-		args = append(args, v)
-	}
-	msg := new(db.Message)
-	p, _ := self.ProcessMap.GetProcess(&self.ID)
-	msg.Data = TopFill{args, p.Id(), t.hold_id, process_id}
-	self.Transport.Send(msg, &process_id)
-}
-
-func (self *Executor) FetchMissing(tasks map[pilosa.GUID]*Task) {
-	for k, v := range tasks {
-		go self.SendRequest(k, v)
-	}
-}
-
-func (self *Executor) GatherResults(tasks map[pilosa.GUID]*Task) map[uint64]uint64 {
-	results := make(map[uint64]uint64)
-	answers := make(chan []pilosa.Pair)
-	for _, task := range tasks {
-		go func(id pilosa.GUID) {
-			value, err := self.Hold.Get(&id, 10) //eiher need to be the frame process or the handler process?
-			if value == nil {
-				log.Warn("Bad TopN Result:", err)
-				empty := make([]pilosa.Pair, 0, 0)
-				answers <- empty
-
-			} else {
-				answers <- value.([]pilosa.Pair)
-			}
-		}(task.hold_id)
-	}
-	for i := 0; i < len(tasks); i++ {
-		batch := <-answers
-		for _, pair := range batch {
-			results[pair.Key] += pair.Count
-		}
-	}
-	close(answers)
-	return results
-}
-
-func (self *Executor) GetQueryStepHandler(msg *db.Message) {
-	qs := msg.Data.(query.GetQueryStep)
-	//spew.Dump("GET QUERYSTEP")
-
-	bh, err := self.Index.Get(qs.Location.FragmentId, qs.Bitmap.Id)
-	if err != nil {
-		spew.Dump(err)
-		log.Error("GetQueryStepHandler1", qs.Location.FragmentId.String(), qs.Bitmap.Id)
-		log.Error("GetQueryStepHandler2", err)
-	}
-
-	var result interface{}
-	if qs.LocIsDest() {
-		result = bh
-	} else {
-		bm, err := self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-			log.Error("GetQueryStepHandlerr3", qs.Location.FragmentId.String(), qs.Bitmap.Id)
-			log.Error("GetQueryStepHandler4", err)
-		}
-		result = bm
-	}
-	result_message := db.Message{
-		Data: query.GetQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) SetQueryStepHandler(msg *db.Message) {
-	//spew.Dump("SET QUERYSTEP")
-	qs := msg.Data.(query.SetQueryStep)
-	result, _ := self.Index.SetBit(qs.Location.FragmentId, qs.Bitmap.Id, qs.ProfileId, qs.Bitmap.Filter)
-
-	result_message := db.Message{
-		Data: query.SetQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) ClearQueryStepHandler(msg *db.Message) {
-	//spew.Dump("SET QUERYSTEP")
-	qs := msg.Data.(query.ClearQueryStep)
-	result, _ := self.Index.ClearBit(qs.Location.FragmentId, qs.Bitmap.Id, qs.ProfileId)
-
-	result_message := db.Message{
-		Data: query.ClearQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) RangeQueryStepHandler(msg *db.Message) {
-	qs := msg.Data.(query.RangeQueryStep)
-	//spew.Dump("RANDE QUERYSTEP")
-
-	bh, err := self.Index.Range(qs.Location.FragmentId, qs.Bitmap.Id, qs.Start, qs.End)
-	if err != nil {
-		spew.Dump(err)
-	}
-
-	var result interface{}
-	if qs.LocIsDest() {
-		result = bh
-	} else {
-		bm, err := self.Index.GetBytes(qs.Location.FragmentId, bh)
-		if err != nil {
-			spew.Dump(err)
-		}
-		result = bm
-	}
-	result_message := db.Message{
-		Data: query.RangeQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-}
-
-func (self *Executor) StashQueryStepHandler(msg *db.Message) {
-	log.Trace("StashQueryStepHandler")
-	qs := msg.Data.(query.StashQueryStep)
-
-	part := make(chan interface{})
-	num_parts := len(qs.Inputs)
-
-	for _, input := range qs.Inputs {
-		go func(id *pilosa.GUID, part chan interface{}) {
-			value, _ := self.Hold.Get(id, DefaultTimeout)
-			part <- value
-		}(input, part)
-	}
-	//just collect all the handles and return them
-	result := query.NewStash() //query.Stash{make([]query.CacheItem, 0), false}
-	for i := 0; i < num_parts; i++ {
-		value := <-part
-
-		switch val := value.(type) {
-		case pilosa.BitmapHandle:
-			log.Info("STASH ADDING HANDLE", val)
-			//not sure what to do here....
-			//result.Handles = append(result.Handles, val)
-		case []byte:
-			bh, _ := self.Index.FromBytes(qs.Location.FragmentId, val)
-			item := query.CacheItem{FragmentId: qs.Location.FragmentId, Handle: bh}
-			result.Stash = append(result.Stash, item)
-		case query.Stash:
-			result.Stash = append(result.Stash, val.Stash...)
-		default:
-			log.Warn("UNEXCPECTED MESSAGE", value)
-		}
-	}
-	result_message := db.Message{
-		Data: query.StashQueryResult{
-			BaseQueryResult: &query.BaseQueryResult{Id: qs.Id, Data: result},
-		},
-	}
-	self.Transport.Send(&result_message, qs.Destination.ProcessId)
-
-}
-
-func (self *Executor) RunQueryTest(database_name string, pql string) string {
-	return pql
-}
-
-func (self *Executor) runQuery(database *db.Database, qry *query.Query) error {
-	log.Trace("Executor.runQuery", database, qry)
-	process, err := self.ProcessMap.GetProcess(&self.ID)
-	if err != nil {
-		return err
-	}
-	process_id := process.Id()
-	fragment_id := pilosa.SUUID(0)
-	destination := db.Location{ProcessId: &process_id, FragmentId: fragment_id}
-
-	query_plan, err := query.QueryPlanForQuery(database, qry, &destination)
-	if err != nil {
-		switch obj := err.(type) {
-		case *query.FragmentNotFound:
-			self.TopologyMapper.MakeFragments(obj.Db, obj.Slice)
-		}
-		self.Hold.Set(qry.Id, err, 30)
-		return err
-	}
-	// loop over the query steps and send to Transport
-	for _, qs := range *query_plan {
-		msg := new(db.Message)
-		msg.Data = qs
-		switch step := qs.(type) {
-		case query.PortableQueryStep:
-			loc := step.GetLocation()
-			if loc != nil {
-				self.Transport.Send(msg, loc.ProcessId)
-			} else {
-				log.Warn("Problem with querystep(nil location)", spew.Sdump(step))
-			}
-		}
-	}
-	return nil
-}
-
-func (self *Executor) RunPQL(database_name string, pql string) (interface{}, error) {
-	log.Trace("Executor.RunPQL", database_name, pql)
-	database := self.Cluster.GetOrCreateDatabase(database_name)
-
-	// see if the outer query function is a custom query
-	reserved_functions := stringSlice{"get", "set", "clear", "union", "intersect", "difference", "count", "top-n", "mask", "range", "stash", "recall"}
-	tokens, err := query.Lex(pql)
-	if err != nil {
-		return nil, err
-	}
-	outer_token := tokens[0].Text
-
-	if reserved_functions.pos(outer_token) != -1 {
-
-		qry, err := query.QueryForTokens(tokens)
-		if err != nil {
-			return nil, err
-		}
-		go self.runQuery(database, qry)
-
-		var final interface{}
-		final, err = self.Hold.Get(qry.Id, 10)
-		if err != nil {
-			return nil, err
-		}
-		return final, nil
-
-	} else { //want to refactor this down to just RunPlugin(tokens)
-		plugins_file := self.PluginsPath + "/" + outer_token + ".js"
-		filter, filters := query.TokensToFilterStrings(tokens)
-		query_list := GetPlugin(plugins_file, filter, filters).(query.PqlList)
-
-		for i, _ := range query_list {
-			qry, err := query.QueryForPQL(query_list[i].PQL)
-			if err != nil {
-				return nil, err
-			}
-			go self.runQuery(database, qry)
-			query_list[i].Id = qry.Id
-		}
-
-		final_result := make(map[string]interface{})
-		result := make(chan struct {
-			final interface{}
-			label string
-			err   error
-		})
-		x := 0
-		for i, _ := range query_list {
-			x++
-			go func(q query.PqlListItem, reply chan struct {
-				final interface{}
-				label string
-				err   error
-			}) {
-				final, err := self.Hold.Get(q.Id, 10)
-				result <- struct {
-					final interface{}
-					label string
-					err   error
-				}{final, q.Label, err}
-			}(query_list[i], result)
-			if err != nil {
-				out := spew.Sdump(err)
-				log.Warn(out)
-			}
-		}
-		for z := 0; z < x; z++ {
-			ans := <-result
-			final_result[ans.label] = ans.final
-		}
-
-		return final_result, nil
-	}
-
-}
-
-func init() {
-	gob.Register(TopNPackage{})
-	gob.Register(TopFill{})
-}
-
-type TopNPackage struct {
-	ProcessId  pilosa.GUID
-	FragmentId pilosa.SUUID
-	Pairs      []pilosa.Pair
-	HBitmap    pilosa.BitmapHandle
-}
-
-type TopFill struct {
-	Args            []pilosa.FillArgs
-	ReturnProcessId pilosa.GUID
-	QueryId         pilosa.GUID
-	DestProcessId   pilosa.GUID
-}
-
-type Task struct {
-	processid pilosa.GUID
-	f         map[pilosa.SUUID]pilosa.FillArgs
-	hold_id   pilosa.GUID
-}
-
-func newtask(p pilosa.GUID) *Task {
-	result := new(Task)
-	result.processid = p
-	result.f = make(map[pilosa.SUUID]pilosa.FillArgs)
-	result.hold_id = pilosa.NewGUID()
-	return result
-}
-
-func (t *Task) Add(frag pilosa.SUUID, bitmap_id uint64, handle pilosa.BitmapHandle) {
-	fa, ok := t.f[frag]
-	if !ok {
-		fa = pilosa.FillArgs{Frag_id: frag, Handle: handle, Bitmaps: make([]uint64, 0, 0)}
-	}
-	fa.Bitmaps = append(fa.Bitmaps, bitmap_id)
-	t.f[frag] = fa
-}
-
-func BuildTask(merge_map map[uint64]uint64,
-	slice_map map[uint64]map[pilosa.SUUID]struct{},
-	total_fragments map[pilosa.SUUID]struct {
-		process pilosa.GUID
-		handle  pilosa.BitmapHandle
-	}) map[pilosa.GUID]*Task {
-
-	tasks := make(map[pilosa.GUID]*Task)
-	for bitmap_id, _ := range merge_map { //for all brands
-		//for fragment_id, reported_fragments := range slice_map[bitmap_id] { //find missing fragments
-		reporting_fragments := slice_map[bitmap_id]
-		//id slice ==> SUUID,BitmapHandle
-		for _, p := range missing(reporting_fragments, total_fragments) {
-			task, ok := tasks[p.process]
-			if !ok {
-				task = newtask(p.process)
-				tasks[p.process] = task
-			}
-			task.Add(p.fragment, bitmap_id, p.handle)
-
-		}
-		//}
-	}
-
-	return tasks
-}
-
-type hole struct {
-	process  pilosa.GUID
-	handle   pilosa.BitmapHandle
-	fragment pilosa.SUUID
-}
-
-func missing(fids map[pilosa.SUUID]struct{}, all map[pilosa.SUUID]struct {
-	process pilosa.GUID
-	handle  pilosa.BitmapHandle
-}) []hole {
-	results := make([]hole, 0, 0)
-
-	for k, v := range all {
-		_, ok := fids[k]
-		if !ok {
-			results = append(results, hole{v.process, v.handle, k})
-		}
-	}
-	return results
-}
-
-func (self *TopFill) GetId() *pilosa.GUID {
-	return &self.QueryId
-}
-func (self *TopFill) GetLocation() *db.Location {
-	return &db.Location{ProcessId: &self.DestProcessId, FragmentId: 0} //this message is a broadcast to many fragments so i'm choosing fragmentzero
-}
-
-func (self *Executor) Run() {
-	log.Warn("Executor Run...")
-}
-
-type stringSlice []string
-
-func (slice stringSlice) pos(value string) int {
-	for p, v := range slice {
-		if v == value {
-			return p
-		}
-	}
-	return -1
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
diff --git a/executor/utils.go b/executor/utils.go
deleted file mode 100644
index 1acc44530..000000000
--- a/executor/utils.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package executor
-
-import (
-	"bytes"
-	"io/ioutil"
-	"strings"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/robertkrimen/otto"
-	"github.com/umbel/pilosa/query"
-)
-
-func GetPlugin(file_name string, filter string, filters []string) interface{} {
-
-	file_data, err := ioutil.ReadFile(file_name)
-	if err != nil {
-		spew.Dump(err)
-	}
-	s := string(file_data[:])
-
-	// convert the list of filters in to a string array
-	var buffer bytes.Buffer
-	if len(filters) > 0 {
-		buffer.WriteString("['")
-		buffer.WriteString(strings.Join(filters, "','"))
-		buffer.WriteString("']")
-	} else {
-		buffer.WriteString("[]")
-	}
-
-	js := "query_list = (" + s + ")('" + filter + "', " + buffer.String() + ");"
-
-	Otto := otto.New()
-	Otto.Run(js)
-	query_objects, err := Otto.Get("query_list")
-
-	query_list_interface, err := query_objects.Export()
-	if err != nil {
-		spew.Dump(err)
-	}
-
-	var query_list query.PqlList
-
-	// ql is []interface{}
-	switch ql := query_list_interface.(type) {
-	case []interface{}:
-		// q is map[string]interface{}
-		for i, _ := range ql {
-			q := ql[i].(map[string]interface{})
-			query_list = append(query_list, query.PqlListItem{Label: q["label"].(string), PQL: q["pql"].(string)})
-		}
-	default:
-		spew.Dump("DEFAULT")
-	}
-
-	return query_list
-}
diff --git a/executor_test.go b/executor_test.go
new file mode 100644
index 000000000..f41eb9401
--- /dev/null
+++ b/executor_test.go
@@ -0,0 +1,198 @@
+package pilosa_test
+
+import (
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	"github.com/umbel/pilosa"
+	"github.com/umbel/pilosa/pql"
+)
+
+// Ensure a get query can be executed.
+func TestExecutor_Execute_Get(t *testing.T) {
+	e := NewExecutor(NewCluster(1))
+	e.Index().Fragment("d", "f", 0).Bitmap(10).SetBit(3)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit(SliceWidth + 1)
+
+	if res, err := e.Execute("d", MustParse(`get(id=10, frame=f)`), nil); err != nil {
+		t.Fatal(err)
+	} else if chunks := res.(*pilosa.Bitmap).Chunks(); len(chunks) != 2 {
+		t.Fatalf("unexpected chunk length: %s", spew.Sdump(chunks))
+	} else if chunks[0].Value[0] != 8 {
+		t.Fatalf("unexpected chunk(0): %s", spew.Sdump(chunks[0]))
+	} else if chunks[1].Value[0] != 2 {
+		t.Fatalf("unexpected chunk(1): %s", spew.Sdump(chunks[1]))
+	}
+}
+
+// Ensure a difference query can be executed.
+func TestExecutor_Execute_Difference(t *testing.T) {
+	e := NewExecutor(NewCluster(1))
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(1)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(2)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(3)
+
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(2)
+
+	if res, err := e.Execute("d", MustParse(`difference(get(id=10), get(id=11))`), nil); err != nil {
+		t.Fatal(err)
+	} else if chunks := res.(*pilosa.Bitmap).Chunks(); len(chunks) != 1 {
+		t.Fatalf("unexpected chunk length: %s", spew.Sdump(chunks))
+	} else if chunks[0].Value[0] != 10 { // b1010
+		t.Fatalf("unexpected chunk(0): %s", spew.Sdump(chunks[0]))
+	}
+}
+
+// Ensure an intersect query can be executed.
+func TestExecutor_Execute_Intersect(t *testing.T) {
+	e := NewExecutor(NewCluster(1))
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(1)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(SliceWidth + 1)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(SliceWidth + 2)
+
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(1)
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(2)
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(SliceWidth + 2)
+
+	if res, err := e.Execute("d", MustParse(`intersect(get(id=10), get(id=11))`), nil); err != nil {
+		t.Fatal(err)
+	} else if chunks := res.(*pilosa.Bitmap).Chunks(); len(chunks) != 2 {
+		t.Fatalf("unexpected chunk length: %s", spew.Sdump(chunks))
+	} else if chunks[0].Value[0] != 2 {
+		t.Fatalf("unexpected chunk(0): %s", spew.Sdump(chunks[0]))
+	} else if chunks[1].Value[0] != 4 {
+		t.Fatalf("unexpected chunk(1): %s", spew.Sdump(chunks[1]))
+	}
+}
+
+// Ensure a union query can be executed.
+func TestExecutor_Execute_Union(t *testing.T) {
+	e := NewExecutor(NewCluster(1))
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(0)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(SliceWidth + 1)
+	e.Index().Fragment("d", "general", 0).Bitmap(10).SetBit(SliceWidth + 2)
+
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(2)
+	e.Index().Fragment("d", "general", 0).Bitmap(11).SetBit(SliceWidth + 2)
+
+	if res, err := e.Execute("d", MustParse(`union(get(id=10), get(id=11))`), nil); err != nil {
+		t.Fatal(err)
+	} else if chunks := res.(*pilosa.Bitmap).Chunks(); len(chunks) != 2 {
+		t.Fatalf("unexpected chunk length: %s", spew.Sdump(chunks))
+	} else if chunks[0].Value[0] != 5 {
+		t.Fatalf("unexpected chunk(0): %s", spew.Sdump(chunks[0]))
+	} else if chunks[1].Value[0] != 6 {
+		t.Fatalf("unexpected chunk(1): %s", spew.Sdump(chunks[1]))
+	}
+}
+
+// Ensure a count query can be executed.
+func TestExecutor_Execute_Count(t *testing.T) {
+	e := NewExecutor(NewCluster(1))
+	e.Index().Fragment("d", "f", 0).Bitmap(10).SetBit(3)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit(SliceWidth + 1)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit(SliceWidth + 2)
+
+	if n, err := e.Execute("d", MustParse(`count(get(id=10, frame=f))`), nil); err != nil {
+		t.Fatal(err)
+	} else if n != uint64(3) {
+		t.Fatalf("unexpected n: %d", n)
+	}
+}
+
+// Ensure a remote query can return a bitmap.
+func TestExecutor_Execute_Remote_Bitmap(t *testing.T) {
+	c := NewCluster(2)
+
+	// Create secondary server and update second cluster node.
+	s := NewServer()
+	defer s.Close()
+	c.Nodes[1].Host = s.Host()
+
+	// Mock secondary server's executor to verify arguments and return a bitmap.
+	s.Handler.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		if db != `d` {
+			t.Fatalf("unexpected db: %s", db)
+		} else if query.String() != `get(id=10, frame=f)` {
+			t.Fatalf("unexpected query: %s", query.String())
+		} else if !reflect.DeepEqual(slices, []uint64{0, 2}) {
+			t.Fatalf("unexpected slices: %+v", slices)
+		}
+
+		// Set bits in slice 0 & 2.
+		bm := pilosa.NewBitmap()
+		bm.SetBit((0 * SliceWidth) + 1)
+		bm.SetBit((0 * SliceWidth) + 2)
+		bm.SetBit((2 * SliceWidth) + 4)
+		return bm, nil
+	}
+
+	// Create local executor data.
+	// The local node owns slice 1.
+	e := NewExecutor(c)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit((1 * SliceWidth) + 1)
+
+	if res, err := e.Execute("d", MustParse(`get(id=10, frame=f)`), nil); err != nil {
+		t.Fatal(err)
+	} else if chunks := res.(*pilosa.Bitmap).Chunks(); len(chunks) != 3 {
+		t.Fatalf("unexpected chunk length: %s", spew.Sdump(chunks))
+	} else if chunks[0].Value[0] != 6 {
+		t.Fatalf("unexpected chunk(0): %s", spew.Sdump(chunks[0]))
+	} else if chunks[1].Value[0] != 2 {
+		t.Fatalf("unexpected chunk(1): %s", spew.Sdump(chunks[1]))
+	}
+}
+
+// Ensure a remote query can return a count.
+func TestExecutor_Execute_Remote_Count(t *testing.T) {
+	c := NewCluster(2)
+
+	// Create secondary server and update second cluster node.
+	s := NewServer()
+	defer s.Close()
+	c.Nodes[1].Host = s.Host()
+
+	// Mock secondary server's executor to return a count.
+	s.Handler.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return uint64(10), nil
+	}
+
+	// Create local executor data. The local node owns slice 1.
+	e := NewExecutor(c)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit((1 * SliceWidth) + 1)
+	e.Index().Fragment("d", "f", 1).Bitmap(10).SetBit((1 * SliceWidth) + 2)
+
+	if n, err := e.Execute("d", MustParse(`count(get(id=10, frame=f))`), nil); err != nil {
+		t.Fatal(err)
+	} else if n != uint64(12) {
+		t.Fatalf("unexpected n: %d", n)
+	}
+}
+
+// Executor represents a test wrapper for pilosa.Executor.
+type Executor struct {
+	*pilosa.Executor
+}
+
+// NewExecutor returns a new instance of Executor.
+// The executor always matches the hostname of the first cluster node.
+func NewExecutor(cluster *pilosa.Cluster) *Executor {
+	e := &Executor{
+		Executor: pilosa.NewExecutor(pilosa.NewIndex()),
+	}
+	e.Cluster = cluster
+	e.Host = cluster.Nodes[0].Host
+
+	return e
+}
+
+// MustParse parses s into a PQL query. Panic on error.
+func MustParse(s string) *pql.Query {
+	q, err := pql.NewParser(strings.NewReader(s)).Parse()
+	if err != nil {
+		panic(err)
+	}
+	return q
+}
diff --git a/fragment.go b/fragment.go
index a8c2898a3..7404f8a19 100644
--- a/fragment.go
+++ b/fragment.go
@@ -1,213 +1,230 @@
 package pilosa
 
 import (
+	"sort"
 	"strings"
 	"sync"
 	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/golang/groupcache/lru"
 )
 
+// SliceWidth is the number of profile IDs in a slice.
+const SliceWidth = 65536
+
+// Fragment represents the intersection of a frame and slice in a database.
 type Fragment struct {
-	mu    sync.Mutex
-	id    SUUID
-	slice int
-	impl  Pilosa
-	cache *lru.Cache
+	mu sync.Mutex
 
-	// Provide an autoincrementing index for bitmap handles.
-	seq uint64
+	// Composite identifiers
+	db    string
+	frame string
+	slice uint64
 
-	// Stats for how many messages have been processed.
-	stats FragmentStats
+	// Bitmap cache.
+	cache Cache
 }
 
-func NewFragment(id SUUID, db string, slice int, frame string) *Fragment {
-	storage := NewStorage(Backend, StorageOptions{
-		DB:          db,
-		Slice:       slice,
-		Frame:       frame,
-		FragmentID:  id,
-		LevelDBPath: LevelDBPath,
-	})
-
-	var impl Pilosa
-	if strings.HasSuffix(frame, ".n") {
-		impl = NewBrand(db, frame, slice, storage, 50000, 45000, 100)
-	} else {
-		impl = NewGeneral(db, frame, slice, storage)
-	}
-
-	return &Fragment{
-		id:    id,
-		cache: lru.New(50000),
-		impl:  impl,
+// NewFragment returns a new instance of Fragment.
+func NewFragment(db, frame string, slice uint64) *Fragment {
+	f := &Fragment{
+		db:    db,
+		frame: frame,
 		slice: slice,
 	}
-}
 
-func (f *Fragment) Bitmap(bh BitmapHandle) (*Bitmap, bool) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return f.bitmap(bh)
-}
-
-func (f *Fragment) bitmap(bh BitmapHandle) (*Bitmap, bool) {
-	bm, ok := f.cache.Get(bh)
-	if ok && bm != nil {
-		return bm.(*Bitmap), ok
+	// Determine cache type from frame name.
+	if strings.HasSuffix(frame, ".n") {
+		c := NewRankCache()
+		c.ThresholdLength = 50000
+		c.ThresholdIndex = 45000
+		f.cache = c
+	} else {
+		f.cache = NewLRUCache(50000)
 	}
-	return NewBitmap(), false //cache fail
+
+	return f
 }
 
-func (f *Fragment) exists(bitmapID uint64) bool {
+// Bitmap returns a bitmap by ID.
+func (f *Fragment) Bitmap(bitmapID uint64) *Bitmap {
 	f.mu.Lock()
 	defer f.mu.Unlock()
-	return f.impl.Exists(bitmapID)
+	return f.bitmap(bitmapID)
+}
+
+func (f *Fragment) bitmap(bitmapID uint64) *Bitmap {
+	// Read from cache.
+	if bm, ok := f.cache.Get(bitmapID); ok {
+		return bm
+	}
+
+	// Read from storage engine.
+	// bm, filter := f.storage.Fetch(bitmapID, f.db, f.frame, f.slice)
+
+	bm := NewBitmap()
+	f.cache.Add(bitmapID, 0 /*filter*/, bm)
+	return bm
 }
 
 func (f *Fragment) TopNAll(n int, categories []uint64) []Pair {
 	f.mu.Lock()
 	defer f.mu.Unlock()
-	return f.impl.TopNAll(n, categories)
-}
+	f.cache.Invalidate()
 
-func (f *Fragment) TopN(bitmap BitmapHandle, n int, categories []uint64) []Pair {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-
-	bm, ok := f.cache.Get(bitmap)
-	if ok {
-		return f.impl.TopN(bm.(*Bitmap), n, categories)
+	// Create a set of categories.
+	m := make(map[uint64]struct{})
+	for _, v := range categories {
+		m[v] = struct{}{}
 	}
-	return nil
-}
 
-func (f *Fragment) NewHandle(bitmapID uint64) BitmapHandle {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return f.allocHandle(f.impl.Get(bitmapID))
-}
+	// Iterate over rankings and add to results until we have enough.
+	var results []Pair
+	for _, pair := range f.cache.Pairs() {
+		// Skip if categories are specified but category is not found.
+		if _, ok := m[pair.category]; (len(categories) > 0 && !ok) || pair.Count <= 0 {
+			continue
+		}
 
-func (f *Fragment) AllocHandle(bm *Bitmap) BitmapHandle {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	return f.allocHandle(bm)
-}
+		// Append pair.
+		results = append(results, pair)
 
-func (f *Fragment) allocHandle(bm *Bitmap) BitmapHandle {
-	handle := f.nextHandle()
-	f.cache.Add(handle, bm)
-	return handle
-}
-
-func (f *Fragment) nextHandle() BitmapHandle {
-	millis := uint64(time.Now().UTC().UnixNano())
-	id := millis << (64 - 41)
-	id |= uint64(f.slice) << (64 - 41 - 13)
-	id |= f.seq % 1024
-	f.seq += 1
-	return BitmapHandle(id)
-}
-
-func (f *Fragment) Union(bitmaps []BitmapHandle) BitmapHandle {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-
-	result := NewBitmap()
-	for i, id := range bitmaps {
-		bm, _ := f.bitmap(id)
-		if i == 0 {
-			result = bm
-		} else {
-			result = result.Union(bm)
+		// Exit when we have enough pairs.
+		if len(results) >= n {
+			break
 		}
 	}
-	return f.allocHandle(result)
+	return results
 }
 
-func (f *Fragment) build_time_range_bitmap(bitmapID uint64, start, end time.Time) BitmapHandle {
+func (f *Fragment) TopN(src *Bitmap, n int, categories []uint64) []Pair {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 
-	result := NewBitmap()
-	for i, bid := range GetRange(start, end, bitmapID) {
-		bm := f.impl.Get(bid)
-		if i == 0 {
-			result = bm
-		} else {
-			result = result.Union(bm)
+	// Resort rank, if necessary.
+	f.cache.Invalidate()
+
+	// Create a set of categories.
+	set := make(map[uint64]struct{})
+	for _, v := range categories {
+		set[v] = struct{}{}
+	}
+
+	var results []Pair
+	var x int
+	breakout := 1000
+
+	// Iterate over rankings.
+	rankings := f.cache.Pairs()
+	for i, pair := range rankings {
+		// Skip if category not found.
+		if len(set) > 0 {
+			if _, ok := set[pair.category]; !ok {
+				continue
+			}
+		}
+
+		// Only append if there are intersecting bits with source bitmap.
+		bc := src.IntersectionCount(pair.bitmap)
+		if bc > 0 {
+			results = append(results, Pair{
+				Key:      pair.Key,
+				Count:    bc,
+				category: pair.category,
+			})
+		}
+		x = i
+
+		// Exit when we have enough.
+		if len(results) > n {
+			break
 		}
 	}
-	return f.AllocHandle(result)
-}
 
-func (f *Fragment) Intersect(bitmaps []BitmapHandle) BitmapHandle {
-	f.mu.Lock()
-	defer f.mu.Unlock()
+	// Sort results by ranking.
+	sort.Sort(Pairs(results))
 
-	var result *Bitmap
-	for i, id := range bitmaps {
-		bm, _ := f.bitmap(id)
-		if i == 0 {
-			result = bm.Clone()
-		} else {
-			result = result.Intersection(bm)
+	if len(results) < n {
+		return results
+	}
+
+	end := len(results) - 1
+	o := results[end]
+	threshold := o.Count
+
+	if threshold <= 10 {
+		return results
+	}
+
+	results = append(results, o)
+	for i := x + 1; i < len(rankings); i++ {
+		o = rankings[i]
+
+		if len(set) > 0 {
+			if _, ok := set[o.category]; !ok {
+				continue
+			}
+		}
+
+		// Need something to do with the size of initial bitmap
+		if len(results) > breakout || o.Count < threshold {
+			break
+		}
+
+		bc := src.IntersectionCount(o.bitmap)
+		if bc > threshold {
+			if results[end-1].Count > bc {
+				results[end] = Pair{Key: o.Key, Count: bc, category: o.category}
+				threshold = bc
+			} else {
+				results[end+1] = Pair{Key: o.Key, Count: bc, category: o.category}
+				sort.Sort(Pairs(results))
+				threshold = results[end].Count
+			}
 		}
 	}
-	return f.allocHandle(result)
+
+	return results[:end]
 }
 
-func (f *Fragment) Difference(bitmaps []BitmapHandle) BitmapHandle {
-	f.mu.Lock()
-	defer f.mu.Unlock()
+/*
+func (f *Fragment) TopFill(args FillArgs) ([]Pair, error) {
+	result := make([]Pair, 0)
+	for _, id := range args.Bitmaps {
+		if _, ok := f.cache.Get(id); !ok {
+			continue
+		}
 
-	result := NewBitmap()
-	for i, id := range bitmaps {
-		bm, _ := f.bitmap(id)
-		if i == 0 {
-			result = bm
-		} else {
-			result = result.Difference(bm)
+		if args.Handle == 0 {
+			if bm := f.Bitmap(id); bm != nil && bm.Count() > 0 {
+				result = append(result, Pair{Key: id, Count: bm.Count()})
+			}
+			continue
+		}
+
+		res := f.Intersect([]uint64{args.Handle, id})
+		if res == nil {
+			continue
+		}
+
+		if bc := res.BitCount(); bc > 0 {
+			result = append(result, Pair{Key: id, Count: bc})
 		}
 	}
-	return f.allocHandle(result)
+	return result, nil
 }
+*/
 
-func (f *Fragment) Persist() {
+func (f *Fragment) Range(bitmapID uint64, start, end time.Time) *Bitmap {
 	f.mu.Lock()
 	defer f.mu.Unlock()
 
-	err := f.impl.Persist()
-	if err != nil {
-		log.Warn("Error saving:", err)
+	bitmapIDs := GetRange(start, end, bitmapID)
+	if len(bitmapIDs) == 0 {
+		return NewBitmap()
 	}
-}
 
-func (f *Fragment) Load() {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	f.impl.Load(f)
-}
-
-// FragmentStats represents in-memory stats for a single fragment.
-type FragmentStats struct {
-	// Messages processed by the fragment
-	ProcessN    uint64
-	ProcessTime time.Duration
-}
-
-type Pilosa interface {
-	Get(id uint64) *Bitmap
-	SetBit(id uint64, bit_pos uint64, filter uint64) bool
-	ClearBit(id uint64, bit_pos uint64) bool
-	TopN(b *Bitmap, n int, categories []uint64) []Pair
-	TopNAll(n int, categories []uint64) []Pair
-	Clear() bool
-	Store(bitmapID uint64, bm *Bitmap, filter uint64) error
-	Stats() interface{}
-	Persist() error
-	Load(fragment *Fragment)
-	Exists(id uint64) bool
+	result := f.bitmap(bitmapIDs[0])
+	for _, id := range bitmapIDs[1:] {
+		result = result.Union(f.bitmap(id))
+	}
+	return result
 }
diff --git a/fragment_container.go b/fragment_container.go
deleted file mode 100644
index 6ad4d7f9f..000000000
--- a/fragment_container.go
+++ /dev/null
@@ -1,340 +0,0 @@
-package pilosa
-
-import (
-	"bytes"
-	"compress/gzip"
-	"encoding/base64"
-	"encoding/gob"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"sync"
-	"syscall"
-	"time"
-
-	log "github.com/cihub/seelog"
-	// "github.com/umbel/pilosa/statsd"
-)
-
-// DefaultBackend is the default data storage layer.
-const DefaultBackend = "cassandra"
-
-var Backend = DefaultBackend
-
-var LevelDBPath string
-
-var (
-	ErrFragmentNotFound = errors.New("fragment not found")
-)
-
-func init() {
-	gob.Register(BitmapHandle(0))
-	gob.Register([]Pair{})
-}
-
-type FragmentContainer struct {
-	mu        sync.Mutex
-	fragments map[SUUID]*Fragment
-}
-
-func NewFragmentContainer() *FragmentContainer {
-	return &FragmentContainer{
-		fragments: make(map[SUUID]*Fragment),
-	}
-}
-
-type BitmapHandle uint64
-
-type FillArgs struct {
-	FragmentID SUUID
-	Handle     BitmapHandle
-	Bitmaps    []uint64
-}
-
-func (fc *FragmentContainer) Fragment(fragmentID SUUID) (*Fragment, bool) {
-	fc.mu.Lock()
-	f, ok := fc.fragments[fragmentID]
-	fc.mu.Unlock()
-	return f, ok
-}
-
-func (fc *FragmentContainer) Get(fragmentID SUUID, bitmapID uint64) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.NewHandle(bitmapID), nil
-}
-
-func (fc *FragmentContainer) LoadBitmap(fragmentID SUUID, bitmapID uint64, data string, filter uint64) error {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return ErrFragmentNotFound
-	}
-
-	// Decode from base64 encoding.
-	buf, err := base64.StdEncoding.DecodeString(data)
-	if err != nil {
-		return err
-	}
-
-	// Decompress data.
-	reader, err := gzip.NewReader(bytes.NewReader(buf))
-	if err != nil {
-		return err
-	}
-	b, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return err
-	}
-
-	// Build bitmap from data.
-	bm := NewBitmap()
-	bm.FromBytes(b)
-
-	// Write bitmap to the underlying store.
-	return f.impl.Store(bitmapID, bm, filter)
-}
-
-func (fc *FragmentContainer) Stats(fragmentID SUUID) interface{} {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return nil
-	}
-	return f.impl.Stats()
-}
-
-func (fc *FragmentContainer) Empty(fragmentID SUUID) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.AllocHandle(NewBitmap()), nil
-}
-
-func (fc *FragmentContainer) Intersect(fragmentID SUUID, bh []BitmapHandle) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.Intersect(bh), nil
-}
-
-func (fc *FragmentContainer) Union(fragmentID SUUID, bh []BitmapHandle) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.Union(bh), nil
-}
-
-func (fc *FragmentContainer) Difference(fragmentID SUUID, bh []BitmapHandle) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.Difference(bh), nil
-}
-
-func (fc *FragmentContainer) Mask(fragmentID SUUID, start, end uint64) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-
-	bm := NewBitmap()
-	for i := start; i < end; i++ {
-		bm.SetBit(i)
-	}
-	return f.AllocHandle(bm), nil
-}
-
-func (fc *FragmentContainer) Range(fragmentID SUUID, bitmapID uint64, start, end time.Time) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-	return f.build_time_range_bitmap(bitmapID, start, end), nil
-}
-
-func (fc *FragmentContainer) TopN(fragmentID SUUID, bh BitmapHandle, n int, categories []uint64) ([]Pair, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return nil, ErrFragmentNotFound
-	}
-	return f.TopN(bh, n, categories), nil
-}
-
-func (fc *FragmentContainer) TopNAll(fragmentID SUUID, n int, categories []uint64) ([]Pair, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return nil, ErrFragmentNotFound
-	}
-	return f.TopNAll(n, categories), nil
-}
-
-func (fc *FragmentContainer) TopFillBatch(args []FillArgs) ([]Pair, error) {
-	results := make(map[uint64]uint64)
-	for _, v := range args {
-		items, _ := fc.TopFillFragment(v)
-		if len(args) == 1 {
-			return items, nil
-		}
-		for _, pair := range items {
-			results[pair.Key] += pair.Count
-		}
-	}
-	ret_val := make([]Pair, len(results))
-	for k, v := range results {
-		if v > 0 { //don't include 0 size items
-			ret_val = append(ret_val, Pair{k, v})
-		}
-	}
-	return ret_val, nil
-
-}
-func (fc *FragmentContainer) TopFillFragment(args FillArgs) ([]Pair, error) {
-	f, ok := fc.Fragment(args.FragmentID)
-	if !ok {
-		return nil, ErrFragmentNotFound
-	}
-
-	result := make([]Pair, 0)
-	for _, v := range args.Bitmaps {
-		if !f.exists(v) {
-			continue
-		}
-
-		a := f.NewHandle(v)
-		if args.Handle == 0 {
-			// Return just the count
-			if bm, ok := f.Bitmap(a); ok && bm.Count() > 0 {
-				result = append(result, Pair{v, bm.Count()})
-			}
-			continue
-		}
-
-		res := f.Intersect([]BitmapHandle{args.Handle, a})
-		if bm, ok := f.Bitmap(res); ok {
-			bc := bm.BitCount()
-			if bc > 0 {
-				result = append(result, Pair{v, bc})
-			}
-		}
-	}
-	return result, nil
-}
-
-func (fc *FragmentContainer) GetList(fragmentID SUUID, bitmapIDs []uint64) ([]BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return nil, ErrFragmentNotFound
-	}
-
-	a := make([]BitmapHandle, len(bitmapIDs))
-	for i, v := range bitmapIDs {
-		a[i] = f.NewHandle(v)
-	}
-	return a, nil
-}
-
-func (fc *FragmentContainer) Count(fragmentID SUUID, bh BitmapHandle) (uint64, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-
-	bm, ok := f.Bitmap(bh)
-	if ok == false {
-		return 0, nil
-	}
-	return bm.BitCount(), nil
-}
-
-func (fc *FragmentContainer) GetBytes(fragmentID SUUID, bh BitmapHandle) ([]byte, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return nil, ErrFragmentNotFound
-	}
-
-	bm, ok := f.Bitmap(bh)
-	if !ok {
-		bm = NewBitmap()
-		log.Warn("cache miss")
-	}
-
-	var b bytes.Buffer
-	w := gzip.NewWriter(&b)
-	if _, err := w.Write(bm.ToBytes()); err != nil {
-		return nil, err
-	}
-	if err := w.Flush(); err != nil {
-		return nil, err
-	}
-	if err := w.Close(); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-func (fc *FragmentContainer) FromBytes(fragmentID SUUID, data []byte) (BitmapHandle, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return 0, ErrFragmentNotFound
-	}
-
-	r, _ := gzip.NewReader(bytes.NewReader(data))
-	b, _ := ioutil.ReadAll(r)
-
-	bm := NewBitmap()
-	bm.FromBytes(b)
-	return f.AllocHandle(bm), nil
-}
-
-func (fc *FragmentContainer) SetBit(fragmentID SUUID, bitmapID uint64, pos uint64, category uint64) (bool, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return false, ErrFragmentNotFound
-	}
-	return f.impl.SetBit(bitmapID, pos, category), nil
-}
-
-func (fc *FragmentContainer) ClearBit(fragmentID SUUID, bitmapID uint64, pos uint64) (bool, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return false, ErrFragmentNotFound
-	}
-	return f.impl.ClearBit(bitmapID, pos), nil
-}
-
-func (fc *FragmentContainer) Clear(fragmentID SUUID) (bool, error) {
-	f, ok := fc.Fragment(fragmentID)
-	if !ok {
-		return false, ErrFragmentNotFound
-	}
-	return f.impl.Clear(), nil
-}
-
-func (fc *FragmentContainer) AddFragment(db string, frame string, slice int, id SUUID) {
-	fc.mu.Lock()
-	defer fc.mu.Unlock()
-
-	_, ok := fc.fragments[id]
-	if ok {
-		return
-	}
-
-	log.Warn("ADD FRAGMENT", frame, db, slice, id.String())
-	f := NewFragment(id, db, slice, frame)
-	fc.fragments[id] = f
-	// go f.Load(loader)
-}
-
-func dumpHandlesToLog() {
-	var limit syscall.Rlimit
-	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
-		log.Warn("Getrlimit:" + err.Error())
-	}
-	mesg := fmt.Sprintf("%v file descriptors out of a maximum of %v available\n", limit.Cur, limit.Max)
-	log.Warn(mesg)
-}
diff --git a/fragment_container_test.go b/fragment_container_test.go
deleted file mode 100644
index 20d0331d3..000000000
--- a/fragment_container_test.go
+++ /dev/null
@@ -1,308 +0,0 @@
-package pilosa_test
-
-import (
-	"testing"
-
-	"github.com/umbel/pilosa"
-	_ "github.com/umbel/pilosa/storage"
-)
-
-func init() {
-	pilosa.Backend = "memory"
-}
-
-// Ensure a fragment can be retrieved from the container.
-func TestFragmentContainer_Get(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustClear(1)
-
-	if bh, err := fc.Get(pilosa.SUUID(1), 1234); err != nil {
-		t.Fatal(err)
-	} else if bh == 0 {
-		t.Fatal("expected non-zero bitmap handle")
-	}
-}
-
-// Ensure a bit can be set on a bitmap.
-func TestFragmentContainer_SetBit(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustClear(1)
-
-	// Set a bit on the bitmap.
-	if changed, err := fc.SetBit(1, uint64(1234), 1, 0); err != nil {
-		t.Fatal(err)
-	} else if changed == false {
-		t.Fatal("expected change")
-	}
-
-	// Set the same bit on the bitmap. No change should be indicated.
-	if changed, err := fc.SetBit(1, uint64(1234), 1, 0); err != nil {
-		t.Fatal(err)
-	} else if changed == true {
-		t.Fatal("expected no change")
-	}
-}
-
-// Ensure the number of bits on a bitmap can be counted.
-func TestFragmentContainer_Count(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, pilosa.SUUID(1))
-
-	// Set a bit on the bitmap.
-	bi1 := uint64(1234)
-	if changed, err := fc.SetBit(pilosa.SUUID(1), bi1, 1, 0); err != nil {
-		t.Fatal(err)
-	} else if changed == false {
-		t.Fatal("expected change")
-	}
-
-	// Verify that one bit is set.
-	if bh, err := fc.Get(pilosa.SUUID(1), bi1); err != nil {
-		t.Fatal(err)
-	} else if n, err := fc.Count(pilosa.SUUID(1), bh); err != nil {
-		t.Fatal(err)
-	} else if n != 1 {
-		t.Fatalf("unexpected count: %d", n)
-	}
-}
-
-// Ensure the bits in two bitmaps can be unioned.
-func TestFragmentContainer_Union(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-	fc.MustSetBit(1, 4321, 65537, 0)
-
-	// Union the handles together.
-	if result, err := fc.Union(1, []pilosa.BitmapHandle{fc.MustGet(1, 1234), fc.MustGet(1, 4321)}); err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, result); n != 2 {
-		t.Fatalf("unexpected union bit count: %d", n)
-	}
-}
-
-// Ensure unioning a bitmap with an empty bitmap returns a single bit count.
-func TestFragmentContainer_Union_Empty(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-
-	// Union the handles together.
-	if result, err := fc.Union(1, []pilosa.BitmapHandle{fc.MustGet(1, 1234), fc.MustGet(1, 4321)}); err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, result); n != 1 {
-		t.Fatalf("unexpected empty union bit count: %d", n)
-	}
-}
-
-// Ensure the bits in two bitmaps can be intersected.
-func TestFragmentContainer_Intersect(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-	fc.MustSetBit(1, 4321, 65537, 0)
-
-	// Intersect the handles together.
-	if result, err := fc.Intersect(1, []pilosa.BitmapHandle{fc.MustGet(1, 1234), fc.MustGet(1, 4321)}); err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, result); n != 0 {
-		t.Fatalf("unexpected intersect bit count: %d", n)
-	}
-}
-
-// Ensure the bits in two bitmaps can be diffed.
-func TestFragmentContainer_Difference(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-	fc.MustSetBit(1, 4321, 65537, 0)
-
-	// Compute the difference between the handles.
-	if result, err := fc.Difference(1, []pilosa.BitmapHandle{fc.MustGet(1, 1234), fc.MustGet(1, 4321)}); err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, result); n != 1 {
-		t.Fatalf("unexpected difference bit count: %s", err)
-	}
-}
-
-// Ensure bitmaps can be marshaled and unmarshaled to bytes.
-func TestFragmentContainer_Bytes(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-
-	// Count bits and marshal to bytes.
-	beforeN := fc.MustCount(1, 1234)
-	buf, err := fc.GetBytes(1, 1234)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Marshal bytes back to a bitmap and re-count.
-	bh2, err := fc.FromBytes(1, buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-	afterN := fc.MustCount(1, bh2)
-
-	// Ensure the original bit count matches the new bitmap's bit count.
-	if beforeN != afterN {
-		t.Fatalf("unexpected bit count: before=%d, after=%d", beforeN, afterN)
-	}
-}
-
-// Ensure an empty bitmap can be returned.
-func TestFragmentContainer_Empty(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	bh, err := fc.Empty(1)
-	if err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, bh); n != 0 {
-		t.Fatalf("unexpected bit count: %d", n)
-	}
-}
-
-// Ensure a list of bitmap handles can be returned.
-func TestFragmentContainer_GetList(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-	fc.MustSetBit(1, 1234, 1, 0)
-	fc.MustSetBit(1, 4321, 65537, 0)
-
-	a, err := fc.GetList(1, []uint64{1234, 4321, 789})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Compute the union to ensure they're the correct bitmaps.
-	if res, err := fc.Union(1, a); err != nil {
-		t.Fatal(err)
-	} else if n := fc.MustCount(1, res); n != 2 {
-		t.Fatalf("unexpected bit count: %d", n)
-	}
-}
-
-// Ensure brand bitmaps can perform a small number of set bits.
-func TestFragmentContainer_SetBit_Brand_Small(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "b.n", 0, 2)
-	for i := uint64(0); i < 1000; i++ {
-		fc.SetBit(2, 1029, i, 0)
-	}
-}
-
-// Ensure the top n can be computed for a brand.
-func TestFragmentContainer_TopN_Brand(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "b.n", 0, 2)
-
-	// Set bits on the bitmap.
-	fc.MustSetBit(2, uint64(1), 1, 2)
-	fc.MustSetBit(2, uint64(1), 2, 2)
-	fc.MustSetBit(2, uint64(1), 3, 2)
-	fc.MustSetBit(2, uint64(2), 1, 2)
-	fc.MustSetBit(2, uint64(2), 2, 2)
-	fc.MustSetBit(2, uint64(3), 1, 2)
-
-	// Retrieve the bitmap handle for bitmap 1.
-	bh := fc.MustGet(2, uint64(1))
-
-	// Compute the top-n.
-	if results, err := fc.TopN(2, bh, 4, []uint64{2}); err != nil {
-		t.Fatal(err)
-	} else if results[0].Key != 1 {
-		t.Fatalf("unexpected key: %d", results[0].Key)
-	} else if results[0].Count != 3 {
-		t.Fatalf("unexpected value: %d", results[0].Count)
-	}
-}
-
-// Ensure a fragment can be cleared.
-func TestFragmentContainer_Clear(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "general", 0, 1)
-
-	// Compute the top-n.
-	if res, err := fc.Clear(1); err != nil {
-		t.Fatal(err)
-	} else if res != true {
-		t.Fatalf("unexpected result: %v", res)
-	}
-}
-
-// Ensure a fragment can be marshaled and unmarshaled to and from bytes.
-func TestFragmentContainer_FromBytes(t *testing.T) {
-	fc := NewFragmentContainer()
-	fc.AddFragment("25", "b.n", 0, 2)
-
-	// Set bits for a bitmap.
-	for i := 0; i < 4096; i++ {
-		fc.MustSetBit(2, 1, uint64(i), 0)
-	}
-
-	// Marshal to bytes.
-	buf, err := fc.GetBytes(2, fc.MustGet(2, 1))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Load a bitmap from compressed data.
-	bh, err := fc.FromBytes(2, buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Load and count bits.
-	if n := fc.MustCount(2, bh); n != 4096 {
-		t.Fatalf("unexpected bit count: %d", n)
-	}
-}
-
-// FragementContainer is a test wrapper for pilosa.FragmentContainer.
-type FragmentContainer struct {
-	*pilosa.FragmentContainer
-}
-
-// NewFragmentContainer returns a new instance of FragmentContainer.
-func NewFragmentContainer() *FragmentContainer {
-	return &FragmentContainer{pilosa.NewFragmentContainer()}
-}
-
-// MustGet retrieves a bitmap by id. Panic on error.
-func (fc *FragmentContainer) MustGet(frag_id pilosa.SUUID, bitmap_id uint64) pilosa.BitmapHandle {
-	bh, err := fc.Get(frag_id, bitmap_id)
-	if err != nil {
-		panic(err)
-	}
-	return bh
-}
-
-// MustSetBit sets a bit in a bitmap. Panic on error.
-func (fc *FragmentContainer) MustSetBit(frag_id pilosa.SUUID, bitmap_id uint64, pos uint64, category uint64) bool {
-	changed, err := fc.SetBit(frag_id, bitmap_id, pos, category)
-	if err != nil {
-		panic(err)
-	}
-	return changed
-}
-
-// MustClear clears a fragment. Panic on error.
-func (fc *FragmentContainer) MustClear(fragmentID pilosa.SUUID) bool {
-	v, err := fc.Clear(fragmentID)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
-
-// MustCount returns the number of set bits in a bitmap. Panic on error.
-func (fc *FragmentContainer) MustCount(frag_id pilosa.SUUID, bitmap pilosa.BitmapHandle) uint64 {
-	v, err := fc.Count(frag_id, bitmap)
-	if err != nil {
-		panic(err)
-	}
-	return v
-}
diff --git a/fragment_test.go b/fragment_test.go
new file mode 100644
index 000000000..e7d3e593d
--- /dev/null
+++ b/fragment_test.go
@@ -0,0 +1,8 @@
+package pilosa_test
+
+import (
+	"github.com/umbel/pilosa"
+)
+
+// SliceWidth is a helper reference to use when testing.
+const SliceWidth = pilosa.SliceWidth
diff --git a/general.go b/general.go
deleted file mode 100644
index 5c96d9672..000000000
--- a/general.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package pilosa
-
-import (
-	"encoding/json"
-	"fmt"
-
-	log "github.com/cihub/seelog"
-	"github.com/golang/groupcache/lru"
-)
-
-type General struct {
-	bitmap_cache *lru.Cache
-	keys         map[uint64]interface{}
-	db           string
-	frame        string
-	slice        int
-	storage      Storage
-}
-
-func NewGeneral(db string, frame string, slice int, s Storage) *General {
-	f := new(General)
-	f.storage = s
-	f.frame = frame
-	f.slice = slice
-	f.db = db
-	f.Clear()
-	f.keys = make(map[uint64]interface{})
-	return f
-
-}
-func (self *General) Clear() bool {
-	self.bitmap_cache = lru.New(50000)
-	self.bitmap_cache.OnEvicted = self.OnEvicted
-	return true
-}
-
-func (self *General) Exists(bitmap_id uint64) bool {
-	_, ok := self.bitmap_cache.Get(bitmap_id)
-	return ok
-
-}
-func (self *General) Get(bitmap_id uint64) *Bitmap {
-	bm, ok := self.bitmap_cache.Get(bitmap_id)
-	if ok && bm != nil {
-		return bm.(*Bitmap)
-	}
-	bm, _ = self.storage.Fetch(bitmap_id, self.db, self.frame, self.slice)
-	self.bitmap_cache.Add(bitmap_id, bm)
-	self.keys[bitmap_id] = 0
-	return bm.(*Bitmap)
-}
-func (self *General) SetBit(bitmap_id uint64, bit_pos uint64, filter uint64) bool {
-	bm := self.Get(bitmap_id)
-	change, chunk, address := bm.SetBit(bit_pos)
-	if change {
-		val := chunk.Value[address.BlockIndex]
-		self.storage.StoreBit(bitmap_id, self.db, self.frame, self.slice, filter, address.ChunkKey, int32(address.BlockIndex), val, bm.Count())
-	}
-	return change
-}
-func (self *General) TopN(b *Bitmap, n int, categories []uint64) []Pair {
-	var empty []Pair
-
-	return empty
-}
-func (self *General) Store(bitmap_id uint64, bm *Bitmap, filter uint64) error {
-	if err := self.storage.Store(bitmap_id, self.db, self.frame, self.slice, filter, bm); err != nil {
-		return err
-	}
-	self.bitmap_cache.Add(bitmap_id, bm)
-	self.keys[bitmap_id] = 0
-	return nil
-}
-
-func (self *General) OnEvicted(key lru.Key, value interface{}) {
-	delete(self.keys, key.(uint64))
-}
-
-func (self *General) Stats() interface{} {
-
-	stats := map[string]interface{}{
-		"total size of cache in items": self.bitmap_cache.Len()}
-	return stats
-}
-
-func (self *General) getFileName() string {
-	base := FragmentBase
-	if base == "" {
-		base = "."
-	}
-	return fmt.Sprintf("%s/%s.%s.%d", base, self.db, self.frame, self.slice)
-}
-
-func (self *General) Persist() error {
-	log.Warn("General Persist")
-	w, err := createFile(self.getFileName())
-	if err != nil {
-		log.Warn("Error saving:", err)
-		return err
-	}
-	defer w.Close()
-	defer self.storage.Close()
-
-	results := make([]uint64, len(self.keys))
-	i := 0
-	for k, _ := range self.keys { //   map[uint64]*Rank
-		results[i] = k
-		i += 1
-	}
-
-	encoder := json.NewEncoder(w)
-	return encoder.Encode(results)
-}
-
-func (self *General) Load(f *Fragment) {
-	log.Warn("General Load")
-	r, err := openFile(self.getFileName())
-	if err != nil {
-		log.Warn("NO General Init File:", self.getFileName())
-		return
-	}
-
-	dec := json.NewDecoder(r)
-	var keys []uint64
-
-	if err := dec.Decode(&keys); err != nil {
-		return
-	}
-	for _, k := range keys {
-		self.Get(k)
-	}
-}
-
-func (self *General) TopNAll(n int, categories []uint64) []Pair {
-	results := make([]Pair, 0, 0)
-
-	count := 0
-	for k, _ := range self.keys {
-
-		if count >= n {
-			break
-		}
-		bm := self.Get(k)
-		results = append(results, Pair{k, bm.Count()})
-		count++
-	}
-	return results
-}
-
-func (self *General) ClearBit(bitmap_id uint64, bit_pos uint64) bool {
-	bm := self.Get_nocache(bitmap_id)
-	if bm.Count() == 0 {
-		return false
-	}
-	change, chunk, address := bm.ClearBit(bit_pos)
-	if change {
-		val := chunk.Value[address.BlockIndex]
-		if val == 0 {
-			self.storage.RemoveBit(bitmap_id, self.db, self.frame, self.slice, uint64(0), address.ChunkKey, int32(address.BlockIndex), bm.Count())
-		} else {
-			self.storage.StoreBit(bitmap_id, self.db, self.frame, self.slice, uint64(0), address.ChunkKey, int32(address.BlockIndex), val, bm.Count())
-		}
-	}
-	return change
-}
-
-func (self *General) Get_nocache(bitmap_id uint64) *Bitmap {
-	bm, ok := self.bitmap_cache.Get(bitmap_id)
-	if ok && bm != nil {
-		return bm.(*Bitmap)
-	}
-	bm, _ = self.storage.Fetch(bitmap_id, self.db, self.frame, self.slice)
-	return bm.(*Bitmap)
-}
diff --git a/handler.go b/handler.go
new file mode 100644
index 000000000..2d141f754
--- /dev/null
+++ b/handler.go
@@ -0,0 +1,261 @@
+package pilosa
+
+import (
+	"encoding/json"
+	"errors"
+	"expvar"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/umbel/pilosa/internal"
+	"github.com/umbel/pilosa/pql"
+)
+
+// Handler represents an HTTP handler.
+type Handler struct {
+	// The execution engine for running queries.
+	Executor interface {
+		Execute(db string, query *pql.Query, slices []uint64) (interface{}, error)
+	}
+
+	// The version to report on the /version endpoint.
+	Version string
+
+	// The writer for any logging.
+	LogOutput io.Writer
+}
+
+// NewHandler returns a new instance of Handler with a default logger.
+func NewHandler() *Handler {
+	return &Handler{
+		Version:   Version,
+		LogOutput: os.Stderr,
+	}
+}
+
+// ServeHTTP handles an HTTP request.
+func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	switch r.URL.Path {
+	case "/query":
+		h.handleQuery(w, r)
+	case "/version":
+		h.handleVersion(w, r)
+
+	case "/debug/vars":
+		h.handleExpvar(w, r)
+	default:
+		http.NotFound(w, r)
+	}
+}
+
+// handleQuery handles /query requests.
+func (h *Handler) handleQuery(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "POST":
+		h.handlePostQuery(w, r)
+	default:
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+// handlePostQuery handles /query requests.
+func (h *Handler) handlePostQuery(w http.ResponseWriter, r *http.Request) {
+	// Parse incoming request.
+	db, query, slices, err := h.readQueryRequest(r)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		h.writeQueryResponse(w, r, nil, err)
+		return
+	}
+
+	// Parse query string.
+	q, err := pql.NewParser(strings.NewReader(query)).Parse()
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		h.writeQueryResponse(w, r, nil, err)
+		return
+	}
+
+	// Execute the query.
+	res, e := h.Executor.Execute(db, q, slices)
+
+	// Set appropriate status code, if there is an error.
+	if e != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+	}
+
+	// Write response back to client.
+	if err := h.writeQueryResponse(w, r, res, e); err != nil {
+		h.logger().Printf("write query response error: %s", err)
+	}
+}
+
+// readQueryRequest parses an query parameters from r.
+func (h *Handler) readQueryRequest(r *http.Request) (db, query string, slices []uint64, err error) {
+	switch r.Header.Get("Content-Type") {
+	case "application/x-protobuf":
+		return h.readProtobufQueryRequest(r)
+	default:
+		return h.readURLQueryRequest(r)
+	}
+}
+
+// readProtobufQueryRequest parses query parameters in protobuf from r.
+func (h *Handler) readProtobufQueryRequest(r *http.Request) (db, query string, slices []uint64, err error) {
+	// Slurp the body.
+	body, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		return
+	}
+
+	// Unmarshal into object.
+	var req internal.QueryRequest
+	if err = proto.Unmarshal(body, &req); err != nil {
+		return
+	}
+
+	return req.GetDB(), req.GetQuery(), req.GetSlices(), nil
+}
+
+// readURLQueryRequest parses query parameters from URL parameters from r.
+func (h *Handler) readURLQueryRequest(r *http.Request) (db, query string, slices []uint64, err error) {
+	q := r.URL.Query()
+
+	// Read DB argument.
+	db = q.Get("db")
+
+	// Parse query string.
+	buf, err := ioutil.ReadAll(r.Body)
+	if err != nil {
+		return
+	}
+	query = string(buf)
+
+	// Parse list of slices.
+	slices, err = parseUint64Slice(q.Get("slices"))
+	if err != nil {
+		err = errors.New("invalid slice argument")
+		return
+	}
+
+	return
+}
+
+// writeQueryResponse writes the response from the executor to w.
+func (h *Handler) writeQueryResponse(w http.ResponseWriter, r *http.Request, res interface{}, err error) error {
+	if strings.Contains(r.Header.Get("Accept"), "application/x-protobuf") {
+		return h.writeProtobufQueryResponse(w, res, err)
+	}
+	return h.writeJSONQueryResponse(w, res, err)
+}
+
+// writeProtobufQueryResponse writes the response from the executor to w as protobuf.
+func (h *Handler) writeProtobufQueryResponse(w http.ResponseWriter, res interface{}, e error) error {
+	var resp internal.QueryResponse
+
+	// Set the result on the appropriate field.
+	if res != nil {
+		switch res := res.(type) {
+		case *Bitmap:
+			resp.Bitmap = encodeBitmap(res)
+		case Pairs:
+			resp.Pairs = encodePairs(res)
+		case uint64:
+			resp.N = proto.Uint64(res)
+		default:
+			panic(fmt.Sprintf("invalid query response type: %T", res))
+		}
+	}
+
+	// Set the error if there is one.
+	if e != nil {
+		resp.Err = proto.String(e.Error())
+	}
+
+	// Encode response.
+	buf, err := proto.Marshal(&resp)
+	if err != nil {
+		return err
+	}
+
+	// Write response back to client.
+	if _, err := w.Write(buf); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// writeJSONQueryResponse writes the response from the executor to w as JSON.
+func (h *Handler) writeJSONQueryResponse(w http.ResponseWriter, res interface{}, e error) error {
+	var o struct {
+		Result interface{} `json:"result,omitempty"`
+		Error  string      `json:"error,omitempty"`
+	}
+	o.Result = res
+
+	if e != nil {
+		o.Error = e.Error()
+	}
+
+	// Otherwise marshal the result as JSON.
+	return json.NewEncoder(w).Encode(o)
+}
+
+// handleGetVersion handles /version requests.
+func (h *Handler) handleVersion(w http.ResponseWriter, r *http.Request) {
+	if err := json.NewEncoder(w).Encode(struct {
+		Version string `json:"version"`
+	}{
+		Version: h.Version,
+	}); err != nil {
+		h.logger().Printf("write version response error: %s", err)
+	}
+}
+
+// handleExpvar handles /debug/vars requests.
+func (h *Handler) handleExpvar(w http.ResponseWriter, r *http.Request) {
+	// Copied from $GOROOT/src/expvar/expvar.go
+	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")
+}
+
+// logger returns a logger for the handler.
+func (h *Handler) logger() *log.Logger {
+	return log.New(h.LogOutput, "", log.LstdFlags)
+}
+
+// parseUint64Slice returns a slice of uint64s from a comma-delimited string.
+func parseUint64Slice(s string) ([]uint64, error) {
+	var a []uint64
+	for _, str := range strings.Split(s, ",") {
+		// Ignore blanks.
+		if str == "" {
+			continue
+		}
+
+		// Parse number.
+		num, err := strconv.ParseUint(str, 10, 64)
+		if err != nil {
+			return nil, err
+		}
+		a = append(a, num)
+	}
+	return a, nil
+}
diff --git a/handler_test.go b/handler_test.go
new file mode 100644
index 000000000..22e784f6d
--- /dev/null
+++ b/handler_test.go
@@ -0,0 +1,373 @@
+package pilosa_test
+
+import (
+	"bytes"
+	"errors"
+	"io"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"reflect"
+	"strings"
+	"testing"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/umbel/pilosa"
+	"github.com/umbel/pilosa/internal"
+	"github.com/umbel/pilosa/pql"
+)
+
+// Ensure the handler returns "not found" for invalid paths.
+func TestHandler_NotFound(t *testing.T) {
+	w := httptest.NewRecorder()
+	NewHandler().ServeHTTP(w, MustNewHTTPRequest("GET", "/no_such_path", nil))
+	if w.Code != http.StatusNotFound {
+		t.Fatalf("invalid status: %d", w.Code)
+	}
+}
+
+// Ensure the handler can accept URL arguments.
+func TestHandler_Query_Args_URL(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		if db != "db0" {
+			t.Fatalf("unexpected db: %s", db)
+		} else if query.String() != `count(get(id=100))` {
+			t.Fatalf("unexpected query: %s", query.String())
+		} else if !reflect.DeepEqual(slices, []uint64{0, 1}) {
+			t.Fatalf("unexpected slices: %+v", slices)
+		}
+		return uint64(100), nil
+	}
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query?db=db0&slices=0,1", strings.NewReader("count( get( 100))")))
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"result":100}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can accept arguments via protobufs.
+func TestHandler_Query_Args_Protobuf(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		if db != "db0" {
+			t.Fatalf("unexpected db: %s", db)
+		} else if query.String() != `count(get(id=100))` {
+			t.Fatalf("unexpected query: %s", query.String())
+		} else if !reflect.DeepEqual(slices, []uint64{0, 1}) {
+			t.Fatalf("unexpected slices: %+v", slices)
+		}
+		return uint64(100), nil
+	}
+
+	// Generate request body.
+	reqBody, err := proto.Marshal(&internal.QueryRequest{
+		DB:     proto.String("db0"),
+		Query:  proto.String("count(get(100))"),
+		Slices: []uint64{0, 1},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Generate protobuf request.
+	req := MustNewHTTPRequest("POST", "/query", bytes.NewReader(reqBody))
+	req.Header.Set("Content-Type", "application/x-protobuf")
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, req)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+}
+
+// Ensure the handler returns an error when parsing bad arguments.
+func TestHandler_Query_Args_Err(t *testing.T) {
+	w := httptest.NewRecorder()
+	NewHandler().ServeHTTP(w, MustNewHTTPRequest("POST", "/query?db=db0&slices=a,b", strings.NewReader("get(100)")))
+	if w.Code != http.StatusBadRequest {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"error":"invalid slice argument"}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can execute a query with a uint64 response as JSON.
+func TestHandler_Query_Uint64_JSON(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return uint64(100), nil
+	}
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query?db=db0&slices=0,1", strings.NewReader("count( get( 100))")))
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"result":100}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can execute a query with a uint64 response as protobufs.
+func TestHandler_Query_Uint64_Protobuf(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return uint64(100), nil
+	}
+
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("POST", "/query", strings.NewReader("count(get(100))"))
+	r.Header.Set("Accept", "application/x-protobuf")
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+
+	var resp internal.QueryResponse
+	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatal(err)
+	} else if resp.GetN() != 100 {
+		t.Fatalf("unexpected n: %d", resp.GetN())
+	}
+}
+
+// Ensure the handler can execute a query that returns a bitmap as JSON.
+func TestHandler_Query_Bitmap_JSON(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		bm := pilosa.NewBitmap()
+		bm.SetBit(1)
+		bm.SetBit(3)
+		bm.SetBit(66)
+		bm.SetBit(pilosa.SliceWidth + 1)
+		return bm, nil
+	}
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query", strings.NewReader("get(100)")))
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"result":{"chunks":[{"Key":0,"Value":[10,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},{"Key":32,"Value":[2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]}]}}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can execute a query that returns a bitmap as protobuf.
+func TestHandler_Query_Bitmap_Protobuf(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		bm := pilosa.NewBitmap()
+		bm.SetBit(1)
+		bm.SetBit(pilosa.SliceWidth + 1)
+		return bm, nil
+	}
+
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("POST", "/query", strings.NewReader("get(100)"))
+	r.Header.Set("Accept", "application/x-protobuf")
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+
+	var resp internal.QueryResponse
+	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatal(err)
+	} else if a := resp.GetBitmap().GetChunks(); len(a) != 2 {
+		t.Fatalf("unexpected bitmap chunk length: %d", len(a))
+	}
+}
+
+// Ensure the handler can execute a query that returns pairs as JSON.
+func TestHandler_Query_Pairs_JSON(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return pilosa.Pairs{
+			{Key: 1, Count: 2},
+			{Key: 3, Count: 4},
+		}, nil
+	}
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query", strings.NewReader(`top-n(frame=x, n=2)`)))
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"result":[{"key":1,"count":2},{"key":3,"count":4}]}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can execute a query that returns pairs as protobuf.
+func TestHandler_Query_Pairs_Protobuf(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return pilosa.Pairs{
+			{Key: 1, Count: 2},
+			{Key: 3, Count: 4},
+		}, nil
+	}
+
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("POST", "/query", strings.NewReader(`top-n(frame=x, n=2)`))
+	r.Header.Set("Accept", "application/x-protobuf")
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+
+	var resp internal.QueryResponse
+	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatal(err)
+	} else if a := resp.GetPairs(); len(a) != 2 {
+		t.Fatalf("unexpected pair length: %d", len(a))
+	}
+}
+
+// Ensure the handler can return an error as JSON.
+func TestHandler_Query_Err_JSON(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return nil, errors.New("marker")
+	}
+
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query", strings.NewReader(`get(100)`)))
+	if w.Code != http.StatusInternalServerError {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"error":"marker"}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can return an error as protobuf.
+func TestHandler_Query_Err_Protobuf(t *testing.T) {
+	h := NewHandler()
+	h.Executor.ExecuteFn = func(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+		return nil, errors.New("marker")
+	}
+
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("POST", "/query", strings.NewReader(`top-n(frame=x, n=2)`))
+	r.Header.Set("Accept", "application/x-protobuf")
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusInternalServerError {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+
+	var resp internal.QueryResponse
+	if err := proto.Unmarshal(w.Body.Bytes(), &resp); err != nil {
+		t.Fatal(err)
+	} else if s := resp.GetErr(); s != `marker` {
+		t.Fatalf("unexpected error: %s", s)
+	}
+}
+
+// Ensure the handler returns "method not allowed" for non-POST queries.
+func TestHandler_Query_MethodNotAllowed(t *testing.T) {
+	w := httptest.NewRecorder()
+	NewHandler().ServeHTTP(w, MustNewHTTPRequest("GET", "/query", nil))
+	if w.Code != http.StatusMethodNotAllowed {
+		t.Fatalf("invalid status: %d", w.Code)
+	}
+}
+
+// Ensure the handler returns an error if there is a parsing error..
+func TestHandler_Query_ErrParse(t *testing.T) {
+	h := NewHandler()
+	w := httptest.NewRecorder()
+	h.ServeHTTP(w, MustNewHTTPRequest("POST", "/query?db=db0&slices=0,1", strings.NewReader("bad_fn(")))
+	if w.Code != http.StatusBadRequest {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if body := w.Body.String(); body != `{"error":"function not found: bad_fn occurred at line 1, char 1"}`+"\n" {
+		t.Fatalf("unexpected body: %q", body)
+	}
+}
+
+// Ensure the handler can retrieve the version.
+func TestHandler_Version(t *testing.T) {
+	h := NewHandler()
+	h.Version = "1.0.0"
+
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("GET", "/version", nil)
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	} else if w.Body.String() != `{"version":"1.0.0"}`+"\n" {
+		t.Fatalf("unexpected body: %q", w.Body.String())
+	}
+}
+
+// Ensure the handler can return expvars without panicking.
+func TestHandler_Expvars(t *testing.T) {
+	h := NewHandler()
+	w := httptest.NewRecorder()
+	r := MustNewHTTPRequest("GET", "/debug/vars", nil)
+	h.ServeHTTP(w, r)
+	if w.Code != http.StatusOK {
+		t.Fatalf("unexpected status code: %d", w.Code)
+	}
+}
+
+// Handler represents a test wrapper for pilosa.Handler.
+type Handler struct {
+	*pilosa.Handler
+	Executor HandlerExecutor
+}
+
+// NewHandler returns a new instance of Handler.
+func NewHandler() *Handler {
+	h := &Handler{
+		Handler: pilosa.NewHandler(),
+	}
+	h.Handler.Executor = &h.Executor
+	return h
+}
+
+// HandlerExecutor is a mock implementing pilosa.Handler.Executor.
+type HandlerExecutor struct {
+	cluster   *pilosa.Cluster
+	ExecuteFn func(db string, query *pql.Query, slices []uint64) (interface{}, error)
+}
+
+func (c *HandlerExecutor) Cluster() *pilosa.Cluster { return c.cluster }
+
+func (c *HandlerExecutor) Execute(db string, query *pql.Query, slices []uint64) (interface{}, error) {
+	return c.ExecuteFn(db, query, slices)
+}
+
+// Server represents a test wrapper for httptest.Server.
+type Server struct {
+	*httptest.Server
+	Handler *Handler
+}
+
+// NewServer returns a test server running on a random port.
+func NewServer() *Server {
+	s := &Server{
+		Handler: NewHandler(),
+	}
+	s.Server = httptest.NewServer(s.Handler.Handler)
+	return s
+}
+
+// Host returns the hostname of the running server.
+func (s *Server) Host() string {
+	u, err := url.Parse(s.URL)
+	if err != nil {
+		panic(err)
+	}
+	return u.Host
+}
+
+// MustNewHTTPRequest creates a new HTTP request. Panic on error.
+func MustNewHTTPRequest(method, urlStr string, body io.Reader) *http.Request {
+	req, err := http.NewRequest(method, urlStr, body)
+	if err != nil {
+		panic(err)
+	}
+	return req
+}
diff --git a/hold/hold.go b/hold/hold.go
deleted file mode 100644
index d05d81ac9..000000000
--- a/hold/hold.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package hold
-
-import (
-	"errors"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-)
-
-type holdchan chan interface{}
-type gethold struct {
-	id    *pilosa.GUID
-	reply chan holdchan
-}
-type delhold struct {
-	id *pilosa.GUID
-}
-
-type Holder struct {
-	data    map[pilosa.GUID]holdchan
-	getchan chan gethold
-	delchan chan delhold
-}
-
-func NewHolder() *Holder {
-	return &Holder{
-		data:    make(map[pilosa.GUID]holdchan),
-		getchan: make(chan gethold),
-		delchan: make(chan delhold),
-	}
-}
-
-func (self *Holder) DelChan(id *pilosa.GUID) {
-	log.Trace("Holder.DelChan", id)
-	req := delhold{id}
-	self.delchan <- req
-}
-
-func (self *Holder) GetChan(id *pilosa.GUID) holdchan {
-	log.Trace("Holder.GetChan", id)
-	reply := make(chan holdchan)
-	req := gethold{id, reply}
-	self.getchan <- req
-	return <-reply
-}
-
-func (self *Holder) Get(id *pilosa.GUID, timeout time.Duration) (interface{}, error) {
-	log.Trace("Holder.Get", id, timeout.String())
-	ch := self.GetChan(id)
-	select {
-	case val := <-ch:
-		return val, nil
-	case <-time.After(timeout):
-		self.DelChan(id)
-		return nil, errors.New("Timeout getting from holder")
-	}
-}
-
-func (self *Holder) Set(id *pilosa.GUID, value interface{}, timeout time.Duration) {
-	log.Trace("Holder.Set", id, value, timeout.String())
-	ch := self.GetChan(id)
-	go func() {
-		select {
-		case ch <- value:
-		case <-time.After(timeout):
-		}
-		self.DelChan(id)
-	}()
-}
-
-func (self *Holder) Run() {
-	var greq gethold
-	var dreq delhold
-	for {
-		select {
-		case greq = <-self.getchan:
-			item, ok := self.data[*greq.id]
-			if !ok {
-				item = make(holdchan)
-				self.data[*greq.id] = item
-			}
-			greq.reply <- item
-		case dreq = <-self.delchan:
-			delete(self.data, *dreq.id)
-		}
-	}
-}
diff --git a/hold/hold_test.go b/hold/hold_test.go
deleted file mode 100644
index 8ef3a1bd5..000000000
--- a/hold/hold_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package hold_test
-
-import (
-	"testing"
-	"time"
-
-	"github.com/umbel/pilosa/hold"
-	"github.com/umbel/pilosa/util"
-)
-
-// Ensure hold can get a value that has been set.
-func TestHold_Get(t *testing.T) {
-	h := hold.NewHolder()
-	go h.Run()
-
-	id := util.RandomUUID()
-	h.Set(&id, "derp", 10)
-	if v, err := h.Get(&id, 10); err != nil {
-		t.Fatal(err)
-	} else if v != "derp" {
-		t.Fatalf("unexpected value: %v", v)
-	}
-}
-
-// Ensure hold can wait for a value that has not been set yet.
-func TestHold_Get_Delay(t *testing.T) {
-	h := hold.NewHolder()
-	go h.Run()
-
-	id := util.RandomUUID()
-	go func() {
-		time.Sleep(500 * time.Millisecond)
-		h.Set(&id, "derpsy", 10)
-	}()
-
-	if v, err := h.Get(&id, 10); err != nil {
-		t.Fatal(err)
-	} else if v != "derpsy" {
-		t.Fatalf("unexpected value: %v", v)
-	}
-}
diff --git a/index.go b/index.go
new file mode 100644
index 000000000..8ee0906f4
--- /dev/null
+++ b/index.go
@@ -0,0 +1,53 @@
+package pilosa
+
+import (
+	"sync"
+)
+
+// Index represents a container for fragments.
+type Index struct {
+	mu        sync.Mutex
+	sliceN    uint64
+	fragments map[fragmentKey]*Fragment
+}
+
+// NewIndex returns a new instance of Index.
+func NewIndex() *Index {
+	return &Index{
+		fragments: make(map[fragmentKey]*Fragment),
+	}
+}
+
+// SliceN returs the total number of slices managed by the index.
+func (i *Index) SliceN() uint64 {
+	i.mu.Lock()
+	defer i.mu.Unlock()
+	return i.sliceN
+}
+
+// Fragment returns the fragment for a database, frame & slice.
+// The fragment is created if it doesn't already exist.
+func (i *Index) Fragment(db, frame string, slice uint64) *Fragment {
+	i.mu.Lock()
+	defer i.mu.Unlock()
+
+	// Track the highest slice.
+	if slice > i.sliceN {
+		i.sliceN = slice
+	}
+
+	// Create fragment, if not exists.
+	key := fragmentKey{db, frame, slice}
+	if i.fragments[key] == nil {
+		i.fragments[key] = NewFragment(db, frame, slice)
+	}
+
+	return i.fragments[key]
+}
+
+// fragmentKey is the map key for fragment look ups.
+type fragmentKey struct {
+	db    string
+	frame string
+	slice uint64
+}
diff --git a/internal/internal.go b/internal/internal.go
new file mode 100644
index 000000000..574c0ee5c
--- /dev/null
+++ b/internal/internal.go
@@ -0,0 +1,56 @@
+package internal
+
+import (
+	"io"
+	"io/ioutil"
+
+	"github.com/gogo/protobuf/proto"
+)
+
+type Request proto.Message
+
+type Response proto.Message
+
+// Encoder encodes messages to a writer.
+type Encoder struct {
+	w io.Writer
+}
+
+// NewEncoder returns a new instance of Encoder.
+func NewEncoder(w io.Writer) *Encoder {
+	return &Encoder{w: w}
+}
+
+// Encode marshals m into bytes and writes them to r.
+func (enc *Encoder) Encode(pb proto.Message) error {
+	buf, err := proto.Marshal(pb)
+	if err != nil {
+		return err
+	}
+
+	if _, err := enc.w.Write(buf); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Decoder decodes messages from a reader.
+type Decoder struct {
+	r io.Reader
+}
+
+// NewDecoder returns a new instance of Decoder.
+func NewDecoder(r io.Reader) *Decoder {
+	return &Decoder{r: r}
+}
+
+// Decode reads all bytes from the reader and unmarshals them into pb.
+func (dec *Decoder) Decode(pb proto.Message) error {
+	buf, err := ioutil.ReadAll(dec.r)
+	if err != nil {
+		return err
+	}
+
+	return proto.Unmarshal(buf, pb)
+}
diff --git a/internal/internal.pb.go b/internal/internal.pb.go
new file mode 100644
index 000000000..bdb18ac33
--- /dev/null
+++ b/internal/internal.pb.go
@@ -0,0 +1,164 @@
+// 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:
+	Bitmap
+	Chunk
+	Pair
+	QueryRequest
+	QueryResponse
+*/
+package internal
+
+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 Bitmap struct {
+	Chunks           []*Chunk `protobuf:"bytes,1,rep" json:"Chunks,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *Bitmap) Reset()         { *m = Bitmap{} }
+func (m *Bitmap) String() string { return proto.CompactTextString(m) }
+func (*Bitmap) ProtoMessage()    {}
+
+func (m *Bitmap) GetChunks() []*Chunk {
+	if m != nil {
+		return m.Chunks
+	}
+	return nil
+}
+
+type Chunk struct {
+	Key              *uint64  `protobuf:"varint,1,req" json:"Key,omitempty"`
+	Value            []uint64 `protobuf:"varint,2,rep" json:"Value,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *Chunk) Reset()         { *m = Chunk{} }
+func (m *Chunk) String() string { return proto.CompactTextString(m) }
+func (*Chunk) ProtoMessage()    {}
+
+func (m *Chunk) GetKey() uint64 {
+	if m != nil && m.Key != nil {
+		return *m.Key
+	}
+	return 0
+}
+
+func (m *Chunk) GetValue() []uint64 {
+	if m != nil {
+		return m.Value
+	}
+	return nil
+}
+
+type Pair struct {
+	Key              *uint64 `protobuf:"varint,1,req" json:"Key,omitempty"`
+	Count            *uint64 `protobuf:"varint,2,req" json:"Count,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *Pair) Reset()         { *m = Pair{} }
+func (m *Pair) String() string { return proto.CompactTextString(m) }
+func (*Pair) ProtoMessage()    {}
+
+func (m *Pair) GetKey() uint64 {
+	if m != nil && m.Key != nil {
+		return *m.Key
+	}
+	return 0
+}
+
+func (m *Pair) GetCount() uint64 {
+	if m != nil && m.Count != nil {
+		return *m.Count
+	}
+	return 0
+}
+
+type QueryRequest struct {
+	DB               *string  `protobuf:"bytes,1,req" json:"DB,omitempty"`
+	Query            *string  `protobuf:"bytes,2,req" json:"Query,omitempty"`
+	Slices           []uint64 `protobuf:"varint,3,rep" json:"Slices,omitempty"`
+	XXX_unrecognized []byte   `json:"-"`
+}
+
+func (m *QueryRequest) Reset()         { *m = QueryRequest{} }
+func (m *QueryRequest) String() string { return proto.CompactTextString(m) }
+func (*QueryRequest) ProtoMessage()    {}
+
+func (m *QueryRequest) GetDB() string {
+	if m != nil && m.DB != nil {
+		return *m.DB
+	}
+	return ""
+}
+
+func (m *QueryRequest) GetQuery() string {
+	if m != nil && m.Query != nil {
+		return *m.Query
+	}
+	return ""
+}
+
+func (m *QueryRequest) GetSlices() []uint64 {
+	if m != nil {
+		return m.Slices
+	}
+	return nil
+}
+
+type QueryResponse struct {
+	Err              *string `protobuf:"bytes,1,opt" json:"Err,omitempty"`
+	Bitmap           *Bitmap `protobuf:"bytes,2,opt" json:"Bitmap,omitempty"`
+	N                *uint64 `protobuf:"varint,3,opt" json:"N,omitempty"`
+	Pairs            []*Pair `protobuf:"bytes,4,rep" json:"Pairs,omitempty"`
+	XXX_unrecognized []byte  `json:"-"`
+}
+
+func (m *QueryResponse) Reset()         { *m = QueryResponse{} }
+func (m *QueryResponse) String() string { return proto.CompactTextString(m) }
+func (*QueryResponse) ProtoMessage()    {}
+
+func (m *QueryResponse) GetErr() string {
+	if m != nil && m.Err != nil {
+		return *m.Err
+	}
+	return ""
+}
+
+func (m *QueryResponse) GetBitmap() *Bitmap {
+	if m != nil {
+		return m.Bitmap
+	}
+	return nil
+}
+
+func (m *QueryResponse) GetN() uint64 {
+	if m != nil && m.N != nil {
+		return *m.N
+	}
+	return 0
+}
+
+func (m *QueryResponse) GetPairs() []*Pair {
+	if m != nil {
+		return m.Pairs
+	}
+	return nil
+}
+
+func init() {
+}
diff --git a/internal/internal.proto b/internal/internal.proto
new file mode 100644
index 000000000..9630bc798
--- /dev/null
+++ b/internal/internal.proto
@@ -0,0 +1,28 @@
+package internal;
+
+message Bitmap {
+	repeated Chunk Chunks = 1;
+}
+
+message Chunk {
+	required uint64 Key   = 1;
+	repeated uint64 Value = 2;
+}
+
+message Pair {
+	required uint64 Key   = 1;
+	required uint64 Count = 2;
+}
+
+message QueryRequest {
+	required string DB = 1;
+	required string Query = 2;
+	repeated uint64 Slices = 3;
+}
+
+message QueryResponse {
+	optional string Err    = 1;
+	optional Bitmap Bitmap = 2;
+	optional uint64 N      = 3;
+	repeated Pair   Pairs  = 4;
+}
diff --git a/pilosa.go b/pilosa.go
index a480b3946..19c291ffd 100644
--- a/pilosa.go
+++ b/pilosa.go
@@ -1,122 +1,6 @@
 package pilosa
 
-import (
-	"encoding/binary"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"strings"
-	"time"
+//go:generate protoc --gogo_out=. internal/internal.proto
 
-	"github.com/gocql/gocql"
-)
-
-var counter = uint64(0)
-
-func init() {
-	rand.Seed(time.Now().UTC().UnixNano())
-}
-
-// SUUID represents a sequential UUID.
-type SUUID uint64
-
-// SUUID returns a new SUUID.
-func NewSUUID() SUUID {
-	millis := uint64(time.Now().UTC().UnixNano())
-	id := millis << (64 - 41)
-	id |= uint64(rand.Intn(128)) << (64 - 41 - 13)
-	id |= counter % 1024
-	counter += 1
-	return SUUID(id)
-}
-
-// String returns a string representation of id.
-func (id SUUID) String() string {
-	var buf [8]byte
-	binary.BigEndian.PutUint64(buf[:], uint64(id))
-	return hex.EncodeToString(buf[:])
-}
-
-// ParseSUUID parses s into an SUUID.
-func ParseSUUID(s string) SUUID {
-	if n := len(s); n < 16 {
-		s = strings.Repeat("0", 16-n) + s
-	}
-
-	b, _ := hex.DecodeString(s)
-	return SUUID(binary.BigEndian.Uint64(b))
-}
-
-// GUID represents a globally unique identifier.
-type GUID [16]byte
-
-// UnmarshalText parses a text value into a GUID.
-// This is used by the TOML parser.
-func (id *GUID) UnmarshalText(text []byte) error {
-	v, err := ParseGUID(string(text))
-	if err != nil {
-		return err
-	}
-
-	*id = v
-	return nil
-}
-
-func (id GUID) 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 id {
-		r[offsets[i]] = hexString[b>>4]
-		r[offsets[i]+1] = hexString[b&0xF]
-	}
-	r[8] = '-'
-	r[13] = '-'
-	r[18] = '-'
-	r[23] = '-'
-	return string(r)
-
-}
-
-// Equals returns true if id equals other.
-func (id *GUID) Equals(other *GUID) bool {
-	for i, v := range id {
-		if v != other[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// NewGUID returns a random GUID.
-func NewGUID() GUID {
-	uid, _ := gocql.RandomUUID()
-	var id GUID
-	copy(id[:], uid[:])
-	return id
-}
-
-// ParseGUID parses s into a GUID.
-func ParseGUID(s string) (GUID, error) {
-	var u GUID
-	j := 0
-	for _, r := range s {
-		switch {
-		case r == '-' && j&1 == 0:
-			continue
-		case r >= '0' && r <= '9' && j < 32:
-			u[j/2] |= byte(r-'0') << uint(4-j&1*4)
-		case r >= 'a' && r <= 'f' && j < 32:
-			u[j/2] |= byte(r-'a'+10) << uint(4-j&1*4)
-		case r >= 'A' && r <= 'F' && j < 32:
-			u[j/2] |= byte(r-'A'+10) << uint(4-j&1*4)
-		default:
-			return GUID{}, fmt.Errorf("invalid GUID %q", s)
-		}
-		j += 1
-	}
-	if j != 32 {
-		return GUID{}, fmt.Errorf("invalid GUID %q", s)
-	}
-	return u, nil
-}
+// Version represents the current running version of Pilosa.
+var Version string
diff --git a/pilosa_test.go b/pilosa_test.go
deleted file mode 100644
index f1cb30bde..000000000
--- a/pilosa_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package pilosa_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/umbel/pilosa"
-)
-
-// Ensure id can be parsed from string.
-func TestSUUID_Small(t *testing.T) {
-	if v := pilosa.ParseSUUID("1"); v != 1 {
-		t.Fatalf("unexpected SUUID: %v", v)
-	}
-}
-
-// Ensure generated IDs are unique.
-func TestSUUID_Unique(t *testing.T) {
-	a, b := pilosa.NewSUUID(), pilosa.NewSUUID()
-	if a == b {
-		t.Fatalf("ids should be unique: %v != %v", a, b)
-	}
-}
-
-// Ensure ids can be converted to and from hex.
-func TestSUUID_Hex(t *testing.T) {
-	a := pilosa.NewSUUID()
-	b := pilosa.ParseSUUID(a.String())
-	if a != b {
-		t.Fatalf("ids not equal: %v != %v", a, b)
-	}
-}
-
-// Ensure ids can be generated in sequence.
-func TestSUUID_Multiple(t *testing.T) {
-	for i := 0; i < 10; i++ {
-		println(pilosa.NewSUUID().String())
-	}
-}
-
-// Ensure a random GUID can be converted to a string.
-func TestGUID_String(t *testing.T) {
-	fmt.Println(pilosa.NewGUID().String())
-}
-
-func BenchmarkSUUID(b *testing.B) {
-	// run the Fib function b.N times
-	for n := 0; n < b.N; n++ {
-		pilosa.NewSUUID()
-	}
-}
diff --git a/popcnt_generic.go b/popcnt_generic.go
index 72cdbb46a..b9665ac0a 100644
--- a/popcnt_generic.go
+++ b/popcnt_generic.go
@@ -2,22 +2,8 @@
 
 package pilosa
 
-func popcntSlice(s []uint64) uint64 {
-	return popcntSliceGo(s)
-}
-
-func popcntMaskSlice(s, m []uint64) uint64 {
-	return popcntMaskSliceGo(s, m)
-}
-
-func popcntAndSlice(s, m []uint64) uint64 {
-	return popcntAndSliceGo(s, m)
-}
-
-func popcntOrSlice(s, m []uint64) uint64 {
-	return popcntOrSliceGo(s, m)
-}
-
-func popcntXorSlice(s, m []uint64) uint64 {
-	return popcntXorSliceGo(s, m)
-}
+func popcntSlice(s []uint64) uint64        { return popcntSliceGo(s) }
+func popcntMaskSlice(s, m []uint64) uint64 { return popcntMaskSliceGo(s, m) }
+func popcntAndSlice(s, m []uint64) uint64  { return popcntAndSliceGo(s, m) }
+func popcntOrSlice(s, m []uint64) uint64   { return popcntOrSliceGo(s, m) }
+func popcntXorSlice(s, m []uint64) uint64  { return popcntXorSliceGo(s, m) }
diff --git a/pql/ast.go b/pql/ast.go
new file mode 100644
index 000000000..11a53aae8
--- /dev/null
+++ b/pql/ast.go
@@ -0,0 +1,228 @@
+package pql
+
+import (
+	"fmt"
+	"strings"
+	"time"
+)
+
+// Query represents a PQL query.
+type Query struct {
+	Root Call
+}
+
+// String returns a string representation of the query.
+func (q *Query) String() string { return q.Root.String() }
+
+// Node represents any node in the AST.
+type Node interface {
+	node()
+	String() string
+}
+
+func (*Clear) node()      {}
+func (*Count) node()      {}
+func (*Difference) node() {}
+func (*Get) node()        {}
+func (*Intersect) node()  {}
+func (*Range) node()      {}
+func (*Set) node()        {}
+func (*TopN) node()       {}
+func (*Union) node()      {}
+
+// Call represents a function call in the AST.
+type Call interface {
+	Node
+	call()
+}
+
+func (*Clear) call()      {}
+func (*Count) call()      {}
+func (*Difference) call() {}
+func (*Get) call()        {}
+func (*Intersect) call()  {}
+func (*Range) call()      {}
+func (*Set) call()        {}
+func (*TopN) call()       {}
+func (*Union) call()      {}
+
+// Calls represents a list of calls.
+type Calls []Call
+
+// String returns a string representation of the calls as a comma-delimited list.
+func (a Calls) String() string {
+	args := make([]string, len(a))
+	for i, c := range a {
+		args[i] = c.String()
+	}
+	return strings.Join(args, ", ")
+}
+
+// BitmapCall represents a function call that returns a bitmap.
+type BitmapCall interface {
+	Call
+	bitmapCall()
+}
+
+// BitmapCalls represents a list of bitmap calls.
+type BitmapCalls []BitmapCall
+
+// String returns a string representation of the calls as a comma-delimited list.
+func (a BitmapCalls) String() string {
+	args := make([]string, len(a))
+	for i, c := range a {
+		args[i] = c.String()
+	}
+	return strings.Join(args, ", ")
+}
+
+func (*Difference) bitmapCall() {}
+func (*Get) bitmapCall()        {}
+func (*Intersect) bitmapCall()  {}
+func (*Range) bitmapCall()      {}
+func (*Union) bitmapCall()      {}
+
+// Clear represents a clear() function call.
+type Clear struct {
+	ID        uint64
+	Frame     string
+	Filter    uint64
+	ProfileID uint64
+}
+
+// String returns the string representation of the call.
+func (c *Clear) String() string {
+	args := make([]string, 0, 4)
+	if c.ID != 0 {
+		args = append(args, fmt.Sprintf("id=%d", c.ID))
+	}
+	if c.Frame != "" {
+		args = append(args, fmt.Sprintf("frame=%s", c.Frame))
+	}
+	if c.Filter != 0 {
+		args = append(args, fmt.Sprintf("filter=%d", c.Filter))
+	}
+	if c.ProfileID != 0 {
+		args = append(args, fmt.Sprintf("profile_id=%d", c.ProfileID))
+	}
+	return fmt.Sprintf("clear(%s)", strings.Join(args, ", "))
+}
+
+// Count represents a count() function call.
+type Count struct {
+	Input BitmapCall
+}
+
+// String returns the string representation of the call.
+func (c *Count) String() string {
+	return fmt.Sprintf("count(%s)", c.Input.String())
+}
+
+// Difference represents an difference() function call.
+type Difference struct {
+	Inputs BitmapCalls
+}
+
+// String returns the string representation of the call.
+func (c *Difference) String() string {
+	return fmt.Sprintf("difference(%s)", c.Inputs.String())
+}
+
+// Get represents a get() function call.
+type Get struct {
+	ID    uint64
+	Frame string
+}
+
+// String returns the string representation of the call.
+func (c *Get) String() string {
+	args := make([]string, 0, 2)
+	if c.ID != 0 {
+		args = append(args, fmt.Sprintf("id=%d", c.ID))
+	}
+	if c.Frame != "" {
+		args = append(args, fmt.Sprintf("frame=%s", c.Frame))
+	}
+	return fmt.Sprintf("get(%s)", strings.Join(args, ", "))
+}
+
+// Intersect represents an intersect() function call.
+type Intersect struct {
+	Inputs BitmapCalls
+}
+
+// String returns the string representation of the call.
+func (c *Intersect) String() string {
+	return fmt.Sprintf("intersect(%s)", c.Inputs.String())
+}
+
+// Range represents a range() function call.
+type Range struct {
+	ID        uint64
+	Frame     string
+	StartTime time.Time
+	EndTime   time.Time
+}
+
+// String returns the string representation of the call.
+func (c *Range) String() string {
+	args := make([]string, 0, 2)
+	if c.ID != 0 {
+		args = append(args, fmt.Sprintf("id=%d", c.ID))
+	}
+	if c.Frame != "" {
+		args = append(args, fmt.Sprintf("frame=%s", c.Frame))
+	}
+	if !c.StartTime.IsZero() {
+		args = append(args, fmt.Sprintf("start=%s", c.StartTime.Format(TimeFormat)))
+	}
+	if !c.EndTime.IsZero() {
+		args = append(args, fmt.Sprintf("end=%s", c.EndTime.Format(TimeFormat)))
+	}
+	return fmt.Sprintf("range(%s)", strings.Join(args, ", "))
+}
+
+// Set represents a set() function call.
+type Set struct {
+	ID        uint64
+	Frame     string
+	Filter    uint64
+	ProfileID uint64
+}
+
+// String returns the string representation of the call.
+func (c *Set) String() string {
+	args := make([]string, 0, 2)
+	if c.ID != 0 {
+		args = append(args, fmt.Sprintf("id=%d", c.ID))
+	}
+	if c.Frame != "" {
+		args = append(args, fmt.Sprintf("frame=%s", c.Frame))
+	}
+	if c.Filter != 0 {
+		args = append(args, fmt.Sprintf("filter=%d", c.Filter))
+	}
+	if c.ProfileID != 0 {
+		args = append(args, fmt.Sprintf("profile_id=%d", c.ProfileID))
+	}
+	return fmt.Sprintf("set(%s)", strings.Join(args, ", "))
+}
+
+// TopN represents a top-n() function call.
+type TopN struct {
+	Frame string
+	N     int
+}
+
+// String returns the string representation of the call.
+func (c *TopN) String() string { panic("FIXME") }
+
+// Union represents a union() function call.
+type Union struct {
+	Inputs BitmapCalls
+}
+
+// String returns the string representation of the call.
+func (c *Union) String() string {
+	return fmt.Sprintf("union(%s)", c.Inputs.String())
+}
diff --git a/pql/ast_test.go b/pql/ast_test.go
new file mode 100644
index 000000000..a390f5263
--- /dev/null
+++ b/pql/ast_test.go
@@ -0,0 +1,89 @@
+package pql_test
+
+import (
+	"testing"
+	"time"
+
+	"github.com/umbel/pilosa/pql"
+)
+
+// Ensure the Clear call can be converted into a string.
+func TestClear_String(t *testing.T) {
+	s := (&pql.Clear{ID: 1, Frame: "x.n", Filter: 2, ProfileID: 3}).String()
+	if s != `clear(id=1, frame=x.n, filter=2, profile_id=3)` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Count call can be converted into a string.
+func TestCount_String(t *testing.T) {
+	s := (&pql.Count{Input: &pql.Get{ID: 1, Frame: "x.n"}}).String()
+	if s != `count(get(id=1, frame=x.n))` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Difference call can be converted into a string.
+func TestDifference_String(t *testing.T) {
+	s := (&pql.Difference{Inputs: pql.BitmapCalls{
+		&pql.Get{ID: 1, Frame: "x.n"},
+		&pql.Get{ID: 2},
+	},
+	}).String()
+	if s != `difference(get(id=1, frame=x.n), get(id=2))` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Get call can be converted into a string.
+func TestGet_String(t *testing.T) {
+	s := (&pql.Get{ID: 1, Frame: "x.n"}).String()
+	if s != `get(id=1, frame=x.n)` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Intersect call can be converted into a string.
+func TestIntersect_String(t *testing.T) {
+	s := (&pql.Intersect{Inputs: pql.BitmapCalls{
+		&pql.Get{ID: 1, Frame: "x.n"},
+		&pql.Get{ID: 2},
+	},
+	}).String()
+	if s != `intersect(get(id=1, frame=x.n), get(id=2))` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Range call can be converted into a string.
+func TestRange_String(t *testing.T) {
+	s := (&pql.Range{
+		ID:        1,
+		Frame:     "x.n",
+		StartTime: time.Unix(0, 0).UTC(),
+		EndTime:   time.Date(2000, 1, 2, 3, 4, 0, 0, time.UTC),
+	}).String()
+	if s != `range(id=1, frame=x.n, start=1970-01-01T00:00, end=2000-01-02T03:04)` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Set call can be converted into a string.
+func TestSet_String(t *testing.T) {
+	s := (&pql.Set{ID: 1, Frame: "x.n", Filter: 2, ProfileID: 3}).String()
+	if s != `set(id=1, frame=x.n, filter=2, profile_id=3)` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
+
+// Ensure the Union call can be converted into a string.
+func TestUnion_String(t *testing.T) {
+	s := (&pql.Union{Inputs: pql.BitmapCalls{
+		&pql.Get{ID: 1, Frame: "x.n"},
+		&pql.Get{ID: 2},
+	},
+	}).String()
+	if s != `union(get(id=1, frame=x.n), get(id=2))` {
+		t.Fatalf("unexpected string: %s", s)
+	}
+}
diff --git a/pql/parser.go b/pql/parser.go
new file mode 100644
index 000000000..1fb41a5c3
--- /dev/null
+++ b/pql/parser.go
@@ -0,0 +1,569 @@
+package pql
+
+import (
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// TimeFormat is the go-style time format used to parse string dates.
+const TimeFormat = "2006-01-02T15:04"
+
+// Parser represents a parser for the PQL language.
+type Parser struct {
+	scanner *bufScanner
+}
+
+// NewParser returns a new instance of Parser.
+func NewParser(r io.Reader) *Parser {
+	return &Parser{
+		scanner: newBufScanner(r),
+	}
+}
+
+// ParseString parses s into a query.
+func ParseString(s string) (*Query, error) {
+	return NewParser(strings.NewReader(s)).Parse()
+}
+
+// Parse parses the next node in the query.
+func (p *Parser) Parse() (*Query, error) {
+	fn, err := p.parseCall()
+	if err != nil {
+		return nil, err
+	}
+	return &Query{Root: fn}, nil
+}
+
+// parseCall parses the next function call.
+func (p *Parser) parseCall() (Call, error) {
+	tok, pos, lit := p.scanIgnoreWhitespace()
+	if tok != IDENT {
+		return nil, &ParseError{Message: fmt.Sprintf("expected identifier, found: %s", lit), Pos: pos}
+	}
+
+	switch lit {
+	case "count":
+		return p.parseCountCall()
+	case "clear":
+		return p.parseClearCall()
+	case "difference":
+		return p.parseDifferenceCall()
+	case "get":
+		return p.parseGetCall()
+	case "intersect":
+		return p.parseIntersectCall()
+	case "range":
+		return p.parseRangeCall()
+	case "set":
+		return p.parseSetCall()
+	case "top-n":
+		return p.parseTopNCall()
+	case "union":
+		return p.parseUnionCall()
+	default:
+		return nil, &ParseError{Message: fmt.Sprintf("function not found: %s", lit), Pos: pos}
+	}
+}
+
+// parseClearCall parses a clear() function call.
+func (p *Parser) parseClearCall() (*Clear, error) {
+	c := &Clear{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		switch arg.key {
+		case 0, "id":
+			if err := decodeUint64(arg.value, &c.ID); err != nil {
+				return nil, parseErrorf(pos, "id: %s", err)
+			}
+		case 1, "frame":
+			if err := decodeString(arg.value, &c.Frame); err != nil {
+				return nil, parseErrorf(pos, "frame: %s", err)
+			}
+		case 2, "filter":
+			if err := decodeUint64(arg.value, &c.Filter); err != nil {
+				return nil, parseErrorf(pos, "filter: %s", err)
+			}
+		case 3, "profile_id":
+			if err := decodeUint64(arg.value, &c.ProfileID); err != nil {
+				return nil, parseErrorf(pos, "profile_id: %s", err)
+			}
+		default:
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.key)
+		}
+	}
+
+	return c, nil
+}
+
+// parseCount parses a count() function call.
+func (p *Parser) parseCountCall() (*Count, error) {
+	c := &Count{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	} else if len(args) != 1 {
+		return nil, parseErrorf(pos, "count requires one argument")
+	}
+
+	// Copy argument to AST.
+	input, ok := args[0].value.(BitmapCall)
+	if !ok {
+		return nil, parseErrorf(pos, "invalid count arg: %s", args[0].value)
+	}
+	c.Input = input
+
+	return c, nil
+}
+
+// parseDifference parses a difference() function call.
+func (p *Parser) parseDifferenceCall() (*Difference, error) {
+	c := &Difference{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		if v, ok := arg.value.(BitmapCall); ok {
+			c.Inputs = append(c.Inputs, v)
+		} else {
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.value)
+		}
+	}
+
+	return c, nil
+}
+
+// parseGetCall parses a get() function call.
+func (p *Parser) parseGetCall() (*Get, error) {
+	c := &Get{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		switch arg.key {
+		case 0, "id":
+			if err := decodeUint64(arg.value, &c.ID); err != nil {
+				return nil, parseErrorf(pos, "id: %s", err)
+			}
+		case 1, "frame":
+			if err := decodeString(arg.value, &c.Frame); err != nil {
+				return nil, parseErrorf(pos, "frame: %s", err)
+			}
+		default:
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.key)
+		}
+	}
+
+	return c, nil
+}
+
+// parseIntersect parses a intersect() function call.
+func (p *Parser) parseIntersectCall() (*Intersect, error) {
+	c := &Intersect{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		if v, ok := arg.value.(BitmapCall); ok {
+			c.Inputs = append(c.Inputs, v)
+		} else {
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.value)
+		}
+	}
+
+	return c, nil
+}
+
+// parseRangeCall parses a range() function call.
+func (p *Parser) parseRangeCall() (*Range, error) {
+	c := &Range{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		switch arg.key {
+		case 0, "id":
+			if err := decodeUint64(arg.value, &c.ID); err != nil {
+				return nil, parseErrorf(pos, "start: %s", err)
+			}
+		case 1, "frame":
+			if err := decodeString(arg.value, &c.Frame); err != nil {
+				return nil, parseErrorf(pos, "frame: %s", err)
+			}
+		case 2, "start":
+			if err := decodeDate(arg.value, &c.StartTime); err != nil {
+				return nil, parseErrorf(pos, "start: %s", err)
+			}
+		case 3, "end":
+			if err := decodeDate(arg.value, &c.EndTime); err != nil {
+				return nil, parseErrorf(pos, "end: %s", err)
+			}
+		default:
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.key)
+		}
+	}
+
+	return c, nil
+}
+
+// parseSetCall parses a set() function call.
+func (p *Parser) parseSetCall() (*Set, error) {
+	c := &Set{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		switch arg.key {
+		case 0, "id":
+			if err := decodeUint64(arg.value, &c.ID); err != nil {
+				return nil, parseErrorf(pos, "id: %s", err)
+			}
+		case 1, "frame":
+			if err := decodeString(arg.value, &c.Frame); err != nil {
+				return nil, parseErrorf(pos, "frame: %s", err)
+			}
+		case 2, "filter":
+			if err := decodeUint64(arg.value, &c.Filter); err != nil {
+				return nil, parseErrorf(pos, "filter: %s", err)
+			}
+		case 3, "profile_id":
+			if err := decodeUint64(arg.value, &c.ProfileID); err != nil {
+				return nil, parseErrorf(pos, "profile_id: %s", err)
+			}
+		default:
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.key)
+		}
+	}
+
+	return c, nil
+}
+
+// parseTopNCall parses a top-n() function call.
+func (p *Parser) parseTopNCall() (*TopN, error) {
+	c := &TopN{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		switch arg.key {
+		case 0, "frame":
+			if err := decodeString(arg.value, &c.Frame); err != nil {
+				return nil, parseErrorf(pos, "frame: %s", err)
+			}
+		case 1, "n":
+			if err := decodeInt(arg.value, &c.N); err != nil {
+				return nil, parseErrorf(pos, "n: %s", err)
+			}
+		default:
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.key)
+		}
+	}
+
+	return c, nil
+}
+
+// parseUnion parses a union() function call.
+func (p *Parser) parseUnionCall() (*Union, error) {
+	c := &Union{}
+	pos := p.pos()
+
+	// Scan opening parenthesis.
+	if err := p.expect(LPAREN); err != nil {
+		return nil, err
+	}
+
+	// Parse arguments.
+	args, err := p.parseArgs()
+	if err != nil {
+		return nil, err
+	}
+
+	// Copy arguments to AST.
+	for _, arg := range args {
+		if v, ok := arg.value.(BitmapCall); ok {
+			c.Inputs = append(c.Inputs, v)
+		} else {
+			return nil, parseErrorf(pos, "invalid arg: %v", arg.value)
+		}
+	}
+
+	return c, nil
+}
+
+// parseArgs arguments to a function call.
+func (p *Parser) parseArgs() ([]arg, error) {
+	var i int
+	var args []arg
+	for {
+		// Parse next argument.
+		arg, err := p.parseArg()
+		if err != nil {
+			return nil, err
+		}
+
+		// If it's a primitive type without a key then index it.
+		if arg.key == nil {
+			switch arg.value.(type) {
+			case uint64, string:
+				arg.key = i
+				i++
+			}
+		}
+
+		// Append argument to list.
+		args = append(args, arg)
+
+		// If next token is a closing parenthesis, then exit.
+		// Otherwise expect a comma.
+		if tok, pos, lit := p.scanIgnoreWhitespace(); tok == RPAREN {
+			break
+		} else if tok != COMMA {
+			return nil, parseErrorf(pos, "expected COMMA, found %q", lit)
+		}
+	}
+
+	return args, nil
+}
+
+// parseArg parses a single argument to a function call.
+func (p *Parser) parseArg() (arg, error) {
+	var key, value interface{}
+
+	// Read identifier and check if there's a following "=" or "(".
+	tok, pos, lit := p.scanIgnoreWhitespace()
+	switch tok {
+	case IDENT:
+		// If a left paren immediately follows then it's a function call.
+		if tok, _, _ := p.scan(); tok == LPAREN {
+			p.unscan(2)
+			c, err := p.parseCall()
+			if err != nil {
+				return arg{}, err
+			}
+			return arg{value: c}, nil
+		}
+
+		// If it's not a left paren, rescan ignoring whitespace and look for "=",
+		p.unscan(1)
+		if tok, _, _ := p.scanIgnoreWhitespace(); tok == EQ {
+			key = lit // keyed arg
+		} else {
+			p.unscan(1)
+		}
+	default:
+		p.unscan(1)
+	}
+
+	// Read value token.
+	tok, pos, lit = p.scanIgnoreWhitespace()
+	switch tok {
+	case IDENT, STRING:
+		value = lit
+	case NUMBER:
+		v, err := strconv.ParseUint(lit, 10, 64)
+		if err != nil {
+			return arg{}, err
+		}
+		value = v
+	case LBRACK:
+		panic("FIXME: parse list of integers")
+	default:
+		return arg{}, parseErrorf(pos, "invalid value: %q", lit)
+	}
+
+	return arg{key: key, value: value}, nil
+}
+
+// scan returns the next token from the scanner.
+func (p *Parser) scan() (tok Token, pos Pos, lit string) { return p.scanner.Scan() }
+
+// scanIgnoreWhitespace returns the next non-whitespace token from the scanner.
+func (p *Parser) scanIgnoreWhitespace() (tok Token, pos Pos, lit string) {
+	tok, pos, lit = p.scan()
+	if tok == WS {
+		tok, pos, lit = p.scan()
+	}
+	return
+}
+
+// unscan returns the last n tokens back to the scanner.
+func (p *Parser) unscan(n int) {
+	for i := 0; i < n; i++ {
+		p.scanner.unscan()
+	}
+}
+
+// expect returns an error if the next token is not exp.
+func (p *Parser) expect(exp Token) error {
+	if tok, pos, lit := p.scan(); tok != exp {
+		return parseErrorf(pos, "expected %s, found %q", exp.String(), lit)
+	}
+	return nil
+}
+
+// expectIgnoreWhitespace returns an error if the next non-whitespace token is not exp.
+func (p *Parser) expectIgnoreWhitespace(exp Token) error {
+	if tok, pos, lit := p.scanIgnoreWhitespace(); tok != exp {
+		return parseErrorf(pos, "expected %s, found %q", exp.String(), lit)
+	}
+	return nil
+}
+
+// pos returns the current position.
+func (p *Parser) pos() Pos { return p.scanner.pos() }
+
+// arg represents an call argument.
+// The key can be the index or the string key.
+// The value can be a uint64, []uint64, string, Call, or Calls.
+type arg struct {
+	key   interface{}
+	value interface{}
+}
+
+// ParseError represents an error that occurred while parsing a PQL query.
+type ParseError struct {
+	Message string
+	Pos     Pos
+}
+
+// Error returns a string representation of e.
+func (e *ParseError) Error() string {
+	return fmt.Sprintf("%s occurred at line %d, char %d", e.Message, e.Pos.Line+1, e.Pos.Char+1)
+}
+
+// parseErrorf returns a formatted parse error.
+func parseErrorf(pos Pos, format string, args ...interface{}) *ParseError {
+	return &ParseError{
+		Message: fmt.Sprintf(format, args...),
+		Pos:     pos,
+	}
+}
+
+// decodeInt type converts v to target.
+func decodeInt(v interface{}, target *int) error {
+	if v, ok := v.(uint64); ok {
+		*target = int(v)
+		return nil
+	}
+	return fmt.Errorf("invalid int value: %v", v)
+}
+
+// decodeUint64 type converts v to target.
+func decodeUint64(v interface{}, target *uint64) error {
+	if v, ok := v.(uint64); ok {
+		*target = v
+		return nil
+	}
+	return fmt.Errorf("invalid int value: %v", v)
+}
+
+// decodeString type converts v to target.
+func decodeString(v interface{}, target *string) error {
+	if v, ok := v.(string); ok {
+		*target = v
+		return nil
+	}
+	return fmt.Errorf("invalid string value: %v", v)
+}
+
+// decodeDate type converts v to target.
+func decodeDate(v interface{}, target *time.Time) error {
+	if v, ok := v.(string); ok {
+		t, err := time.Parse(TimeFormat, v)
+		if err != nil {
+			return fmt.Errorf("invalid date format: %s", v)
+		}
+		*target = t
+		return nil
+	}
+	return fmt.Errorf("invalid date value: %v", v)
+}
diff --git a/pql/parser_test.go b/pql/parser_test.go
new file mode 100644
index 000000000..9e7333dfb
--- /dev/null
+++ b/pql/parser_test.go
@@ -0,0 +1,239 @@
+package pql_test
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/davecgh/go-spew/spew"
+	"github.com/umbel/pilosa/pql"
+)
+
+// Ensure the parser can parse a "clear()" function with keyed args.
+func TestParser_Parse_Clear_Key(t *testing.T) {
+	q, err := pql.ParseString(`clear(id=1, frame="b.n", filter=2, profile_id = 3)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Clear{
+			ID:        1,
+			Frame:     "b.n",
+			Filter:    2,
+			ProfileID: 3,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "clear()" function with array args.
+func TestParser_Parse_Clear_Array(t *testing.T) {
+	q, err := pql.ParseString(`clear(1, "b.n", 2, 3)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Clear{
+			ID:        1,
+			Frame:     "b.n",
+			Filter:    2,
+			ProfileID: 3,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "count()" function.
+func TestParser_Parse_Count(t *testing.T) {
+	q, err := pql.ParseString(`count(get(1))`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Count{
+			Input: &pql.Get{
+				ID: 1,
+			},
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "difference()" function.
+func TestParser_Parse_Difference(t *testing.T) {
+	q, err := pql.ParseString(`difference(get(1), get(2))`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Difference{
+			Inputs: pql.BitmapCalls{
+				&pql.Get{ID: 1},
+				&pql.Get{ID: 2},
+			},
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "get()" function with keyed args.
+func TestParser_Parse_Get_Key(t *testing.T) {
+	q, err := pql.ParseString(`get(id=1, frame="b.n")`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Get{
+			ID:    1,
+			Frame: "b.n",
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "get()" function with array args.
+func TestParser_Parse_Get_Array(t *testing.T) {
+	q, err := pql.ParseString(`get(1, "b.n")`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Get{
+			ID:    1,
+			Frame: "b.n",
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "intersect()" function.
+func TestParser_Parse_Intersect(t *testing.T) {
+	q, err := pql.ParseString(`intersect(get(1), get(2))`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Intersect{
+			Inputs: pql.BitmapCalls{
+				&pql.Get{ID: 1},
+				&pql.Get{ID: 2},
+			},
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "range()" function with keyed args.
+func TestParser_Parse_Range_Key(t *testing.T) {
+	q, err := pql.ParseString(`range(start="2000-01-02T03:04", id=20, frame="b.n", end="2001-01-02T03:04")`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Range{
+			ID:        20,
+			Frame:     "b.n",
+			StartTime: time.Date(2000, 1, 2, 3, 4, 0, 0, time.UTC),
+			EndTime:   time.Date(2001, 1, 2, 3, 4, 0, 0, time.UTC),
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "range()" function with array args.
+func TestParser_Parse_Range_Array(t *testing.T) {
+	q, err := pql.ParseString(`range(20, "b.n", "2000-01-02T03:04", "2001-01-02T03:04")`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Range{
+			ID:        20,
+			Frame:     "b.n",
+			StartTime: time.Date(2000, 1, 2, 3, 4, 0, 0, time.UTC),
+			EndTime:   time.Date(2001, 1, 2, 3, 4, 0, 0, time.UTC),
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "set()" function with keyed args.
+func TestParser_Parse_Set_Key(t *testing.T) {
+	q, err := pql.ParseString(`set(id=1, frame="b.n", filter=2, profile_id = 3)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Set{
+			ID:        1,
+			Frame:     "b.n",
+			Filter:    2,
+			ProfileID: 3,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "set()" function with array args.
+func TestParser_Parse_Set_Array(t *testing.T) {
+	q, err := pql.ParseString(`set(1, "b.n", 2, 3)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Set{
+			ID:        1,
+			Frame:     "b.n",
+			Filter:    2,
+			ProfileID: 3,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "top-n()" function with keyed args.
+func TestParser_Parse_TopN_Key(t *testing.T) {
+	q, err := pql.ParseString(`top-n(frame="b.n", n=2)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.TopN{
+			Frame: "b.n",
+			N:     2,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "top-n()" function with array args.
+func TestParser_Parse_TopN_Array(t *testing.T) {
+	q, err := pql.ParseString(`top-n("b.n", 2)`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.TopN{
+			Frame: "b.n",
+			N:     2,
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
+
+// Ensure the parser can parse a "union()" function.
+func TestParser_Parse_Union(t *testing.T) {
+	q, err := pql.ParseString(`union(get(1), get(2))`)
+	if err != nil {
+		t.Fatal(err)
+	} else if !reflect.DeepEqual(q, &pql.Query{
+		Root: &pql.Union{
+			Inputs: pql.BitmapCalls{
+				&pql.Get{ID: 1},
+				&pql.Get{ID: 2},
+			},
+		},
+	}) {
+		t.Fatalf("unexpected query: %s", spew.Sdump(q))
+	}
+}
diff --git a/pql/scanner.go b/pql/scanner.go
new file mode 100644
index 000000000..3df4cc3f2
--- /dev/null
+++ b/pql/scanner.go
@@ -0,0 +1,258 @@
+package pql
+
+import (
+	"bufio"
+	"bytes"
+	"io"
+	"unicode"
+)
+
+// Scanner represents a PQL lexical scanner.
+type Scanner struct {
+	r   io.RuneScanner
+	pos Pos
+}
+
+// NewScanner returns a new instance of Scanner.
+func NewScanner(r io.Reader) *Scanner {
+	return &Scanner{r: bufio.NewReader(r)}
+}
+
+// Scan returns the next token and position from the underlying reader.
+func (s *Scanner) Scan() (tok Token, pos Pos, lit string) {
+	pos = s.pos
+
+	// Read next code point.
+	ch := s.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 we see quotes, then scan as string.
+	if isWhitespace(ch) {
+		s.unread()
+		return s.scanWhitespace()
+	} else if isIdentFirstChar(ch) {
+		s.unread()
+		return s.scanIdent()
+	} else if isDigit(ch) {
+		s.unread()
+		return s.scanNumber()
+	} else if ch == '"' || ch == '\'' {
+		s.unread()
+		return s.scanString()
+	}
+
+	// Otherwise parse individual characters.
+	switch ch {
+	case eof:
+		tok = EOF
+		return
+	case '=':
+		tok = EQ
+	case ',':
+		tok = COMMA
+	case '(':
+		tok = LPAREN
+	case ')':
+		tok = RPAREN
+	case '[':
+		tok = LBRACK
+	case ']':
+		tok = RBRACK
+	default:
+		tok = ILLEGAL
+	}
+
+	lit = string(ch)
+	return
+}
+
+// read returns the next code point from the underlying reader and updates the pos.
+func (s *Scanner) read() rune {
+	// Read next rune from underlying reader.
+	ch, _, err := s.r.ReadRune()
+	if err != nil {
+		return eof
+	}
+
+	// Update position information.
+	if ch == '\n' {
+		s.pos.Line++
+		s.pos.Char = 0
+	} else {
+		s.pos.Char++
+	}
+
+	return ch
+}
+
+// unread pushes the previously read rune back onto the reader.
+func (s *Scanner) unread() {
+	if s.pos.Char == 0 {
+		s.pos.Line--
+	} else {
+		s.pos.Char--
+	}
+
+	s.r.UnreadRune()
+}
+
+// scanWhitespace consumes the current rune and all contiguous whitespace.
+func (s *Scanner) scanWhitespace() (tok Token, pos Pos, lit string) {
+	pos = s.pos
+
+	var buf bytes.Buffer
+	for {
+		ch := s.read()
+		if ch == eof {
+			break
+		} else if !isWhitespace(ch) {
+			s.unread()
+			break
+		}
+		buf.WriteRune(ch)
+	}
+
+	return WS, pos, buf.String()
+}
+
+func (s *Scanner) scanIdent() (tok Token, pos Pos, lit string) {
+	pos = s.pos
+
+	var buf bytes.Buffer
+	for {
+		ch := s.read()
+		if ch == eof {
+			break
+		} else if !isIdentChar(ch) {
+			s.unread()
+			break
+		}
+		buf.WriteRune(ch)
+	}
+	lit = buf.String()
+
+	// If the literal matches a keyword then return that keyword.
+	if tok = Lookup(lit); tok != IDENT {
+		return tok, pos, lit
+	}
+
+	return IDENT, pos, lit
+}
+
+// scanNumber consumes consecutive integer digits.
+func (s *Scanner) scanNumber() (tok Token, pos Pos, lit string) {
+	pos = s.pos
+
+	var buf bytes.Buffer
+	for {
+		ch := s.read()
+		if !isDigit(ch) {
+			s.unread()
+			break
+		}
+		buf.WriteRune(ch)
+	}
+	return NUMBER, pos, buf.String()
+}
+
+// scanString consumes a single-quoted or double-quoted string.
+func (s *Scanner) scanString() (tok Token, pos Pos, lit string) {
+	pos = s.pos
+
+	// This must be either a single- or double-quote.
+	ending := s.read()
+
+	var buf bytes.Buffer
+	for {
+		ch := s.read()
+		if ch == ending {
+			break
+		} else if ch == '\n' || ch == eof {
+			return BADSTRING, pos, buf.String()
+		} else if ch == '\\' {
+			next := s.read()
+			if next == 'n' {
+				buf.WriteRune('\n')
+			} else if next == '\\' {
+				buf.WriteRune('\\')
+			} else if next == '"' {
+				buf.WriteRune('"')
+			} else if next == '\'' {
+				buf.WriteRune('\'')
+			} else {
+				return BADSTRING, pos, buf.String()
+			}
+		} else {
+			buf.WriteRune(ch)
+		}
+	}
+
+	return STRING, pos, buf.String()
+}
+
+// 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) {
+	// 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 = s.s.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
+}
+
+// pos returns the current position.
+func (s *bufScanner) pos() Pos {
+	_, pos, _ := s.curr()
+	return pos
+}
+
+// isWhitespace returns true if the rune a Unicode space character.
+func isWhitespace(ch rune) bool { return unicode.IsSpace(ch) }
+
+// 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 == '_' || ch == '-' }
+
+// isIdentFirstChar returns true if the rune can be used as the first char in an identifier.
+func isIdentFirstChar(ch rune) bool { return isLetter(ch) }
+
+const eof = rune(0)
diff --git a/pql/scanner_test.go b/pql/scanner_test.go
new file mode 100644
index 000000000..7432598d5
--- /dev/null
+++ b/pql/scanner_test.go
@@ -0,0 +1,49 @@
+package pql_test
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/umbel/pilosa/pql"
+)
+
+func TestScanner_Scan(t *testing.T) {
+	var tests = []struct {
+		s   string
+		tok pql.Token
+		lit string
+		pos pql.Pos
+	}{
+		// Special tokens (EOF, ILLEGAL, WS)
+		{s: ``, tok: pql.EOF},
+		{s: `#`, tok: pql.ILLEGAL, lit: `#`},
+		{s: ` `, tok: pql.WS, lit: " "},
+		{s: "\t", tok: pql.WS, lit: "\t"},
+		{s: "\n", tok: pql.WS, lit: "\n"},
+
+		{s: `=`, tok: pql.EQ, lit: `=`},
+		{s: `,`, tok: pql.COMMA, lit: `,`},
+		{s: `(`, tok: pql.LPAREN, lit: `(`},
+		{s: `)`, tok: pql.RPAREN, lit: `)`},
+		{s: `[`, tok: pql.LBRACK, lit: `[`},
+		{s: `]`, tok: pql.RBRACK, lit: `]`},
+
+		{s: `foo`, tok: pql.IDENT, lit: `foo`},
+		{s: `100`, tok: pql.NUMBER, lit: `100`},
+
+		{s: `all`, tok: pql.ALL, lit: `all`},
+		{s: `ALL`, tok: pql.ALL, lit: `ALL`}, // case insensitive
+	}
+
+	for i, tt := range tests {
+		s := pql.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)
+		}
+	}
+}
diff --git a/pql/token.go b/pql/token.go
new file mode 100644
index 000000000..f794a684a
--- /dev/null
+++ b/pql/token.go
@@ -0,0 +1,81 @@
+package pql
+
+import "strings"
+
+// Token is a lexical token of the PQL language.
+type Token int
+
+const (
+	// Special tokens
+	ILLEGAL Token = iota
+	EOF
+	WS
+
+	literal_beg
+	IDENT     // main
+	STRING    // "foo"
+	BADSTRING // bad escape or unclosed string
+	NUMBER    // 12345
+	literal_end
+
+	keyword_beg
+	ALL
+	keyword_end
+
+	EQ     // =
+	COMMA  // ,
+	LPAREN // (
+	RPAREN // )
+	LBRACK // (
+	RBRACK // )
+)
+
+var tokens = [...]string{
+	ILLEGAL: "ILLEGAL",
+	EOF:     "EOF",
+	WS:      "WS",
+
+	IDENT:  "IDENT",
+	NUMBER: "NUMBER",
+
+	ALL: "ALL",
+
+	EQ:     "=",
+	COMMA:  ",",
+	LPAREN: "(",
+	RPAREN: ")",
+	LBRACK: "(",
+	RBRACK: ")",
+}
+
+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
+	}
+}
+
+// String returns the string representation of the token.
+func (tok Token) String() string {
+	if tok >= 0 && tok < Token(len(tokens)) {
+		return tokens[tok]
+	}
+	return ""
+}
+
+// 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/query/lexer.go b/query/lexer.go
deleted file mode 100644
index 1c7ce0ea4..000000000
--- a/query/lexer.go
+++ /dev/null
@@ -1,348 +0,0 @@
-package query
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	log "github.com/cihub/seelog"
-)
-
-const (
-	TYPE_FUNC    = iota
-	TYPE_LP      = iota
-	TYPE_RP      = iota
-	TYPE_LB      = iota
-	TYPE_RB      = iota
-	TYPE_VALUE   = iota
-	TYPE_KEYWORD = iota
-	TYPE_EQUALS  = iota
-	TYPE_COMMA   = iota
-	TYPE_ERROR   = iota
-
-	// Below types deprecated
-	TYPE_ID      = iota
-	TYPE_FRAME   = iota
-	TYPE_PROFILE = iota
-	TYPE_LIMIT   = iota
-)
-
-type Token struct {
-	Text string
-	Type int
-}
-
-type statefn func(lexer *Lexer) statefn
-
-type Lexer struct {
-	text  string     // the string being scanned.
-	pos   int        // current position in the input.
-	width int        // width of last rune read from input.
-	start int        // start position of this item.
-	state int        // current state of lexer NEEDED???
-	ch    chan Token // channel of scanned items (Tokens).
-}
-
-func (lexer *Lexer) emit(typ int) {
-	log.Trace("Lexer.emit", typ)
-	if lexer.start < lexer.pos {
-		lexer.ch <- Token{lexer.text[lexer.start:lexer.pos], typ}
-	}
-	lexer.start = lexer.pos
-}
-
-func (lexer *Lexer) acceptUntil(chars string, consume bool) (rune, error) {
-	log.Trace("Lexer.acceptUntil", chars, consume)
-	start_pos := lexer.pos
-
-	for {
-		next := lexer.next()
-
-		if next == rune(' ') {
-			lexer.ignore()
-		}
-
-		if next == 0 {
-			lexer.pos = start_pos
-			return 0, errors.New("Not found")
-		}
-		ch := strings.IndexRune(chars, next)
-		if ch >= 0 {
-			if consume {
-				lexer.backup()
-			} else {
-				lexer.pos = start_pos
-			}
-			return []rune(chars)[ch], nil
-		}
-	}
-}
-
-func (lexer *Lexer) acceptRun(valid string) {
-	log.Trace("Lexer.acceptRun", valid)
-	for strings.IndexRune(valid, lexer.next()) >= 0 {
-	}
-	lexer.backup()
-}
-
-// next returns the next rune in the input.
-func (lexer *Lexer) next() (runey rune) {
-	log.Trace("Lexer.next", runey)
-	if lexer.pos >= len(lexer.text) {
-		lexer.width = 0
-		return 0
-	}
-	runey, lexer.width = utf8.DecodeRuneInString(lexer.text[lexer.pos:])
-	lexer.pos += lexer.width
-	return runey
-}
-
-// ignore skips over the pending input before this point.
-func (lexer *Lexer) ignore() {
-	log.Trace("Lexer.ignore")
-	lexer.start = lexer.pos
-}
-
-// backup steps back one rune.
-// Can be called only once per call of next.
-func (lexer *Lexer) backup() {
-	log.Trace("Lexer.backup")
-	lexer.pos -= lexer.width
-}
-
-// peek returns but does not consume
-// the next rune in the input.
-func (lexer *Lexer) peek() rune {
-	log.Trace("Lexer.peek")
-	for {
-		next_rune := lexer.next()
-		// ignore spaces
-		if next_rune != rune(' ') {
-			lexer.backup()
-			return next_rune
-		}
-		lexer.ignore()
-	}
-}
-
-func stateError(err error) func(lexer *Lexer) statefn {
-	log.Trace("stateError", err)
-	return func(lexer *Lexer) statefn {
-		lexer.ch <- Token{err.Error(), TYPE_ERROR}
-		close(lexer.ch)
-		return nil
-	}
-}
-
-func stateFunc(lexer *Lexer) statefn {
-	log.Trace("stateFunc", lexer)
-	_, err := lexer.acceptUntil("(", true)
-	if err != nil {
-		return stateError(err)
-	}
-	lexer.emit(TYPE_FUNC)
-	return stateLP
-}
-
-func stateLP(lexer *Lexer) statefn {
-	log.Trace("stateLP", lexer)
-	lexer.pos += 1
-	lexer.emit(TYPE_LP)
-	// handle multiple LPs
-	if lexer.peek() == rune('(') {
-		return stateLP
-	}
-	return stateArgs
-}
-
-func stateLB(lexer *Lexer) statefn {
-	log.Trace("stateLB", lexer)
-	lexer.acceptUntil("[", true)
-	lexer.next()
-	lexer.emit(TYPE_LB)
-
-	peeked := lexer.peek()
-	if peeked == rune(']') {
-		lexer.next()
-		lexer.emit(TYPE_RB)
-		return stateArgs
-	} else if unicode.IsDigit(peeked) {
-		for {
-			r, err := lexer.acceptUntil(",]", true)
-			if err != nil {
-				return stateError(errors.New("Unclosed bracket!"))
-			}
-			lexer.emit(TYPE_VALUE)
-			if r == ',' {
-				lexer.next()
-				lexer.emit(TYPE_COMMA)
-			} else {
-				lexer.next()
-				lexer.emit(TYPE_RB)
-				return stateArgs
-			}
-		}
-	} else {
-		return stateArgs
-	}
-}
-
-func stateRB(lexer *Lexer) statefn {
-	log.Trace("stateRB", lexer)
-	lexer.pos += 1
-	lexer.emit(TYPE_RB)
-
-	peeked := lexer.peek()
-	if peeked == rune(',') {
-		return stateRPComma
-	} else if peeked == rune(')') {
-		return stateRP
-	} else {
-		return stateEOF
-	}
-}
-
-func stateArgs(lexer *Lexer) statefn {
-	log.Trace("stateArgs", lexer)
-	r, err := lexer.acceptUntil("(),=[]", false)
-	if err != nil {
-		return stateError(err)
-	}
-	switch r {
-	case '(':
-		return stateFunc
-	case ')':
-		return stateValue
-	case ',':
-		return stateValue
-	case '=':
-		return stateKeyword
-	case '[':
-		return stateLB
-	case ']':
-		return stateRB
-	default:
-		return stateError(errors.New("Expecting arguments!"))
-	}
-}
-
-func stateKeyword(lexer *Lexer) statefn {
-	log.Trace("stateKeyword", lexer)
-	_, err := lexer.acceptUntil("=", true)
-	if err != nil {
-		return stateError(err)
-	}
-	lexer.emit(TYPE_KEYWORD)
-	return stateEquals
-}
-
-func stateEquals(lexer *Lexer) statefn {
-	log.Trace("stateEquals", lexer)
-	e := lexer.next()
-	if e != '=' {
-		return stateError(errors.New("Expecting '='!"))
-	}
-	lexer.emit(TYPE_EQUALS)
-	return stateValue
-}
-
-func stateValue(lexer *Lexer) statefn {
-	log.Trace("stateValue", lexer)
-	r, err := lexer.acceptUntil("(),[", false)
-	if err != nil {
-		return stateError(err)
-	}
-	switch r {
-	case '(':
-		return stateFunc
-	case ')':
-		lexer.acceptUntil(")", true)
-		if lexer.pos > lexer.start {
-			lexer.emit(TYPE_VALUE)
-		}
-		return stateRP
-	case ',':
-		lexer.acceptUntil(",", true)
-		lexer.emit(TYPE_VALUE)
-		return stateComma
-	case '[':
-		return stateLB
-	default:
-		return stateError(errors.New("Unexpected character!"))
-	}
-}
-
-func stateRP(lexer *Lexer) statefn {
-	log.Trace("stateRP", lexer)
-	lexer.pos += 1
-	lexer.emit(TYPE_RP)
-
-	peeked := lexer.peek()
-	if peeked == rune(',') {
-		return stateRPComma
-	} else if peeked == rune(')') {
-		return stateRP
-	} else if peeked == rune(']') {
-		return stateRB
-	} else {
-		return stateEOF
-	}
-}
-
-func stateRPComma(lexer *Lexer) statefn {
-	log.Trace("stateRPComma", lexer)
-	lexer.pos += 1
-	lexer.emit(TYPE_COMMA)
-	return stateValue
-}
-
-func stateComma(lexer *Lexer) statefn {
-	log.Trace("stateComma", lexer)
-	lexer.pos += 1
-	lexer.emit(TYPE_COMMA)
-	return stateArgs
-}
-
-func stateEOF(lexer *Lexer) statefn {
-	log.Trace("stateEOF", lexer)
-	close(lexer.ch)
-	return nil
-}
-
-func (lexer *Lexer) Lex() (tokens []Token, err error) {
-	log.Trace("Lexer.Lex", tokens, err)
-	defer func() {
-		if r := recover(); r != nil {
-			var ok bool
-			err, ok = r.(error)
-			if !ok {
-				err = fmt.Errorf("query: %v", r)
-			}
-		}
-	}()
-	tokens = make([]Token, 0)
-	state := stateFunc
-	go func() {
-		for {
-			state = state(lexer)
-			if state == nil {
-				return
-			}
-		}
-	}()
-	for t := range lexer.ch {
-		if t.Type == TYPE_ERROR {
-			err = errors.New(t.Text)
-		}
-		tokens = append(tokens, t)
-	}
-	return tokens, err
-}
-
-func Lex(input string) ([]Token, error) {
-	log.Trace("Lex", input)
-	lexer := Lexer{input, 0, 0, 0, TYPE_FUNC, make(chan Token)}
-	return lexer.Lex()
-}
diff --git a/query/lexer_test.go b/query/lexer_test.go
deleted file mode 100644
index 4e5f0578a..000000000
--- a/query/lexer_test.go
+++ /dev/null
@@ -1,279 +0,0 @@
-package query_test
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/query"
-)
-
-// Ensure a simple function and value can be lexed.
-func TestLexer_Lex_FuncValue(t *testing.T) {
-	if tokens, err := query.Lex("get(10)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure a simple function, keyword, & value can be lexed.
-func TestLexer_Lex_FuncKeywordValue(t *testing.T) {
-	if tokens, err := query.Lex("get(id=10)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"id", query.TYPE_KEYWORD},
-		{"=", query.TYPE_EQUALS},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure a more complex function can be lexed.
-func TestLexer_Lex_FuncComplex(t *testing.T) {
-	if tokens, err := query.Lex("get(id=10, frame=brand)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"id", query.TYPE_KEYWORD},
-		{"=", query.TYPE_EQUALS},
-		{"10", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"frame", query.TYPE_KEYWORD},
-		{"=", query.TYPE_EQUALS},
-		{"brand", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that nested functions can be lexed.
-func TestLexer_Lex_FuncNested(t *testing.T) {
-	if tokens, err := query.Lex("union(get(10))"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"union", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a list of nested functions can be lexed.
-func TestLexer_Lex_FuncNestedList(t *testing.T) {
-	if tokens, err := query.Lex("intersect(get(10), get(11), get(12))"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"intersect", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"11", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"12", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that complex nested functions can be lexed.
-func TestLexer_Lex_FuncNestedComplex(t *testing.T) {
-	if tokens, err := query.Lex("intersect(get(10), get(11), concat(get(12),get(14)))"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"intersect", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"11", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"concat", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"12", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"14", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{")", query.TYPE_RP},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that complex nested functions can be lexed.
-func TestLexer_Lex_FuncNestedComplex2(t *testing.T) {
-	if tokens, err := query.Lex("concat(get(1, brand),get(2))"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"concat", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"1", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"brand", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"2", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a set function can be lexed.
-func TestLexer_Lex_Set1(t *testing.T) {
-	if tokens, err := query.Lex("set(1, 987)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"set", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"1", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"987", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a set function can be lexed.
-func TestLexer_Lex_Set2(t *testing.T) {
-	if tokens, err := query.Lex("set(1, general, 987)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"set", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"1", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"general", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"987", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a TopN function can be lexed.
-func TestLexer_Lex_TopN1(t *testing.T) {
-	if tokens, err := query.Lex("top-n(get(10), 8)"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"top-n", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"8", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a TopN function can be lexed.
-func TestLexer_Lex_TopN2(t *testing.T) {
-	if tokens, err := query.Lex("top-n(get(10, general), [1,2,3])"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"top-n", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"general", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"[", query.TYPE_LB},
-		{"1", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"2", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"3", query.TYPE_VALUE},
-		{"]", query.TYPE_RB},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// Ensure that a plugin function can be lexed.
-func TestLexer_Lex_Plugin(t *testing.T) {
-	if tokens, err := query.Lex("plugin(get(10, general), [get(11, general)])"); err != nil {
-		t.Fatal(err)
-	} else if !reflect.DeepEqual(tokens, []query.Token{
-		{"plugin", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"10", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"general", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{",", query.TYPE_COMMA},
-		{"[", query.TYPE_LB},
-		{"get", query.TYPE_FUNC},
-		{"(", query.TYPE_LP},
-		{"11", query.TYPE_VALUE},
-		{",", query.TYPE_COMMA},
-		{"general", query.TYPE_VALUE},
-		{")", query.TYPE_RP},
-		{"]", query.TYPE_RB},
-		{")", query.TYPE_RP},
-	}) {
-		t.Fatalf("unexpected tokens:\n\n%s", spew.Sprint(tokens))
-	}
-}
-
-// MustLex lexes s and returns a set of tokens. Panic on error.
-func MustLex(s string) []query.Token {
-	a, err := query.Lex(s)
-	if err != nil {
-		panic(err)
-	}
-	return a
-}
diff --git a/query/parser.go b/query/parser.go
deleted file mode 100644
index d15fec54a..000000000
--- a/query/parser.go
+++ /dev/null
@@ -1,354 +0,0 @@
-package query
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-)
-
-var InvalidQueryError = errors.New("Invalid query format.")
-
-type QueryParser struct {
-	tokens []Token
-	pos    int
-}
-
-func (self *QueryParser) next() *Token {
-	log.Trace("QueryParser.next")
-	self.pos += 1
-	if self.pos > len(self.tokens) {
-		return nil
-	}
-	return &self.tokens[self.pos-1]
-}
-
-func (self *QueryParser) peek() *Token {
-	log.Trace("QueryParser.peek")
-	token := self.next()
-	self.backup()
-	return token
-}
-
-func (self *QueryParser) backup() {
-	log.Trace("QueryParser.backup")
-	self.pos -= 1
-}
-
-func (self *QueryParser) Parse() (query *Query, err error) {
-	log.Trace("QueryParser.Parse", query, err)
-	defer func() {
-		if r := recover(); r != nil {
-			var ok bool
-			err, ok = r.(error)
-			if !ok {
-				err = fmt.Errorf("query: %v", r)
-			}
-		}
-	}()
-	var token *Token
-
-	id := pilosa.NewGUID()
-	query = &Query{Id: &id, Subqueries: make([]Query, 0), Args: make(map[string]interface{})}
-
-	token = self.next()
-	if token.Type != TYPE_FUNC {
-		return nil, fmt.Errorf("Expected function, found token %v.", token)
-	}
-
-	query.Operation = token.Text
-
-	token = self.next()
-	if token.Type != TYPE_LP {
-		return nil, fmt.Errorf("Expected '(', found token %v.", token)
-	}
-	const shortForm = "2006-01-02T15:04"
-
-ArgLoop:
-	for {
-		token = self.next()
-		if token == nil {
-			return nil, fmt.Errorf("Unclosed parentheses!")
-		}
-
-		switch token.Type {
-		case TYPE_FUNC:
-			self.backup()
-			subquery, err := self.Parse()
-			if err != nil {
-				return nil, err
-			}
-			query.Subqueries = append(query.Subqueries, *subquery)
-		case TYPE_VALUE:
-			switch query.Operation {
-			case "range":
-				switch len(query.Args) {
-				case 0:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["id"] = i
-				case 1:
-					query.Args["frame"] = token.Text
-				case 2:
-					t, err := time.Parse(shortForm, token.Text)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer DateTime (%v)", err)
-					}
-					query.Args["start"] = t
-				case 3:
-					t, err := time.Parse(shortForm, token.Text)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer DateTime (%v)", err)
-					}
-					query.Args["end"] = t
-				}
-			case "mask":
-				switch len(query.Args) {
-				case 0:
-					query.Args["frame"] = token.Text
-				case 1:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["start"] = i
-				case 2:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["end"] = i
-				}
-			case "get":
-				switch len(query.Args) {
-				case 0:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["id"] = i
-				case 1:
-					query.Args["frame"] = token.Text
-				default:
-					return nil, fmt.Errorf("Unexpected argument! (%v)", token)
-				}
-			case "clear":
-				switch len(query.Args) {
-				case 0:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["id"] = i
-				case 1:
-					query.Args["frame"] = token.Text
-				case 2:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["filter"] = i
-				case 3:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["profile_id"] = i
-				default:
-					return nil, fmt.Errorf("Unexpected argument! (%v)", token)
-				}
-			case "set":
-				switch len(query.Args) {
-				case 0:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["id"] = i
-				case 1:
-					query.Args["frame"] = token.Text
-				case 2:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["filter"] = i
-				case 3:
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-					}
-					query.Args["profile_id"] = i
-				default:
-					return nil, fmt.Errorf("Unexpected argument! (%v)", token)
-				}
-			case "top-n":
-				switch len(query.Args) {
-				case 0:
-					query.Args["frame"] = token.Text
-				case 1:
-					i, err := strconv.Atoi(token.Text)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting integer! (%v)", err)
-					}
-					query.Args["n"] = i
-				}
-			case "all":
-				// do nothing
-			case "recall": //need pair based list of frag_id,handle
-				arg, ok := query.Args["stash"]
-				if !ok {
-					arg = &Stash{make([]CacheItem, 0), false}
-					query.Args["stash"] = arg
-				}
-
-				recallArgs := arg.(*Stash)
-				if !recallArgs.incomplete {
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting fragment id! (%v)", err)
-					}
-					recallArgs.Add(pilosa.SUUID(i)) //constructs a new arg
-				} else {
-					i, err := strconv.ParseUint(token.Text, 10, 64)
-					if err != nil {
-						return nil, fmt.Errorf("Expecting handle! (%v)", err)
-					}
-					recallArgs.Assign(pilosa.BitmapHandle(i)) //sets the value of the last created arg
-				}
-			default:
-				spew.Dump("UNPROCESSED VALUE", token)
-			}
-			continue
-		case TYPE_COMMA:
-			continue
-		case TYPE_RP:
-			break ArgLoop
-		case TYPE_KEYWORD:
-			var value interface{}
-			keyword := token.Text
-			token = self.next()
-			if token == nil || token.Type != TYPE_EQUALS {
-				return nil, fmt.Errorf("Expecting equals sign!")
-			}
-			token = self.next()
-			if token == nil || token.Type != TYPE_VALUE {
-				return nil, fmt.Errorf("Expecting value!")
-			}
-			if keyword == "id" {
-				value, err = strconv.ParseUint(token.Text, 10, 64)
-				if err != nil {
-					return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-				}
-			} else if keyword == "n" {
-				value, err = strconv.Atoi(token.Text)
-				if err != nil {
-					return nil, fmt.Errorf("Expecting integer! (%v)", err)
-				}
-			} else {
-				value = token.Text
-			}
-			query.Args[keyword] = value
-		case TYPE_LB:
-			peeked := self.peek()
-			// we currently support 2 types of values in square brackets:
-			//    ids      <- list of integers (TYPE_VALUE)
-			//    filters  <- list of queries (TYPE_FUNC)
-			switch peeked.Type {
-			case TYPE_VALUE:
-				query.Args["ids"] = make([]uint64, 0)
-				for {
-					token = self.next()
-					if token == nil {
-						return nil, fmt.Errorf("Unclosed list!")
-					}
-					switch token.Type {
-					case TYPE_COMMA:
-						break
-					case TYPE_VALUE:
-						i, err := strconv.ParseUint(token.Text, 10, 64)
-						if err != nil {
-							return nil, fmt.Errorf("Expecting integer id! (%v)", err)
-						}
-						query.Args["ids"] = append(query.Args["ids"].([]uint64), i)
-					case TYPE_RB:
-						continue ArgLoop
-					default:
-						return nil, fmt.Errorf("Unexpected token! (%v)", token)
-					}
-				}
-			case TYPE_FUNC:
-				query.Args["filters"] = make([]Query, 0)
-				for {
-					token = self.next()
-					if token == nil {
-						return nil, fmt.Errorf("Unclosed list!")
-					}
-					switch token.Type {
-					case TYPE_COMMA:
-						break
-					case TYPE_FUNC:
-						self.backup()
-						filterquery, err := self.Parse()
-						if err != nil {
-							return nil, err
-						}
-						query.Args["filters"] = append(query.Args["filters"].([]Query), *filterquery)
-					case TYPE_RB:
-						continue ArgLoop
-					default:
-						return nil, fmt.Errorf("Unexpected token! (%v)", token)
-					}
-				}
-			}
-		case TYPE_RB:
-			//
-		default:
-			log.Warn(spew.Sdump("unexpected", token))
-			return nil, errors.New("BAD TOKEN")
-		}
-	}
-
-	if query.Operation == "get" && query.Args["frame"] == nil {
-		query.Args["frame"] = "general"
-	}
-	if len(query.Args) == 0 && len(query.Subqueries) == 0 {
-		if query.Operation == "count" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "intersect" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "union" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "difference" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "range" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "mask" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "stash" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-		if query.Operation == "recall" {
-			return nil, fmt.Errorf("No Args Given")
-		}
-	}
-	return query, nil
-}
-
-func Parse(tokens []Token) (*Query, error) {
-	log.Trace("Parse", tokens)
-	parser := QueryParser{tokens, 0}
-	return parser.Parse()
-}
diff --git a/query/parser_test.go b/query/parser_test.go
deleted file mode 100644
index 6c3a4976e..000000000
--- a/query/parser_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package query_test
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/query"
-)
-
-// Ensure the parser can parse a get() query.
-func TestParser_Parse_Get(t *testing.T) {
-	if q, err := query.Parse(MustLex("get(10)")); err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "get" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{
-		"id":    uint64(10),
-		"frame": "general",
-	}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse a get() query with a keyword.
-func TestParser_Parse_Get_Keyword(t *testing.T) {
-	if q, err := query.Parse(MustLex("get(id=10)")); err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "get" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{"id": uint64(10), "frame": "general"}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse a get() query with a keyword.
-func TestParser_Parse_Get_MultiKeyword(t *testing.T) {
-	if q, err := query.Parse(MustLex("get(id=10, frame=brands)")); err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "get" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{"id": uint64(10), "frame": "brands"}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse a clear() query.
-func TestParser_Parse_Clear(t *testing.T) {
-	if q, err := query.Parse(MustLex("clear(10, general, 0, 20)")); err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "clear" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{
-		"id":         uint64(10),
-		"frame":      "general",
-		"filter":     uint64(0),
-		"profile_id": uint64(20),
-	}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse a set() query.
-func TestParser_Parse_Set(t *testing.T) {
-	if q, err := query.Parse(MustLex("set(10, general, 0, 20)")); err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "set" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{
-		"id":         uint64(10),
-		"frame":      "general",
-		"filter":     uint64(0),
-		"profile_id": uint64(20),
-	}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse a nested query.
-func TestParser_Parse_Nested(t *testing.T) {
-	q, err := query.Parse(MustLex("union(get(10,general), get(11,brand), get(12))"))
-	if err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "union" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if len(q.Subqueries) != 3 {
-		t.Fatalf("unexpected subquery count: %d", len(q.Subqueries))
-	}
-
-	if sq := q.Subqueries[0]; sq.Operation != "get" {
-		t.Fatalf("unexpected subquery(0) operation: %q", sq.Operation)
-	} else if !reflect.DeepEqual(sq.Args, map[string]interface{}{"id": uint64(10), "frame": "general"}) {
-		t.Fatalf("unexpected subquery(0) args:\n\n%s", spew.Sprint(q.Args))
-	}
-
-	if sq := q.Subqueries[1]; sq.Operation != "get" {
-		t.Fatalf("unexpected subquery(1) operation: %q", sq.Operation)
-	} else if !reflect.DeepEqual(sq.Args, map[string]interface{}{"id": uint64(11), "frame": "brand"}) {
-		t.Fatalf("unexpected subquery(1) args:\n\n%s", spew.Sprint(sq.Args))
-	}
-
-	if sq := q.Subqueries[2]; sq.Operation != "get" {
-		t.Fatalf("unexpected subquery(2) operation: %q", sq.Operation)
-	} else if !reflect.DeepEqual(sq.Args, map[string]interface{}{"id": uint64(12), "frame": "general"}) {
-		t.Fatalf("unexpected subquery(2) args:\n\n%s", spew.Sprint(sq.Args))
-	}
-}
-
-// Ensure the parser can parse a query with lists.
-func TestParser_Parse_Lists(t *testing.T) {
-	q, err := query.Parse(MustLex("top-n(get(10, general), [1,2,3], 50)"))
-	if err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "top-n" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	} else if !reflect.DeepEqual(q.Args, map[string]interface{}{"ids": []uint64{1, 2, 3}, "n": 50}) {
-		t.Fatalf("unexpected args:\n\n%s", spew.Sprint(q.Args))
-	}
-
-	if sq := q.Subqueries[0]; sq.Operation != "get" {
-		t.Fatalf("unexpected subquery(0) operation: %q", sq.Operation)
-	} else if !reflect.DeepEqual(sq.Args, map[string]interface{}{"id": uint64(10), "frame": "general"}) {
-		t.Fatalf("unexpected subquery(0) args:\n\n%s", spew.Sprint(q.Args))
-	}
-}
-
-// Ensure the parser can parse "all()".
-func TestParser_Parse_All(t *testing.T) {
-	q, err := query.Parse(MustLex("top-n(all(), general, 30)"))
-	if err != nil {
-		t.Fatal(err)
-	} else if q.Operation != "top-n" {
-		t.Fatalf("unexpected operation: %q", q.Operation)
-	}
-
-	if sq := q.Subqueries[0]; sq.Operation != "all" {
-		t.Fatalf("unexpected subquery(0) operation: %q", sq.Operation)
-	}
-}
-
-// Ensure the parser can parse bracketed lists.
-func TestParser_Parse_Lists_Bracketed(t *testing.T) {
-	q, err := query.Parse(MustLex("plugin(get(99), [get(10), get(11)])"))
-	if err != nil {
-		t.Fatalf("expected error")
-	}
-	spew.Dump(q)
-}
-
-// Ensure the parser can parse a recall query.
-func TestParser_Parse_Recall(t *testing.T) {
-	q, err := query.Parse(MustLex("recall(12345,1,12345,2,12345,3)"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	spew.Dump(q)
-}
diff --git a/query/planner.go b/query/planner.go
deleted file mode 100644
index bc7de4391..000000000
--- a/query/planner.go
+++ /dev/null
@@ -1,953 +0,0 @@
-package query
-
-import (
-	"encoding/gob"
-	"errors"
-	"fmt"
-	"math/rand"
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-)
-
-type PortableQueryStep interface {
-	GetId() *pilosa.GUID
-	GetLocation() *db.Location
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// ERRORS
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Invalid Frame
-type InvalidFrame struct {
-	Db    string
-	Frame string
-	Retry bool
-}
-
-func NewInvalidFrame(db string, frame string) *InvalidFrame {
-	return &InvalidFrame{db, frame, false}
-}
-
-func (self *InvalidFrame) Error() string {
-	return fmt.Sprintf("Invalid Frame: %s:%s", self.Db, self.Frame)
-}
-
-// Fragment Not Found
-type FragmentNotFound struct {
-	Db    string
-	Frame string
-	Slice int
-	Retry bool
-}
-
-func NewFragmentNotFound(db string, frame string, slice int) *FragmentNotFound {
-	return &FragmentNotFound{db, frame, slice, true}
-}
-
-func (self *FragmentNotFound) Error() string {
-	return fmt.Sprintf("Fragment Not Found: %s:%s:%d", self.Db, self.Frame, self.Slice)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// BASE
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-type BaseQueryStep struct {
-	Id          *pilosa.GUID
-	Operation   string
-	Location    *db.Location
-	Destination *db.Location
-}
-
-func (self *BaseQueryStep) GetId() *pilosa.GUID {
-	log.Trace("BaseQueryStep", *self.Id)
-	return self.Id
-}
-func (self *BaseQueryStep) GetLocation() *db.Location {
-	log.Trace("BaseQueryStep.GetLocation", *self.Location)
-	return self.Location
-}
-
-func (self *BaseQueryStep) LocIsDest() bool {
-	log.Trace("BaseQueryStep.LocIsDest")
-	if self.Location.ProcessId.Equals(self.Destination.ProcessId) &&
-		self.Location.FragmentId == self.Destination.FragmentId {
-		log.Trace("BaseQueryStep.LocIsDest Return true")
-		return true
-	}
-	log.Trace("BaseQueryStep.LocIsDest Return false")
-	return false
-}
-
-type BaseQueryResult struct {
-	Id   *pilosa.GUID
-	Data interface{}
-}
-
-func (self *BaseQueryResult) ResultId() *pilosa.GUID {
-	log.Trace("BaseQueryStep.ResultId", self)
-
-	return self.Id
-}
-
-func (self *BaseQueryResult) ResultData() interface{} {
-	log.Trace("BaseQueryStep.ResultData", self)
-	return self.Data
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// COUNT
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type CountQueryStep struct {
-	*BaseQueryStep
-	Input *pilosa.GUID
-}
-
-type CountQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for COUNT queries
-type CountQueryTree struct {
-	subquery QueryTree
-	location *db.Location
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *CountQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("CountQueryTree.getLocation", d, qt)
-	return qt.subquery.getLocation(d)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// TOP-N
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type TopNQueryStep struct {
-	*BaseQueryStep
-	Input   *pilosa.GUID
-	Filters []uint64
-	N       int
-	Frame   string
-}
-
-type TopNQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for TOP-N queries
-type TopNQueryTree struct {
-	subquery QueryTree
-	location *db.Location
-	Filters  []uint64
-	N        int
-	Frame    string
-	Slice    int
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *TopNQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("TopNQueryTree.getLocation", d, qt)
-	var err error
-	if qt.location == nil {
-		frame := d.GetOrCreateFrame(qt.Frame)
-		slice := d.GetOrCreateSlice(qt.Slice)
-		fragment, err := d.GetFragmentForFrameSlice(frame, slice)
-		if err != nil {
-			log.Warn("GetFragmentForFrameSliceFailed TopNQueryTree", frame, slice)
-			return nil, err
-		}
-		qt.location = fragment.GetLocation()
-		return qt.location, nil
-	}
-	return qt.location, err
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// UNION
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type UnionQueryStep struct {
-	*BaseQueryStep
-	Inputs []*pilosa.GUID
-}
-
-type UnionQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for UNION queries
-type UnionQueryTree struct {
-	subqueries []QueryTree
-	location   *db.Location
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *UnionQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("UnionQueryTree.getLocation", d, qt)
-	var err error
-	if qt.location == nil {
-		subqueryLength := len(qt.subqueries)
-		if subqueryLength > 0 {
-			locationIndex := rand.Intn(subqueryLength)
-			subquery := qt.subqueries[locationIndex]
-			qt.location, err = subquery.getLocation(d)
-		}
-	}
-	return qt.location, err
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// INTERSECT
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type IntersectQueryStep struct {
-	*BaseQueryStep
-	Inputs []*pilosa.GUID
-}
-
-type IntersectQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for UNION queries
-type IntersectQueryTree struct {
-	subqueries []QueryTree
-	location   *db.Location
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *IntersectQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("IntersectQueryTree.getLocation", d, qt)
-	var err error
-	if qt.location == nil {
-		subqueryLength := len(qt.subqueries)
-		if subqueryLength > 0 {
-			locationIndex := rand.Intn(subqueryLength)
-			subquery := qt.subqueries[locationIndex]
-			qt.location, err = subquery.getLocation(d)
-		}
-	}
-	return qt.location, err
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// DIFFERENCE
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type DifferenceQueryStep struct {
-	*BaseQueryStep
-	Inputs []*pilosa.GUID
-}
-
-type DifferenceQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for UNION queries
-type DifferenceQueryTree struct {
-	subqueries []QueryTree
-	location   *db.Location
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *DifferenceQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("DifferenceQueryTree.getLocation", d, qt)
-	var err error
-	if qt.location == nil {
-		subqueryLength := len(qt.subqueries)
-		if subqueryLength > 0 {
-			locationIndex := rand.Intn(subqueryLength)
-			subquery := qt.subqueries[locationIndex]
-			qt.location, err = subquery.getLocation(d)
-		}
-	}
-	return qt.location, err
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// CAT
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type CatQueryStep struct {
-	*BaseQueryStep
-	Inputs []*pilosa.GUID
-	N      int
-}
-type Appendable interface {
-	Append(subq QueryTree)
-}
-
-type CatQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for CAT queries
-type CatQueryTree struct {
-	subqueries []QueryTree
-	location   *db.Location
-	N          int
-}
-
-func (qt *CatQueryTree) Append(subtree QueryTree) {
-	log.Trace("CatQueryTree.Append", qt, subtree)
-	qt.subqueries = append(qt.subqueries, subtree)
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *CatQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("CatQueryTree.getLocation", d)
-	var err error
-	if qt.location == nil {
-		subqueryLength := len(qt.subqueries)
-		if subqueryLength > 0 {
-			locationIndex := rand.Intn(subqueryLength)
-			subquery := qt.subqueries[locationIndex]
-			qt.location, err = subquery.getLocation(d)
-		}
-	}
-	return qt.location, err
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// ALL
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// QueryTree for GET queries
-type AllQueryTree struct {
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *AllQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("AllQueryTree.getLocation", d)
-	return nil, nil
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// GET
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type GetQueryStep struct {
-	*BaseQueryStep
-	Bitmap *db.Bitmap
-	Slice  int
-}
-
-type GetQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for GET queries
-type GetQueryTree struct {
-	bitmap *db.Bitmap
-	slice  int
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *GetQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("GetQueryTree.getLocation", d)
-	slice := d.GetOrCreateSlice(qt.slice) // TODO: this should probably be just GetSlice (no create)
-	fragment, err := d.GetFragmentForBitmap(slice, qt.bitmap)
-	if err != nil {
-		log.Warn("GetFragmenForBitmapFailed GetQueryTree", slice)
-		return nil, err
-	}
-	return fragment.GetLocation(), nil
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// SET
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type SetQueryStep struct {
-	*BaseQueryStep
-	Bitmap    *db.Bitmap
-	ProfileId uint64
-}
-
-type SetQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for SET queries
-type SetQueryTree struct {
-	bitmap     *db.Bitmap
-	profile_id uint64
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *SetQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("SetQueryTree.getLocation", d)
-	// check here for supported frames
-	if !d.IsValidFrame(qt.bitmap.FrameType) {
-		return nil, NewInvalidFrame(d.Name, qt.bitmap.FrameType)
-	}
-	slice, err := d.GetSliceForProfile(qt.profile_id)
-	if err != nil {
-		return nil, NewFragmentNotFound(d.Name, qt.bitmap.FrameType, db.GetSlice(qt.profile_id))
-	}
-	fragment, err := d.GetFragmentForBitmap(slice, qt.bitmap)
-	if err != nil {
-		log.Warn("NOT FOUND:", slice, qt.bitmap)
-		return nil, NewFragmentNotFound(d.Name, qt.bitmap.FrameType, db.GetSlice(qt.profile_id))
-	}
-	return fragment.GetLocation(), nil
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-func init() {
-	gob.Register(BaseQueryResult{})
-	gob.Register(SetQueryResult{})
-	gob.Register(ClearQueryResult{})
-	gob.Register(GetQueryResult{})
-	gob.Register(RangeQueryResult{})
-	gob.Register(CatQueryResult{})
-	gob.Register(UnionQueryResult{})
-	gob.Register(IntersectQueryResult{})
-	gob.Register(DifferenceQueryResult{})
-	gob.Register(CountQueryResult{})
-	gob.Register(TopNQueryResult{})
-	gob.Register(FillResult{})
-	gob.Register(StashQueryResult{})
-	gob.Register(CacheItem{})
-	gob.Register(Stash{})
-
-	gob.Register(SetQueryStep{})
-	gob.Register(ClearQueryStep{})
-	gob.Register(GetQueryStep{})
-	gob.Register(RangeQueryStep{})
-	gob.Register(CatQueryStep{})
-	gob.Register(UnionQueryStep{})
-	gob.Register(IntersectQueryStep{})
-	gob.Register(DifferenceQueryStep{})
-	gob.Register(CountQueryStep{})
-	gob.Register(TopNQueryStep{})
-	gob.Register(StashQueryStep{})
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// This is the output of the query planner. Contains a list of steps which can be performed in parallel
-//type QueryPlan []QueryStep
-type QueryPlan []interface{}
-
-type QueryPlanner struct {
-	Database *db.Database
-	Query    *Query
-}
-type QueryTree interface {
-	getLocation(d *db.Database) (*db.Location, error)
-}
-
-func validateRange(Args map[string]interface{}) error {
-	log.Trace("validateRange", Args)
-	_, ok := Args["id"]
-	if !ok {
-		return errors.New("missing bitmap id")
-	}
-	_, ok = Args["frame"]
-	if !ok {
-		return errors.New("missing frame ")
-	}
-	_, ok = Args["start"]
-	if !ok {
-		return errors.New("missing start time")
-	}
-	_, ok = Args["end"]
-	if !ok {
-		return errors.New("missing end time")
-	}
-	return nil
-}
-
-// Builds QueryTree object from Query. Pass slice=-1 to perform operation on all slices
-func (self *QueryPlanner) buildTree(query *Query, slice int) (QueryTree, error) {
-	log.Trace("QueryPlanner.buildTree", query, slice)
-	var tree QueryTree
-	// handle SET operation regardless of the slice
-	if query.Operation == "set" {
-		tree = &SetQueryTree{&db.Bitmap{Id: query.Args["id"].(uint64), FrameType: query.Args["frame"].(string), Filter: query.Args["filter"].(uint64)}, query.Args["profile_id"].(uint64)}
-		return tree, nil
-	}
-
-	if query.Operation == "clear" {
-		tree = &ClearQueryTree{&db.Bitmap{Id: query.Args["id"].(uint64), FrameType: query.Args["frame"].(string), Filter: query.Args["filter"].(uint64)}, query.Args["profile_id"].(uint64)}
-		return tree, nil
-	}
-
-	if query.Operation == "recall" {
-		tree = &RecallQueryTree{query.Args["stash"].(Stash)}
-		return tree, nil
-	}
-
-	// handle the remaining operations, taking slice into consideration
-	//I'm kinda thinking for stash it needs a differnt handler..i guess for now I'll see if i can use the cathandler
-	if slice == -1 {
-		var n int
-		n_, ok := query.Args["n"]
-		if ok {
-			n = n_.(int)
-		}
-		var p Appendable
-
-		if query.Operation == "stash" {
-			tree = &StashQueryTree{N: n}
-		} else {
-			tree = &CatQueryTree{N: n}
-		}
-		p = tree.(Appendable)
-		slice_ids, err := self.Database.SliceIds()
-		if err != nil {
-			return nil, err
-		}
-		for i := range slice_ids {
-			subtree, err := self.buildTree(query, slice_ids[i])
-			if err != nil {
-				return nil, err
-			}
-			p.Append(subtree)
-		}
-	} else {
-		if query.Operation == "get" {
-			tree = &GetQueryTree{&db.Bitmap{Id: query.Args["id"].(uint64), FrameType: query.Args["frame"].(string), Filter: 0}, slice}
-			return tree, nil
-		} else if query.Operation == "range" {
-			err := validateRange(query.Args)
-			if err != nil {
-				return nil, err
-			}
-			tree = &RangeQueryTree{
-				&db.Bitmap{
-					Id:        query.Args["id"].(uint64),
-					FrameType: query.Args["frame"].(string),
-					Filter:    0},
-				slice,
-				query.Args["start"].(time.Time),
-				query.Args["end"].(time.Time)}
-			return tree, nil
-		} else if query.Operation == "count" {
-			subquery, err := self.buildTree(&query.Subqueries[0], slice)
-			if err != nil {
-				return nil, err
-			}
-			tree = &CountQueryTree{subquery: subquery}
-		} else if query.Operation == "all" {
-			tree = &AllQueryTree{}
-		} else if query.Operation == "top-n" {
-			var frame string
-			var n int
-			var filters []uint64
-			frame_, ok := query.Args["frame"]
-			if ok {
-				frame = frame_.(string)
-			}
-			n_, ok := query.Args["n"]
-			if ok {
-				n = n_.(int)
-			}
-			filters_, ok := query.Args["ids"]
-			if ok {
-				filters = filters_.([]uint64)
-			}
-
-			subquery, err := self.buildTree(&query.Subqueries[0], slice)
-			if err != nil {
-				return nil, err
-			}
-			tree = &TopNQueryTree{subquery: subquery, Filters: filters, N: n, Frame: frame, Slice: slice}
-		} else if query.Operation == "union" {
-			subqueries := make([]QueryTree, len(query.Subqueries))
-			var err error
-			for i, query := range query.Subqueries {
-				subqueries[i], err = self.buildTree(&query, slice)
-				if err != nil {
-					return nil, err
-				}
-			}
-			tree = &UnionQueryTree{subqueries: subqueries}
-		} else if query.Operation == "intersect" {
-			subqueries := make([]QueryTree, len(query.Subqueries))
-			var err error
-			for i, query := range query.Subqueries {
-				subqueries[i], err = self.buildTree(&query, slice)
-				if err != nil {
-					return nil, err
-				}
-			}
-			tree = &IntersectQueryTree{subqueries: subqueries}
-		} else if query.Operation == "difference" {
-			subqueries := make([]QueryTree, len(query.Subqueries))
-			var err error
-			for i, query := range query.Subqueries {
-				subqueries[i], err = self.buildTree(&query, slice)
-				if err != nil {
-					return nil, err
-				}
-			}
-			tree = &DifferenceQueryTree{subqueries: subqueries}
-		} else if query.Operation == "stash" {
-
-			subqueries := make([]QueryTree, len(query.Subqueries))
-			var err error
-			for i, query := range query.Subqueries {
-				subqueries[i], err = self.buildTree(&query, slice)
-				if err != nil {
-					return nil, err
-				}
-			}
-			tree = &StashQueryTree{subqueries: subqueries}
-		} else {
-			//TODO return error gracefully
-			log.Warn(spew.Sdump(query))
-			return nil, errors.New("BuildTree Issues")
-		}
-	}
-	return tree, nil
-}
-
-// Produces flattened QueryPlan from QueryTree input
-func (self *QueryPlanner) flatten(qt QueryTree, id *pilosa.GUID, location *db.Location) (*QueryPlan, error) {
-	log.Trace("QueryPlanner.flatten", self, qt, id, location)
-	plan := QueryPlan{}
-	if cat, ok := qt.(*CatQueryTree); ok {
-		inputs := make([]*pilosa.GUID, len(cat.subqueries))
-		loc, err := cat.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := CatQueryStep{&BaseQueryStep{id, "cat", loc, location}, inputs, cat.N}
-		for index, subq := range cat.subqueries {
-			sub_id := pilosa.NewGUID()
-			step.Inputs[index] = &sub_id
-			subq_steps, err := self.flatten(subq, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-
-	} else if stash, ok := qt.(*StashQueryTree); ok {
-		inputs := make([]*pilosa.GUID, len(stash.subqueries))
-		loc, err := stash.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := StashQueryStep{&BaseQueryStep{id, "stash", loc, location}, inputs, stash.N}
-		for index, subq := range stash.subqueries {
-			sub_id := pilosa.NewGUID()
-			step.Inputs[index] = &sub_id
-			subq_steps, err := self.flatten(subq, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-	} else if union, ok := qt.(*UnionQueryTree); ok {
-		inputs := make([]*pilosa.GUID, len(union.subqueries))
-		loc, err := union.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := UnionQueryStep{&BaseQueryStep{id, "union", loc, location}, inputs}
-		for index, subq := range union.subqueries {
-			sub_id := pilosa.NewGUID()
-			step.Inputs[index] = &sub_id
-			subq_steps, err := self.flatten(subq, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-	} else if intersect, ok := qt.(*IntersectQueryTree); ok {
-		inputs := make([]*pilosa.GUID, len(intersect.subqueries))
-		loc, err := intersect.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := IntersectQueryStep{&BaseQueryStep{id, "intersect", loc, location}, inputs}
-		for index, subq := range intersect.subqueries {
-			sub_id := pilosa.NewGUID()
-			step.Inputs[index] = &sub_id
-			subq_steps, err := self.flatten(subq, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-	} else if difference, ok := qt.(*DifferenceQueryTree); ok {
-		inputs := make([]*pilosa.GUID, len(difference.subqueries))
-		loc, err := difference.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := DifferenceQueryStep{&BaseQueryStep{id, "difference", loc, location}, inputs}
-		for index, subq := range difference.subqueries {
-			sub_id := pilosa.NewGUID()
-			step.Inputs[index] = &sub_id
-			subq_steps, err := self.flatten(subq, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-	} else if get, ok := qt.(*GetQueryTree); ok {
-		loc, err := get.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := GetQueryStep{&BaseQueryStep{id, "get", loc, location}, get.bitmap, get.slice}
-		plan := QueryPlan{step}
-		return &plan, nil
-	} else if rang, ok := qt.(*RangeQueryTree); ok {
-		loc, err := rang.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := RangeQueryStep{&BaseQueryStep{id, "range", loc, location}, rang.bitmap, rang.start, rang.end}
-		plan := QueryPlan{step}
-		return &plan, nil
-	} else if set, ok := qt.(*SetQueryTree); ok {
-		loc, err := set.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := SetQueryStep{&BaseQueryStep{id, "set", loc, location}, set.bitmap, set.profile_id}
-		plan := QueryPlan{step}
-		return &plan, nil
-	} else if clear, ok := qt.(*ClearQueryTree); ok {
-		loc, err := clear.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := ClearQueryStep{&BaseQueryStep{id, "clear", loc, location}, clear.bitmap, clear.profile_id}
-		plan := QueryPlan{step}
-		return &plan, nil
-	} else if cnt, ok := qt.(*CountQueryTree); ok {
-		sub_id := pilosa.NewGUID()
-		loc, err := cnt.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := &CountQueryStep{&BaseQueryStep{id, "count", loc, location}, &sub_id}
-		subq_steps, err := self.flatten(cnt.subquery, &sub_id, loc)
-		if err != nil {
-			return nil, err
-		}
-		plan = append(plan, *subq_steps...)
-		plan = append(plan, step)
-	} else if topn, ok := qt.(*TopNQueryTree); ok {
-		sub_id := pilosa.NewGUID()
-		loc, err := topn.getLocation(self.Database)
-		if err != nil {
-			return nil, err
-		}
-		step := &TopNQueryStep{&BaseQueryStep{id, "top-n", loc, location}, nil, topn.Filters, topn.N, topn.Frame}
-		switch topn.subquery.(type) {
-		case *AllQueryTree:
-			// do nothing
-		default:
-			step.Input = &sub_id
-			subq_steps, err := self.flatten(topn.subquery, &sub_id, loc)
-			if err != nil {
-				return nil, err
-			}
-			plan = append(plan, *subq_steps...)
-		}
-		plan = append(plan, step)
-	}
-	return &plan, nil
-}
-
-// Transforms Query into QueryTree and flattens to QueryPlan object
-func (self *QueryPlanner) Plan(query *Query, id *pilosa.GUID, destination *db.Location) (*QueryPlan, error) {
-	log.Trace("QueryPlanner.Plan", self, query, id, destination)
-	queryTree, err := self.buildTree(query, -1)
-	if err != nil {
-		return nil, err
-	}
-	return self.flatten(queryTree, query.Id, destination)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//MASK
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type MaskQueryStep struct {
-	*BaseQueryStep
-	start, end uint64
-}
-
-type MaskQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for Mask queries
-type MaskQueryTree struct {
-	start, end uint64
-	bitmap     *db.Bitmap
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-/*
-func (qt *MaskQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	slice := d.GetOrCreateSlice(qt.slice) // TODO: this should probably be just GetSlice (no create)
-	fragment, err := d.GetFragmentForBitmap(slice, qt.bitmap)
-	if err != nil {
-		log.Warn("GetFragmenForBitmapFailed GetQueryTree", slice)
-		return nil, err
-	}
-	return fragment.GetLocation(), nil
-}
-*/
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Range
-///////////////////////////////////////////////////////////////////////////////////////////////////
-type RangeQueryStep struct {
-	*BaseQueryStep
-	Bitmap     *db.Bitmap
-	Start, End time.Time
-}
-
-type RangeQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for Mask queries
-type RangeQueryTree struct {
-	bitmap     *db.Bitmap
-	slice      int
-	start, end time.Time
-}
-
-func (qt *RangeQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("RangeQueryTree", qt, d)
-	slice := d.GetOrCreateSlice(qt.slice) // TODO: this should probably be just GetSlice (no create)
-	fragment, err := d.GetFragmentForBitmap(slice, qt.bitmap)
-	if err != nil {
-		log.Warn("GetFragmenForBitmapFailed GetQueryTree", slice)
-		return nil, err
-	}
-	return fragment.GetLocation(), nil
-}
-
-type FillResult struct {
-	*BaseQueryResult
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Stash
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-type CacheItem struct {
-	FragmentId pilosa.SUUID
-	Handle     pilosa.BitmapHandle
-}
-
-type Stash struct {
-	Stash      []CacheItem //pilosa.BitmapHandle //probably need to make the a struct with fragment_id and handle
-	incomplete bool
-}
-
-func NewStash() Stash {
-	return Stash{make([]CacheItem, 0), false}
-}
-
-func (st *Stash) Add(i pilosa.SUUID) {
-	item := CacheItem{i, 0}
-	st.Stash = append(st.Stash, item)
-	st.incomplete = true
-}
-
-func (st *Stash) Assign(i pilosa.BitmapHandle) {
-	st.Stash[len(st.Stash)-1].Handle = i //big assumption that item already exists
-	st.incomplete = false
-}
-
-type StashQueryStep struct {
-	*BaseQueryStep
-	Inputs []*pilosa.GUID
-	N      int
-}
-
-type StashQueryResult struct {
-	*BaseQueryResult
-}
-
-// QueryTree for UNION queries
-type StashQueryTree struct {
-	subqueries []QueryTree
-	location   *db.Location
-	N          int
-}
-
-func (qt *StashQueryTree) Append(subtree QueryTree) {
-	qt.subqueries = append(qt.subqueries, subtree)
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *StashQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	var err error
-	if qt.location == nil {
-		subqueryLength := len(qt.subqueries)
-		if subqueryLength > 0 {
-			locationIndex := rand.Intn(subqueryLength)
-			subquery := qt.subqueries[locationIndex]
-			qt.location, err = subquery.getLocation(d)
-		}
-	}
-	return qt.location, err
-}
-
-type RecallQueryStep struct {
-	*BaseQueryStep
-	Stash Stash
-}
-type RecallQueryTree struct {
-	Stash Stash
-}
-
-func (rqt *RecallQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	return nil, nil
-}
-
-type RecallQueryResult struct {
-	*BaseQueryResult
-}
-
-type ClearQueryStep struct {
-	*BaseQueryStep
-	Bitmap    *db.Bitmap
-	ProfileId uint64
-}
-
-type ClearQueryResult struct {
-	*BaseQueryResult
-}
-
-type ClearQueryTree struct {
-	bitmap     *db.Bitmap
-	profile_id uint64
-}
-
-// Uses consistent hashing function to select node containing data for GET operation
-func (qt *ClearQueryTree) getLocation(d *db.Database) (*db.Location, error) {
-	log.Trace("ClearQueryTree.getLocation", d)
-	// check here for supported frames
-	if !d.IsValidFrame(qt.bitmap.FrameType) {
-		return nil, NewInvalidFrame(d.Name, qt.bitmap.FrameType)
-	}
-	slice, err := d.GetSliceForProfile(qt.profile_id)
-	if err != nil {
-		return nil, NewFragmentNotFound(d.Name, qt.bitmap.FrameType, db.GetSlice(qt.profile_id))
-	}
-	fragment, err := d.GetFragmentForBitmap(slice, qt.bitmap)
-	if err != nil {
-		log.Warn("NOT FOUND:", slice, qt.bitmap)
-		return nil, NewFragmentNotFound(d.Name, qt.bitmap.FrameType, db.GetSlice(qt.profile_id))
-	}
-	return fragment.GetLocation(), nil
-}
diff --git a/query/planner_example.go b/query/planner_example.go
deleted file mode 100644
index 02affe0a5..000000000
--- a/query/planner_example.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package query
-
-//package main
-//
-//import (
-//	"pilosa/query"
-//	"pilosa/core"
-//	"math/rand"
-//	"time"
-//	"log"
-//)
-//
-//func main() {
-//	rand.Seed(time.Now().UnixNano())
-//	cluster := core.Cluster{Self:"192.168.1.100:1201"}
-//	database := cluster.AddDatabase("property49")
-//	frame := database.AddFrame("general")
-//	frame.AddSlice("192.168.1.100:1201", "192.168.1.100:1202", "192.168.1.100:1203")
-//	frame.AddSlice("192.168.1.101:1201", "192.168.1.101:1202", "192.168.1.101:1203")
-//	frame.AddSlice("192.168.1.102:1201", "192.168.1.102:1202", "192.168.1.102:1203")
-//	frame2 := database.AddFrame("brands")
-//	frame2.AddSlice("192.168.1.200:1201", "192.168.1.200:1202", "192.168.1.200:1203")
-//	frame2.AddSlice("192.168.1.201:1201", "192.168.1.201:1202", "192.168.1.201:1203")
-//	frame2.AddSlice("192.168.1.202:1201", "192.168.1.202:1202", "192.168.1.202:1203")
-//
-//	//cluster.describe()
-//
-//	//query := Query{"get", []QueryInput{Bitmap{"general", 10}}}
-//
-//	//query := Query{"union", []QueryInput{
-//	//	&Query{"get", []QueryInput{Bitmap{"general", 20}}},
-//	//	&Query{"get", []QueryInput{Bitmap{"brands", 30}}},
-//	//}}
-//
-//	//queryString = "union(bitmap(general, 33), bitmap(brands, 44))"
-//	//queryString := `["union", ["intersect", ["bitmap", "general", 33], ["bitmap", "brands", 44]], ["bitmap", "general", 55]]`
-//	//query := `count(union(bitmap(""), bitmap(brands, 55)))`
-//	//query := `setbit(bitmap(cats, 33), 75000)`
-//	queryString := `["union", ["intersect", ["bitmap", "general", 33], ["bitmap", "brands", 44]], ["bitmap", "general", 55]]`
-//	queryParser := query.QueryParser{queryString}
-//	queryParsed, err := queryParser.Parse()
-//	log.Println(queryParsed)
-//	if err != nil {
-//		log.Println("ERROR!", err)
-//	}
-//
-////	query := qp.Query{"inter", []qp.QueryInput{
-////		&qp.Query{"union", []qp.QueryInput{
-////			&qp.Query{"get", []qp.QueryInput{core.Bitmap{"general", 20}}},
-////			&qp.Query{"get", []qp.QueryInput{core.Bitmap{"brands", 30}}},
-////		}},
-////		&qp.Query{"get", []qp.QueryInput{core.Bitmap{"general", 10}}},
-////	}}
-////
-//	planner := query.QueryPlanner{&cluster, database}
-//
-//	id, _ := uuid.NewV4()
-//	dest := "1.2.3.4:1234"
-//	log.Println("Query id", id, "Dest", dest)
-//
-//	queryplan := planner.Plan(queryParsed, id, dest, -1)
-//
-//	for _, i := range *queryplan {
-//		log.Println(i)
-//	}
-//	//fmt.Println(queryplan)
-//}
diff --git a/query/planner_test.go b/query/planner_test.go
deleted file mode 100644
index bc71fc4eb..000000000
--- a/query/planner_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package query_test
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/db"
-	"github.com/umbel/pilosa/query"
-	"github.com/umbel/pilosa/util"
-)
-
-// Ensure the query planner can plan a "get" query.
-func TestQueryPlanner_Plan_Get(t *testing.T) {
-	q, err := query.QueryForPQL("get(10,default)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	d, frag1 := NewDefaultDB()
-	planner := query.QueryPlanner{Database: d, Query: q}
-
-	id := util.RandomUUID()
-	plan, err := planner.Plan(q, &id, frag1.GetLocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(*plan); n != 3 {
-		t.Fatalf("unexpected plan length: %d", n)
-	}
-
-	if step := (*plan)[0].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(0) operation: %s", step.Operation)
-	} else if step.Slice != 0 {
-		t.Fatalf("unexpected step(0) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(0) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	if step := (*plan)[1].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(1) operation: %s", step.Operation)
-	} else if step.Slice != 1 {
-		t.Fatalf("unexpected step(1) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(1) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	if step := (*plan)[2].(query.CatQueryStep); step.Operation != "cat" {
-		t.Fatalf("unexpected step(2) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Inputs, []*pilosa.GUID{
-		(*plan)[0].(query.GetQueryStep).Id,
-		(*plan)[1].(query.GetQueryStep).Id,
-	}) {
-		t.Fatalf("unexpected step(2) inputs: %s", spew.Sprint(step.Inputs))
-	}
-}
-
-// Ensure the query planner can plan a "set" query.
-func TestQueryPlanner_Plan_Set(t *testing.T) {
-	q, err := query.QueryForPQL("set(10, default, 0, 100)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	d, frag1 := NewDefaultDB()
-	planner := query.QueryPlanner{Database: d, Query: q}
-
-	id := util.RandomUUID()
-	plan, err := planner.Plan(q, &id, frag1.GetLocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(*plan); n != 1 {
-		t.Fatalf("unexpected plan length: %d", n)
-	}
-
-	if step := (*plan)[0].(query.SetQueryStep); step.Operation != "set" {
-		t.Fatalf("unexpected step(0) operation: %s", step.Operation)
-	} else if step.ProfileId != 100 {
-		t.Fatalf("unexpected step(0) profile id: %d", step.ProfileId)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(0) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-}
-
-// Ensure the query planner can plan a "top-n" query.
-func TestQueryPlanner_Plan_TopN(t *testing.T) {
-	q, err := query.QueryForPQL("top-n(get(10, default), default, 50,[1,2,3])")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	d, frag1 := NewDefaultDB()
-	planner := query.QueryPlanner{Database: d, Query: q}
-
-	id := util.RandomUUID()
-	plan, err := planner.Plan(q, &id, frag1.GetLocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(*plan); n != 5 {
-		t.Fatalf("unexpected plan length: %d", n)
-	}
-
-	if step := (*plan)[0].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(0) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(0) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	if step := (*plan)[1].(*query.TopNQueryStep); step.Operation != "top-n" {
-		t.Fatalf("unexpected step(1) operation: %s", step.Operation)
-	} else if step.Input != (*plan)[0].(query.GetQueryStep).Id {
-		t.Fatalf("unexpected step(1) input: %d", step.Input)
-	} else if step.N != 50 {
-		t.Fatalf("unexpected step(1) n: %d", step.N)
-	} else if !reflect.DeepEqual(step.Filters, []uint64{1, 2, 3}) {
-		t.Fatalf("unexpected step(1) filters: %s", spew.Sprint(step.Filters))
-	}
-
-	if step := (*plan)[2].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(2) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(2) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	if step := (*plan)[3].(*query.TopNQueryStep); step.Operation != "top-n" {
-		t.Fatalf("unexpected step(3) operation: %s", step.Operation)
-	} else if step.Input != (*plan)[2].(query.GetQueryStep).Id {
-		t.Fatalf("unexpected step(3) input: %d", step.Input)
-	} else if step.N != 50 {
-		t.Fatalf("unexpected step(3) n: %d", step.N)
-	}
-}
-
-// Ensure the query planner can plan a "top-n" all() query.
-func TestQueryPlanner_Plan_TopN_All(t *testing.T) {
-	q, err := query.QueryForPQL("top-n(all(), default, 50, [1,2,3])")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	d, frag1 := NewDefaultDB()
-	planner := query.QueryPlanner{Database: d, Query: q}
-
-	id := util.RandomUUID()
-	plan, err := planner.Plan(q, &id, frag1.GetLocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(*plan); n != 3 {
-		t.Fatalf("unexpected plan length: %d", n)
-	}
-
-	if step := (*plan)[0].(*query.TopNQueryStep); step.Operation != "top-n" {
-		t.Fatalf("unexpected step(0) operation: %s", step.Operation)
-	} else if step.Input != nil {
-		t.Fatalf("unexpected step(0) input: %v", step.Input)
-	} else if step.N != 50 {
-		t.Fatalf("unexpected step(0) n: %d", step.N)
-	} else if !reflect.DeepEqual(step.Filters, []uint64{1, 2, 3}) {
-		t.Fatalf("unexpected step(0) filters: %s", spew.Sprint(step.Filters))
-	}
-}
-
-// Ensure the query planner can plan a "union" query.
-func TestQueryPlanner_Plan_Union(t *testing.T) {
-	id1 := util.RandomUUID()
-	q1 := query.Query{Id: &id1, Operation: "get", Args: map[string]interface{}{"id": uint64(10), "frame": "default"}}
-
-	id2 := util.RandomUUID()
-	q2 := query.Query{Id: &id2, Operation: "get", Args: map[string]interface{}{"id": uint64(20), "frame": "default"}}
-
-	id3 := util.RandomUUID()
-	q := query.Query{Id: &id3, Operation: "union", Subqueries: []query.Query{q1, q2}}
-
-	d, frag1 := NewDefaultDB()
-	planner := query.QueryPlanner{Database: d, Query: &q}
-
-	id := util.RandomUUID()
-	plan, err := planner.Plan(&q, &id, frag1.GetLocation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(*plan); n != 7 {
-		t.Fatalf("unexpected plan size: %d", n)
-	}
-
-	// First step should be a "get" step.
-	if step := (*plan)[0].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(0) operation: %s", step.Operation)
-	} else if step.Slice != 0 {
-		t.Fatalf("unexpected step(0) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(0) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	// Second step should also be a "get" step.
-	if step := (*plan)[1].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(1) operation: %s", step.Operation)
-	} else if step.Slice != 0 {
-		t.Fatalf("unexpected step(1) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 20, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(1) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	// Third step should union the first two steps.
-	if step := (*plan)[2].(query.UnionQueryStep); step.Operation != "union" {
-		t.Fatalf("unexpected step(2) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Inputs, []*pilosa.GUID{
-		(*plan)[0].(query.GetQueryStep).Id,
-		(*plan)[1].(query.GetQueryStep).Id,
-	}) {
-		t.Fatalf("unexpected step(2) inputs: %s", spew.Sprint(step.Inputs))
-	}
-
-	// Fourth step should be a "get" step.
-	if step := (*plan)[3].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(3) operation: %s", step.Operation)
-	} else if step.Slice != 1 {
-		t.Fatalf("unexpected step(3) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 10, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(3) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	// Fifth step should also be a "get" step.
-	if step := (*plan)[4].(query.GetQueryStep); step.Operation != "get" {
-		t.Fatalf("unexpected step(4) operation: %s", step.Operation)
-	} else if step.Slice != 1 {
-		t.Fatalf("unexpected step(4) slice: %d", step.Slice)
-	} else if !reflect.DeepEqual(step.Bitmap, &db.Bitmap{Id: 20, FrameType: "default", Filter: 0}) {
-		t.Fatalf("unexpected step(4) bitmap: %s", spew.Sprint(step.Bitmap))
-	}
-
-	// Sixth step should union the previous two steps.
-	if step := (*plan)[5].(query.UnionQueryStep); step.Operation != "union" {
-		t.Fatalf("unexpected step(5) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Inputs, []*pilosa.GUID{
-		(*plan)[3].(query.GetQueryStep).Id,
-		(*plan)[4].(query.GetQueryStep).Id,
-	}) {
-		t.Fatalf("unexpected step(5) inputs: %s", spew.Sprint(step.Inputs))
-	}
-
-	// Final step should concatenate the two union steps.
-	if step := (*plan)[6].(query.CatQueryStep); step.Operation != "cat" {
-		t.Fatalf("unexpected step(6) operation: %s", step.Operation)
-	} else if !reflect.DeepEqual(step.Inputs, []*pilosa.GUID{
-		(*plan)[2].(query.UnionQueryStep).Id,
-		(*plan)[5].(query.UnionQueryStep).Id,
-	}) {
-		t.Fatalf("unexpected step(6) inputs: %s", spew.Sprint(step.Inputs))
-	}
-}
-
-// NewDefaultDB returns a simple, initialized database and fragment.
-func NewDefaultDB() (*db.Database, *db.Fragment) {
-	// Create an empty database
-	c := db.NewCluster()
-	d := c.GetOrCreateDatabase("main")
-	f := d.GetOrCreateFrame("default")
-
-	s1 := d.GetOrCreateSlice(0)
-	frag1 := d.GetOrCreateFragment(f, s1, util.Id())
-	pid := util.RandomUUID()
-	p1 := db.NewProcess(&pid)
-	p1.SetHost("----192.1.1.0----")
-	frag1.SetProcess(p1)
-
-	s2 := d.GetOrCreateSlice(1)
-	frag2 := d.GetOrCreateFragment(f, s2, util.Id())
-	pid = util.RandomUUID()
-	p2 := db.NewProcess(&pid)
-	p2.SetHost("----192.1.1.1----")
-	frag2.SetProcess(p2)
-
-	return d, frag1
-}
diff --git a/query/query.go b/query/query.go
deleted file mode 100644
index b50c904e8..000000000
--- a/query/query.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package query
-
-import (
-	"strings"
-
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/db"
-)
-
-type QueryInput interface{}
-
-type QueryResults struct {
-	Data interface{}
-}
-
-type PqlList []PqlListItem
-
-type PqlListItem struct {
-	Id    *pilosa.GUID
-	Label string
-	PQL   string
-}
-
-type Query struct {
-	Id         *pilosa.GUID
-	Operation  string
-	Args       map[string]interface{}
-	Subqueries []Query
-}
-
-func QueryPlanForPQL(database *db.Database, pql string, destination *db.Location) (*QueryPlan, error) {
-	log.Trace("QueryPlanFOrPQL", database, pql, destination)
-	tokens, err := Lex(pql)
-	if err != nil {
-		return nil, err
-	}
-	return QueryPlanForTokens(database, tokens, destination)
-}
-
-func QueryForPQL(pql string) (*Query, error) {
-	log.Trace("QueryForPQL", pql)
-	tokens, err := Lex(pql)
-	if err != nil {
-		return nil, err
-	}
-	return QueryForTokens(tokens)
-}
-
-func QueryForTokens(tokens []Token) (*Query, error) {
-	log.Trace("QueryForTokens", tokens)
-	query, err := Parse(tokens)
-	if err != nil {
-		return nil, err
-	}
-	return query, nil
-}
-
-func QueryPlanForTokens(database *db.Database, tokens []Token, destination *db.Location) (*QueryPlan, error) {
-	log.Trace("QueryPlanForTokens", database, tokens, destination)
-	query, err := QueryForTokens(tokens)
-	if err != nil {
-		return nil, err
-	}
-	return QueryPlanForQuery(database, query, destination)
-}
-
-func QueryPlanForQuery(database *db.Database, query *Query, destination *db.Location) (*QueryPlan, error) {
-	log.Trace("QueryPlanForQuery", database, query, destination)
-	query_planner := QueryPlanner{Database: database, Query: query}
-	id := pilosa.NewGUID()
-	query_plan, err := query_planner.Plan(query, &id, destination)
-	if err != nil {
-		return nil, err
-	}
-	return query_plan, nil
-}
-
-func TokensToFilterStrings(tokens []Token) (string, []string) {
-	log.Trace("TokensToFilterStrings", tokens)
-	var whole []string
-	var filter string
-	var filters []string
-	var open_parens int
-	var in_square_brackets bool
-	var last_slice = 0
-
-	open_parens = -1
-	in_square_brackets = false
-	for i, _ := range tokens {
-		whole = append(whole, tokens[i].Text)
-		if tokens[i].Type == TYPE_FUNC {
-			last_slice = i
-		} else if tokens[i].Type == TYPE_LP {
-			open_parens += 1
-		} else if tokens[i].Type == TYPE_RP {
-			open_parens -= 1
-			if open_parens == 0 {
-				if !in_square_brackets {
-					filter = strings.Join(whole[2:], "")
-				} else {
-					filters = append(filters, strings.Join(whole[last_slice:], ""))
-				}
-				last_slice = i
-			}
-		} else if open_parens == 0 && tokens[i].Type == TYPE_LB {
-			in_square_brackets = true
-		}
-	}
-	return filter, filters
-}
diff --git a/query/query_test.go b/query/query_test.go
deleted file mode 100644
index 5850295b6..000000000
--- a/query/query_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package query_test
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/query"
-)
-
-func TestTokensToFilterStrings1(t *testing.T) {
-	filter, filters := query.TokensToFilterStrings(MustLex("plugin(get(88, general), [get(12, general), get(13, general)])"))
-	if filter != "get(88,general)" {
-		t.Fatalf("unexpected filter: %s", filter)
-	} else if !reflect.DeepEqual(filters, []string{"get(12,general)", "get(13,general)"}) {
-		t.Fatalf("unexpected filters: %s", spew.Sprint(filters))
-	}
-}
-
-func TestTokensToFilterStrings2(t *testing.T) {
-	filter, filters := query.TokensToFilterStrings(MustLex("plugin(intersect(get(88, general, [0]), get(77, b.n)), [get(12, general), get(13, general)])"))
-	if filter != "intersect(get(88,general,[0]),get(77,b.n))" {
-		t.Fatalf("unexpected filter: %s", filter)
-	} else if !reflect.DeepEqual(filters, []string{"get(12,general)", "get(13,general)"}) {
-		t.Fatalf("unexpected filters: %s", spew.Sprint(filters))
-	}
-}
-
-func TestTokensToFilterStrings3(t *testing.T) {
-	filter, filters := query.TokensToFilterStrings(MustLex("plugin(intersect(get(88, general, [0]), get(77, b.n)))"))
-	if filter != "intersect(get(88,general,[0]),get(77,b.n))" {
-		t.Fatalf("unexpected filter: %s", filter)
-	} else if !reflect.DeepEqual(filters, []string(nil)) {
-		t.Fatalf("unexpected filters: %s", spew.Sprint(filters))
-	}
-}
diff --git a/statsd/statd.go b/statsd/statd.go
deleted file mode 100644
index 4ca32bed6..000000000
--- a/statsd/statd.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package statsd
-
-import (
-	"time"
-
-	"github.com/cactus/go-statsd-client/statsd"
-	log "github.com/cihub/seelog"
-)
-
-// DefaultHost is the default host to send statsd data to.
-const DefaultHost = "127.0.0.1:8125"
-
-// Host is the host to send statsd data to.
-var Host = DefaultHost
-
-type args struct {
-	stat  string
-	delta int64
-	rate  float32
-}
-
-var timer chan args
-var count chan string
-var end chan bool
-
-func Setup() {
-	timer = make(chan args, 32768)
-	count = make(chan string, 32768)
-	end = make(chan bool)
-
-	log.Warn("New Stats", Host)
-	stats, _ := statsd.New(Host, "")
-
-	go func() {
-		for {
-			select {
-			case ci := <-timer:
-				stats.Gauge(ci.stat, ci.delta, ci.rate)
-				stats.Timing(ci.stat, ci.delta, ci.rate)
-			case stat := <-count:
-				stats.Inc(stat, 1, 1.0)
-			case <-end:
-				log.Warn("DONE Stats")
-				return
-
-			}
-		}
-	}()
-}
-
-func SendTimer(stat string, delta int64) {
-	pstat := "pilosa." + stat
-	milli := time.Duration(delta) / time.Millisecond
-	timer <- args{pstat, int64(milli), 1.0}
-}
-
-func SendInc(stat string) {
-	pstat := "pilosa." + stat
-	count <- pstat
-}
-
-func ShutdownStats() {
-	log.Warn("Shutdown Stats")
-	end <- true
-}
diff --git a/storage.go b/storage.go
deleted file mode 100644
index 679daab67..000000000
--- a/storage.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package pilosa
-
-// Storage represents
-type Storage interface {
-	Open() error
-	Close() error
-	Flush()
-
-	Fetch(bitmap_id uint64, db, frame string, slice int) (*Bitmap, uint64)
-	Store(id uint64, db, frame string, slice int, filter uint64, bitmap *Bitmap) error
-
-	StoreBlock(id uint64, db, frame string, slice int, filter uint64, chunk uint64, block_index int32, block uint64) error
-	RemoveBlock(id uint64, db, frame string, slice int, chunk uint64, block_index int32)
-
-	StoreBit(bid uint64, db, frame string, slice int, filter uint64, chunk uint64, block_index int32, block, count uint64)
-	RemoveBit(id uint64, db, frame string, slice int, filter uint64, chunk uint64, block_index int32, count uint64)
-}
-
-var storageFns = make(map[string]NewStorageFunc)
-
-// NewStorageFunc represents a function that instantiates a new storage engine.
-type NewStorageFunc func(opt StorageOptions) Storage
-
-// RegisterStorage registers a storage engine.
-func RegisterStorage(name string, fn NewStorageFunc) {
-	if storageFns[name] != nil {
-		panic("storage engine already registered: " + name)
-	}
-	storageFns[name] = fn
-}
-
-// NewStorage returns a new Storage instance by name.
-func NewStorage(name string, opt StorageOptions) Storage {
-	fn := storageFns[name]
-	if fn == nil {
-		panic("storage type not registered: " + name)
-	}
-	return fn(opt)
-}
-
-// StorageOptions represents the options passed to the storage engine.
-type StorageOptions struct {
-	DB         string
-	Slice      int
-	Frame      string
-	FragmentID SUUID
-
-	LevelDBPath string
-}
diff --git a/storage/cassandra/cassandra.go b/storage/cassandra/cassandra.go
deleted file mode 100644
index 9ec0adcba..000000000
--- a/storage/cassandra/cassandra.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package cassandra
-
-import (
-	"time"
-
-	log "github.com/cihub/seelog"
-	"github.com/gocql/gocql"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/statsd"
-)
-
-func init() {
-	pilosa.RegisterStorage("cassandra",
-		func(opt pilosa.StorageOptions) pilosa.Storage {
-			return NewStorage(opt)
-		},
-	)
-}
-
-// CREATE KEYSPACE IF NOT EXISTS pilosa WITH strategy_class = SimpleStrategy AND strategy_options:replication_factor = 1"
-// create keyspace if not exists pilosa with replication = {'class': 'SimpleStrategy', 'replication_factor' : 1} and durable_writes = true;
-// CREATE KEYSPACE pilosa WITH replication = {'class': 'NetworkTopologyStrategy', 'pilpang': '2'}  AND durable_writes = true;
-// CREATE TABLE IF NOT EXISTS bitmap (bitmap_id bigint, db varchar, frame varchar, slice int, filter int, chunkkey bigint, blockindex int, block bigint, PRIMARY KEY ((bitmap_id, db, frame, slice), chunkkey, blockindex) )
-
-// DefaultHosts are the default hosts in the cassandra cluster.
-var DefaultHosts = []string{"localhost"}
-
-const (
-	// DefaultKeyspace is the default keyspace used in cassandra.
-	DefaultKeyspace = "pilosa"
-
-	// DefaultFlushInterval is the default maximum time between flushes.
-	DefaultFlushInterval = 5 * time.Second
-
-	// DefaultFlushThreshold is the default maximum number of items to batch.
-	DefaultFlushThreshold = 15
-)
-
-// Storage represents Cassandra-backed storage for bitmaps.
-type Storage struct {
-	session *gocql.Session
-
-	batch     *gocql.Batch
-	batchTime time.Time
-	batchN    int
-
-	FlushInterval  time.Duration
-	FlushThreshold int
-
-	Hosts    []string
-	Keyspace string
-}
-
-// NewStorage returns a new, uninitialized instance of Storage.
-func NewStorage(opt pilosa.StorageOptions) *Storage {
-	return &Storage{
-		batchTime: time.Now(),
-
-		FlushInterval:  DefaultFlushInterval,
-		FlushThreshold: DefaultFlushThreshold,
-
-		Hosts:    DefaultHosts,
-		Keyspace: DefaultKeyspace,
-	}
-}
-
-// Open opens the connection to the cassandra cluster.
-func (s *Storage) Open() error {
-	// Create cluster configuration.
-	config := gocql.NewCluster(s.Hosts...)
-	config.Keyspace = s.Keyspace
-	config.Consistency = gocql.One
-	config.Timeout = 5 * time.Second
-	config.RetryPolicy = &gocql.SimpleRetryPolicy{NumRetries: 10}
-
-	// Connect to cassandra.
-	session, err := config.CreateSession()
-	if err != nil {
-		return err
-	}
-	s.session = session
-
-	return nil
-}
-
-// Close closes the connection to the cassandra cluster.
-func (s *Storage) Close() error {
-	if s.session != nil {
-		s.Flush()
-		s.session.Close()
-	}
-
-	return nil
-}
-
-// Fetch returns a bitmap by ID.
-func (s *Storage) Fetch(bitmapID uint64, db string, frame string, slice int) (*pilosa.Bitmap, uint64) {
-	bm := pilosa.NewBitmap()
-
-	// Start benchmark.
-	start := time.Now()
-
-	// Create iterator over bitmap.
-	itr := s.session.Query("SELECT filter, Chunkkey, BlockIndex, block FROM bitmap WHERE bitmap_id=? AND db=? AND frame=? AND slice=? ",
-		u64toi64(bitmapID), db, frame, slice).Iter()
-
-	// Iterate over chunks and materialize bitmap object.
-	var chunk *pilosa.Chunk
-	var chunkKey, block, count int64
-	var blockIndex uint32
-	var filter int
-	lastKey := int64(-1)
-
-	for itr.Scan(&filter, &chunkKey, &blockIndex, &block) {
-		if chunkKey != int64(-1) {
-			if chunkKey != lastKey {
-				chunk = &pilosa.Chunk{uint64(chunkKey), pilosa.NewBlocks()}
-				bm.AddChunk(chunk)
-			}
-			chunk.Value[uint8(blockIndex)] = uint64(block)
-		} else {
-			count = block
-		}
-		lastKey = chunkKey
-	}
-
-	statsd.SendTimer("cassandra_storage_Fetch", time.Since(start).Nanoseconds())
-	statsd.SendInc("cassandra_storage_Read")
-
-	// Set total bits set.
-	bm.SetCount(uint64(count))
-	return bm, uint64(filter)
-}
-
-// beginBatch starts a batch if one is not already in progress.
-func (s *Storage) beginBatch() {
-	if s.batch == nil {
-		s.batch = gocql.NewBatch(gocql.UnloggedBatch)
-	}
-	s.batchN++
-}
-
-// endBatch flushes a batch if one is in progress.
-func (s *Storage) endBatch() {
-	if s.batch == nil {
-		return
-	}
-
-	start := time.Now()
-	s.Flush()
-	statsd.SendTimer("cassandra_storage_EndBatch", time.Since(start).Nanoseconds())
-	statsd.SendInc("cassandra_storage_Write")
-}
-
-// Flush flushes the current batch to storage.
-func (s *Storage) Flush() {
-	start := time.Now()
-
-	// If batch exists then flush it.
-	if s.batch != nil {
-		if err := s.session.ExecuteBatch(s.batch); err != nil {
-			log.Warn("Batch ERROR: ", err)
-		}
-	}
-
-	// Clear batch and threshold time and count.
-	s.batch = nil
-	s.batchTime = time.Now()
-	s.batchN = 0
-
-	statsd.SendTimer("cassandra_storage_FlushBatch", time.Since(start).Nanoseconds())
-}
-
-// Store saves a bitmap to storage.
-func (s *Storage) Store(id uint64, db string, frame string, slice int, filter uint64, bm *pilosa.Bitmap) error {
-	s.beginBatch()
-
-	for i := bm.ChunkIterator(); !i.Limit(); i = i.Next() {
-		var chunk = i.Item()
-		for idx, block := range chunk.Value {
-			if block != 0 {
-				s.StoreBlock(id, db, frame, slice, filter, chunk.Key, int32(idx), block)
-			}
-		}
-	}
-
-	s.StoreBlock(id, db, frame, slice, filter, pilosa.CounterMask, 0, bm.BitCount())
-	s.endBatch()
-	return nil
-}
-
-// StoreBlock saves a block to storage.
-func (s *Storage) StoreBlock(bid uint64, db string, frame string, slice int, filter uint64, bchunk uint64, blockIndex int32, bblock uint64) error {
-	id := u64toi64(bid) // these functions ignore overflow
-	block := u64toi64(bblock)
-	chunk := u64toi64(bchunk)
-
-	if s.batch == nil {
-		s.beginBatch()
-	}
-
-	start := time.Now()
-	s.batch.Query(`INSERT INTO bitmap ( bitmap_id, db, frame, slice , filter, ChunkKey, BlockIndex, block) VALUES (?,?,?,?,?,?,?,?)  USING timestamp ?;`,
-		id, db, frame, slice, int(filter), chunk, blockIndex, block, start.UnixNano())
-	statsd.SendTimer("cassandra_storage_StoreBlock", time.Since(start).Nanoseconds())
-
-	return nil
-}
-
-// RemoveBlock deletes a block from storage.
-func (s *Storage) RemoveBlock(bid uint64, db string, frame string, slice int, bchunk uint64, blockIndex int32) {
-	log.Trace("RemoveBlock", bid, db, frame, slice, bchunk, blockIndex)
-
-	id := u64toi64(bid) //these fucntions ignore overflow
-	chunk := u64toi64(bchunk)
-
-	if s.batch == nil {
-		s.beginBatch()
-	}
-
-	startTime := time.Now()
-
-	s.batch.Query(`DELETE FROM bitmap USING TIMESTAMP ? WHERE bitmap_id=? AND db=? AND frame=? AND slice=? AND chunkkey=? AND blockindex=?`,
-		startTime.UnixNano(), id, db, frame, slice, chunk, blockIndex)
-
-	statsd.SendTimer("cassandra_storage_DeleteBlock", time.Since(startTime).Nanoseconds())
-}
-
-func (s *Storage) StoreBit(bid uint64, db string, frame string, slice int, filter uint64, chunk uint64, blockIndex int32, val, count uint64) {
-	s.beginBatch()
-	s.StoreBlock(bid, db, frame, slice, filter, chunk, blockIndex, val)
-	s.StoreBlock(bid, db, frame, slice, filter, pilosa.CounterMask, 0, count)
-	s.endBatch()
-}
-
-func (s *Storage) RemoveBit(id uint64, db string, frame string, slice int, filter uint64, chunk uint64, blockIndex int32, count uint64) {
-	log.Trace("RemoveBit", id, db, frame, slice, chunk, blockIndex)
-	s.beginBatch()
-	s.RemoveBlock(id, db, frame, slice, chunk, blockIndex)
-	s.StoreBlock(id, db, frame, slice, filter, pilosa.CounterMask, 0, count)
-	s.endBatch()
-}
-
-func u64toi64(v uint64) int64 { return int64(v) }
diff --git a/storage/cassandra/cassandra_test.go b/storage/cassandra/cassandra_test.go
deleted file mode 100644
index 702552410..000000000
--- a/storage/cassandra/cassandra_test.go
+++ /dev/null
@@ -1 +0,0 @@
-package cassandra_test
diff --git a/storage/leveldb/leveldb.go b/storage/leveldb/leveldb.go
deleted file mode 100644
index 5a78afca6..000000000
--- a/storage/leveldb/leveldb.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package leveldb
-
-import (
-	"bytes"
-	"encoding/binary"
-	"path/filepath"
-	"strconv"
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb"
-	. "github.com/syndtr/goleveldb/leveldb/util"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/statsd"
-)
-
-func init() {
-	pilosa.RegisterStorage("leveldb",
-		func(opt pilosa.StorageOptions) pilosa.Storage {
-			return NewStorage(opt)
-		},
-	)
-}
-
-//go get github.com/syndtr/goleveldb/leveldb
-
-// Storage represents a LevelDB-backed storage engine.
-type Storage struct {
-	path string
-	db   *leveldb.DB
-
-	batch     *leveldb.Batch
-	batchTime time.Time
-	batchN    int
-}
-
-// NewStorage returns a new instance of Storage.
-func NewStorage(opt pilosa.StorageOptions) *Storage {
-	path := filepath.Join(
-		opt.LevelDBPath,
-		opt.DB,
-		strconv.Itoa(opt.Slice),
-		opt.Frame,
-		opt.FragmentID.String(),
-	)
-
-	return &Storage{path: path}
-}
-
-// Path returns the path the storage was initialized with.
-func (s *Storage) Path() string { return s.path }
-
-// Open opens and initializes the storage.
-func (s *Storage) Open() error {
-	db, err := leveldb.OpenFile(s.path, nil)
-	if err != nil {
-		return err
-	}
-	s.db = db
-	s.batchTime = time.Now().Add(-time.Hour)
-
-	return nil
-}
-
-// Close flushes and closes the storage.
-func (s *Storage) Close() error {
-	s.Flush()
-	return s.db.Close()
-}
-
-func (s *Storage) Fetch(bitmapID uint64, db string, frame string, slice int) (*pilosa.Bitmap, uint64) {
-	bm := pilosa.NewBitmap()
-
-	// Begin benchmark.
-	start := time.Now()
-
-	// Create an iterator on the database.
-	iter := s.db.NewIterator(&Range{
-		Start: marshalKey(bitmapID, 0, 0),
-		Limit: marshalKey(bitmapID+1, 0, 0),
-	}, nil)
-	defer iter.Release()
-
-	// Iterate over blocks in database and create bitmap.
-	var chunk *pilosa.Chunk
-	var filter, block, count uint64
-	lastKey := uint64(pilosa.CounterMask)
-
-	for iter.Next() {
-		_, key, idx := unmarshalKey(iter.Key())
-		block, filter = unmarshalValue(iter.Value())
-		if key != pilosa.CounterMask {
-			if key != lastKey {
-				chunk = &pilosa.Chunk{key, pilosa.NewBlocks()}
-				bm.AddChunk(chunk)
-			}
-			chunk.Value[idx] = block
-		} else {
-			count = block
-		}
-
-		lastKey = key
-	}
-
-	statsd.SendTimer("leveldb_storage_Fetch", time.Since(start).Nanoseconds())
-
-	// Set bit count on bitmap.
-	bm.SetCount(uint64(count))
-
-	return bm, uint64(filter)
-}
-
-// beginBatch starts a new batch if one is not already started.
-func (s *Storage) beginBatch() {
-	if s.batch == nil {
-		s.batch = &leveldb.Batch{}
-	}
-	s.batchN++
-}
-
-func (s *Storage) endBatch() {
-	if s.batch == nil {
-		return
-	}
-
-	start := time.Now()
-	if time.Since(s.batchTime) > 15*time.Second || s.batchN > 300 {
-		s.Flush()
-	}
-	statsd.SendTimer("leveldb_storage_EndBatch", time.Since(start).Nanoseconds())
-}
-
-func (s *Storage) Flush() {
-	start := time.Now()
-
-	// Flush the batch if one exists.
-	if s.batch != nil {
-		s.db.Write(s.batch, nil)
-	}
-
-	// Clear batch and reset timer and count.
-	s.batch = nil
-	s.batchTime = time.Now()
-	s.batchN = 0
-
-	statsd.SendTimer("leveldb_storage_FlushBatch", time.Since(start).Nanoseconds())
-}
-
-// Store saves a bitmap to storage.
-func (s *Storage) Store(bitmapID uint64, db string, frame string, slice int, filter uint64, bm *pilosa.Bitmap) error {
-	s.beginBatch()
-
-	for itr := bm.ChunkIterator(); !itr.Limit(); itr = itr.Next() {
-		for idx, block := range itr.Item().Value {
-			if block != 0 {
-				s.StoreBlock(bitmapID, db, frame, slice, filter, itr.Item().Key, int32(idx), block)
-			}
-		}
-	}
-
-	s.StoreBlock(bitmapID, db, frame, slice, filter, pilosa.CounterMask, 0, bm.BitCount())
-
-	s.endBatch()
-	return nil
-}
-
-// StoreBlock saves a block to storage.
-func (s *Storage) StoreBlock(bitmapID uint64, db string, frame string, slice int, filter uint64, chunk uint64, index int32, block uint64) error {
-	start := time.Now()
-	s.batch.Put(marshalKey(bitmapID, chunk, uint8(index)), marshalValue(block, filter))
-	statsd.SendTimer("leveldb_storage_StoreBlock", time.Since(start).Nanoseconds())
-	return nil
-}
-
-// RemoveBlock deletes a block from storage. This is a no-op in the LevelDB store.
-func (s *Storage) RemoveBlock(bitmapID uint64, db string, frame string, slice int, chunk uint64, blockIndex int32) {
-}
-
-// StoreBit sets a bit in storage.
-func (s *Storage) StoreBit(bitmapID uint64, db string, frame string, slice int, filter uint64, bchunk uint64, blockIndex int32, bblock, count uint64) {
-	s.beginBatch()
-	s.StoreBlock(bitmapID, db, frame, slice, filter, bchunk, blockIndex, bblock)
-	s.StoreBlock(bitmapID, db, frame, slice, filter, pilosa.CounterMask, 0, count)
-	s.endBatch()
-}
-
-// RemoveBlock unsets a bit in storage. This is a no-op in the LevelDB store.
-func (s *Storage) RemoveBit(bitmapID uint64, db string, frame string, slice int, filter uint64, bchunk uint64, blockIndex int32, count uint64) {
-}
-
-// marshalKey encodes the id, chunk key, & block index to a byte slice.
-func marshalKey(id, key uint64, index uint8) []byte {
-	buf := new(bytes.Buffer)
-	binary.Write(buf, binary.LittleEndian, id)
-	binary.Write(buf, binary.LittleEndian, key)
-	binary.Write(buf, binary.LittleEndian, index)
-	return buf.Bytes()
-}
-
-// marshalValue encodes the block number and filter to a byte slice.
-func marshalValue(block, filter uint64) []byte {
-	buf := new(bytes.Buffer)
-	binary.Write(buf, binary.LittleEndian, block)
-	binary.Write(buf, binary.LittleEndian, filter)
-	return buf.Bytes()
-}
-
-// unmarshalKey decodes the id, chunk key, & block index from a byte slice.
-func unmarshalKey(v []byte) (id, key uint64, index uint8) {
-	buf := bytes.NewReader(v)
-	binary.Read(buf, binary.LittleEndian, &id)
-	binary.Read(buf, binary.LittleEndian, &key)
-	binary.Read(buf, binary.LittleEndian, &index)
-	return
-}
-
-// unmarshalValue decodes the block number and filter from a byte slice.
-func unmarshalValue(v []byte) (block, filter uint64) {
-	buf := bytes.NewReader(v)
-	binary.Read(buf, binary.LittleEndian, &block)
-	binary.Read(buf, binary.LittleEndian, &filter)
-	return
-}
diff --git a/storage/leveldb/leveldb_test.go b/storage/leveldb/leveldb_test.go
deleted file mode 100644
index e956078c8..000000000
--- a/storage/leveldb/leveldb_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package leveldb_test
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/storage/leveldb"
-	"github.com/umbel/pilosa/util"
-)
-
-func init() {
-	util.SetupStatsd()
-}
-
-func TestStorage_Fetch(t *testing.T) {
-	s := MustOpenStorage()
-	defer s.Close()
-}
-
-// Storage represents a test wrapper for leveldb.Storage.
-type Storage struct {
-	*leveldb.Storage
-}
-
-// NewStorage returns a new instance of Storage with a temporary path.
-func NewStorage() *Storage {
-	// Create temporary path.
-	f, err := ioutil.TempFile("", "pilosa-leveldb-")
-	if err != nil {
-		panic(err)
-	}
-	f.Close()
-	os.Remove(f.Name())
-
-	return &Storage{leveldb.NewStorage(pilosa.StorageOptions{
-		LevelDBPath: f.Name(),
-	})}
-}
-
-// MustOpenStorage returns a new, opened instance of Storage.
-func MustOpenStorage() *Storage {
-	s := NewStorage()
-	if err := s.Open(); err != nil {
-		panic(err)
-	}
-	return s
-}
-
-// Close closes the storage and removes the underlying data file.
-func (s *Storage) Close() error {
-	defer os.Remove(s.Path())
-	return s.Storage.Close()
-}
diff --git a/storage/mem/mem.go b/storage/mem/mem.go
deleted file mode 100644
index bf5bdbc82..000000000
--- a/storage/mem/mem.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package mem
-
-import (
-	"fmt"
-
-	"github.com/umbel/pilosa"
-)
-
-func init() {
-	pilosa.RegisterStorage("memory",
-		func(opt pilosa.StorageOptions) pilosa.Storage {
-			return NewStorage()
-		},
-	)
-}
-
-// Storage represents in-memory bitmap storage.
-type Storage struct {
-	db map[string]*pilosa.Bitmap
-}
-
-// NewStorage returns a new instance of Storage.
-func NewStorage() *Storage {
-	return &Storage{
-		db: make(map[string]*pilosa.Bitmap),
-	}
-}
-
-// Open initializes the storage.
-func (c *Storage) Open() error { return nil }
-
-// Close shuts down the storage.
-func (c *Storage) Close() error { return nil }
-
-// FlushBatch flushes the batch to disk. This is a no-op for in-memory storage.
-func (c *Storage) Flush() {}
-
-// Fetch retrieves a bitmap by id.
-func (c *Storage) Fetch(id uint64, db, frame string, slice int) (*pilosa.Bitmap, uint64) {
-	key := fmt.Sprintf("%d:%s:%s:%d", id, db, frame, slice)
-
-	// Find bitmap by key.
-	b, ok := c.db[key]
-	if ok {
-		return b, 0
-	}
-
-	// If the bitmap doesn't exist then create a new one.
-	b = pilosa.NewBitmap()
-	c.db[key] = b
-	return b, 0
-}
-
-// Store saves a bitmap to storage.
-// This is a no-op for in-memory storage because changes are stored in the cache.
-func (c *Storage) Store(id uint64, db, frame string, slice int, filter uint64, b *pilosa.Bitmap) error {
-	return nil
-}
-
-// StoreBlock saves a block to storage.
-// This is a no-op for in-memory storage because changes are stored in the cache.
-func (c *Storage) StoreBlock(id uint64, db, frame string, slice int, filter uint64, chunk_key uint64, block_index int32, block uint64) error {
-	return nil
-}
-
-// RemoveBlock deletes a block from bitmap.
-// This is a no-op for in-memory storage because changes are stored in the cache.
-func (self *Storage) RemoveBlock(id uint64, db string, frame string, slice int, chunk uint64, block_index int32) {
-}
-
-// StoreBit sets a bit in a bitmap.
-// This is a no-op for in-memory storage because changes are stored in the cache.
-func (self *Storage) StoreBit(id uint64, db string, frame string, slice int, filter uint64, bchunk uint64, block_index int32, bblock, count uint64) {
-}
-
-// RemoveBit unsets a bit in a bitmap.
-// This is a no-op for in-memory storage because changes are stored in the cache.
-func (self *Storage) RemoveBit(id uint64, db string, frame string, slice int, filter uint64, chunk uint64, block_index int32, count uint64) {
-}
diff --git a/storage/mem/mem_test.go b/storage/mem/mem_test.go
deleted file mode 100644
index 1c88e0577..000000000
--- a/storage/mem/mem_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package mem_test
-
-import (
-	"testing"
-
-	"github.com/umbel/pilosa/storage/mem"
-)
-
-// Ensure a bitmap can be retrieved from storage.
-func TestStorage_Fetch(t *testing.T) {
-	s := mem.NewStorage()
-
-	// Retrieving a non-existent bitmap should create a new one.
-	b, _ := s.Fetch(1, "d", "f", 0)
-	if b == nil {
-		t.Fatal("expected bitmap")
-	}
-
-	// Retrieve the bitmap again.
-	other, _ := s.Fetch(1, "d", "f", 0)
-	if b != other {
-		t.Fatal("expected same bitmap")
-	}
-
-	// Retrieving a different bitmap should return a different reference.
-	b2, _ := s.Fetch(2, "d", "f", 0)
-	if b == b2 {
-		t.Fatal("expected new bitmap")
-	}
-}
diff --git a/storage/storage.go b/storage/storage.go
deleted file mode 100644
index 8efbe5c3c..000000000
--- a/storage/storage.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package storage
-
-import (
-	_ "github.com/umbel/pilosa/storage/cassandra"
-	_ "github.com/umbel/pilosa/storage/leveldb"
-	_ "github.com/umbel/pilosa/storage/mem"
-)
diff --git a/timeframe.go b/timeframe.go
index 182adc272..22c75cc11 100644
--- a/timeframe.go
+++ b/timeframe.go
@@ -86,15 +86,18 @@ func NextMonth(start time.Time, end time.Time) bool {
 	nextMonth := start.AddDate(0, 1, 0)
 	return sameMonth(nextMonth, end) || end.After(nextMonth)
 }
+
 func sameDay(t1, t2 time.Time) bool {
 	y1, m1, d1 := t1.Date()
 	y2, m2, d2 := t2.Date()
 	return (y1 == y2) && (m1 == m2) && (d1 == d2)
 }
+
 func NextDay(start time.Time, end time.Time) bool {
 	nextDay := start.AddDate(0, 0, 1)
 	return sameDay(nextDay, end) || end.After(nextDay)
 }
+
 func GetRange(start_time time.Time, end_time time.Time, tile_id uint64) []uint64 {
 	results, marker := upHill(start_time, end_time, tile_id)
 	r2 := downHill(marker, end_time, tile_id)
@@ -142,8 +145,8 @@ func upHill(start_time time.Time, end_time time.Time, tile_id uint64) ([]uint64,
 	return results, time_iterator
 
 }
-func downHill(start_time time.Time, end_time time.Time, tile_id uint64) []uint64 {
 
+func downHill(start_time time.Time, end_time time.Time, tile_id uint64) []uint64 {
 	var results []uint64
 	time_iterator := start_time
 	for time_iterator.Before(end_time) {
diff --git a/transport/http.go b/transport/http.go
deleted file mode 100644
index eacbe1a74..000000000
--- a/transport/http.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package transport
-
-import (
-	"log"
-
-	"github.com/umbel/pilosa/db"
-)
-
-const DefaultHTTPPort = 15001
-
-type HttpTransport struct {
-	port   int
-	outbox chan *db.Message
-	done   chan int
-}
-
-func (trans *HttpTransport) Init() error {
-	log.Println("Bind to port", trans.port)
-	trans.done = make(chan int)
-	go trans.Loop()
-	return nil
-}
-
-func (trans *HttpTransport) Loop() {
-	var message *db.Message
-	for {
-		select {
-		case message = <-trans.outbox:
-			log.Println(message)
-		case <-trans.done:
-			return
-		}
-	}
-}
-
-func (trans *HttpTransport) Close() {
-	log.Println("Closing HTTP transport.")
-	trans.done <- 1
-}
-
-func (trans *HttpTransport) Send(node string, message *db.Message) error {
-	log.Println("Send", message, "to", node)
-	trans.outbox <- message
-	return nil
-}
-
-func (trans *HttpTransport) Receive() (*db.Message, error) {
-	return &db.Message{}, nil
-}
-
-func NewHttpTransport(port int) *HttpTransport {
-	trans := new(HttpTransport)
-	trans.port = port
-	trans.outbox = make(chan *db.Message, 10)
-	return trans
-}
diff --git a/transport/tcp.go b/transport/tcp.go
deleted file mode 100644
index 1afe6dcb5..000000000
--- a/transport/tcp.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package transport
-
-import (
-	"encoding/gob"
-	"fmt"
-	"net"
-	"os"
-	"time"
-
-	notify "github.com/bitly/go-notify"
-	log "github.com/cihub/seelog"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/core"
-	"github.com/umbel/pilosa/db"
-)
-
-const DefaultTCPPort = 12001
-
-type connection struct {
-	transport *TcpTransport
-	inbox     chan *db.Message
-	outbox    chan *db.Message
-	conn      *net.Conn
-	process   *pilosa.GUID
-}
-
-type newconnection struct {
-	id         *pilosa.GUID
-	connection *connection
-}
-
-func init() {
-	gob.Register(pilosa.GUID{})
-}
-
-func (self *connection) manage() {
-BeginManageConnection:
-	for {
-		if self.conn == nil {
-			process, err := self.transport.ProcessMap.GetProcess(self.process)
-			if err != nil {
-				log.Warn("transport/tcp: error getting process, retrying in 2 seconds... ", self.process, err)
-				time.Sleep(2 * time.Second)
-				continue
-			}
-			host_string := fmt.Sprintf("%s:%d", process.Host(), process.PortTcp())
-			conn, err := net.Dial("tcp", host_string)
-			if err != nil {
-				log.Warn("transport/tcp: error dialing: ", host_string, " Retrying in 2 seconds...")
-				time.Sleep(2 * time.Second)
-				continue
-			}
-			self.conn = &conn
-			go func() {
-				self.outbox <- &db.Message{Data: self.transport.ID.String()}
-			}()
-		}
-		encoder := gob.NewEncoder(*self.conn)
-		decoder := gob.NewDecoder(*self.conn)
-		var exit = make(chan int)
-		go func() {
-			for {
-				var mess *db.Message
-				err := decoder.Decode(&mess)
-				if err != nil {
-					log.Warn("transport/tcp: error decoding message: ", err.Error())
-					exit <- 1
-					return
-				}
-				self.inbox <- mess
-			}
-		}()
-		for {
-			select {
-			case message := <-self.outbox:
-				err := encoder.Encode(message)
-				if err != nil {
-					log.Warn(err.Error())
-					return
-				}
-			case message := <-self.inbox:
-				identifier, ok := message.Data.(pilosa.GUID)
-				if ok {
-					// message is connection registration; bypass inbox and register
-					self.process = &identifier
-					self.transport.reg <- &newconnection{&identifier, self}
-				} else {
-					self.transport.inbox <- message
-				}
-			case <-exit:
-				if self.process != nil {
-					self.conn = nil
-					continue BeginManageConnection
-				} else {
-					return
-				}
-			}
-		}
-	}
-}
-
-type TcpTransport struct {
-	inbox       chan *db.Message
-	outbox      chan db.Envelope
-	connections map[pilosa.GUID]*connection
-	reg         chan *newconnection
-
-	ID         pilosa.GUID
-	Port       int
-	ProcessMap *core.ProcessMap
-}
-
-func NewTcpTransport(id pilosa.GUID) *TcpTransport {
-	return &TcpTransport{
-		inbox:       make(chan *db.Message, 100),
-		outbox:      make(chan db.Envelope, 100),
-		connections: make(map[pilosa.GUID]*connection),
-		reg:         make(chan *newconnection),
-
-		ID:   id,
-		Port: DefaultTCPPort,
-	}
-}
-
-func (self *TcpTransport) Run() {
-	log.Warn("Initializing TCP transport")
-	go self.listen()
-	for {
-		select {
-		case env := <-self.outbox:
-			con, ok := self.connections[*(env.Host)]
-			if !ok {
-				con = &connection{self, make(chan *db.Message, 100), make(chan *db.Message, 100), nil, env.Host}
-				go con.manage()
-				self.connections[*env.Host] = con
-			}
-			con.outbox <- env.Message
-		case nc := <-self.reg:
-			self.connections[*nc.id] = nc.connection
-		}
-	}
-}
-
-func (self *TcpTransport) listen() {
-	port_string := fmt.Sprintf(":%d", self.Port)
-	l, e := net.Listen("tcp", port_string)
-	if e != nil {
-		log.Critical("Cannot bind to port! ", self.Port)
-		os.Exit(-1)
-	}
-	for {
-		conn, err := l.Accept()
-		if err != nil {
-			log.Warn("Error accepting, trying again in 2 sec... ", err)
-			time.Sleep(2 * time.Second)
-			continue
-		}
-		go self.manage(&conn)
-	}
-}
-
-func (self *TcpTransport) manage(conn *net.Conn) {
-	con := &connection{self, make(chan *db.Message, 1024), make(chan *db.Message, 1024), conn, nil}
-	con.manage()
-}
-
-func (self *TcpTransport) Close() {
-	log.Warn("Shutting down TCP transport")
-}
-
-func (self *TcpTransport) Send(message *db.Message, host *pilosa.GUID) {
-	log.Trace("TcpTransport.Send", message, host)
-	envelope := db.Envelope{Message: message, Host: host}
-	notify.Post("outbox", &envelope)
-	self.outbox <- envelope
-}
-
-func (self *TcpTransport) Receive() *db.Message {
-	log.Trace("TcpTransport.Receive")
-	message := <-self.inbox
-	notify.Post("inbox", message)
-	return message
-}
-
-func (self *TcpTransport) Push(message *db.Message) {
-	self.inbox <- message
-}
diff --git a/util.go b/util.go
deleted file mode 100644
index 8becf9a5f..000000000
--- a/util.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package pilosa
-
-import (
-	"io"
-	"os"
-	"strings"
-
-	"github.com/kr/s3/s3util"
-)
-
-func openFile(s string) (io.ReadCloser, error) {
-	if isURL(s) {
-		return s3util.Open(s, nil)
-	}
-	return os.Open(s)
-}
-
-func createFile(s string) (io.WriteCloser, error) {
-	if isURL(s) {
-		return s3util.Create(s, nil, nil)
-	}
-	return os.Create(s)
-}
-
-func isURL(s string) bool {
-	return strings.HasPrefix(s, "http://") || strings.HasPrefix(s, "https://")
-}
diff --git a/vendor/github.com/BurntSushi/toml/decode_test.go b/vendor/github.com/BurntSushi/toml/decode_test.go
deleted file mode 100644
index 3805931f2..000000000
--- a/vendor/github.com/BurntSushi/toml/decode_test.go
+++ /dev/null
@@ -1,950 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"log"
-	"reflect"
-	"testing"
-	"time"
-)
-
-func init() {
-	log.SetFlags(0)
-}
-
-func TestDecodeSimple(t *testing.T) {
-	var testSimple = `
-age = 250
-andrew = "gallant"
-kait = "brady"
-now = 1987-07-05T05:45:00Z
-yesOrNo = true
-pi = 3.14
-colors = [
-	["red", "green", "blue"],
-	["cyan", "magenta", "yellow", "black"],
-]
-
-[My.Cats]
-plato = "cat 1"
-cauchy = "cat 2"
-`
-
-	type cats struct {
-		Plato  string
-		Cauchy string
-	}
-	type simple struct {
-		Age     int
-		Colors  [][]string
-		Pi      float64
-		YesOrNo bool
-		Now     time.Time
-		Andrew  string
-		Kait    string
-		My      map[string]cats
-	}
-
-	var val simple
-	_, err := Decode(testSimple, &val)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	now, err := time.Parse("2006-01-02T15:04:05", "1987-07-05T05:45:00")
-	if err != nil {
-		panic(err)
-	}
-	var answer = simple{
-		Age:     250,
-		Andrew:  "gallant",
-		Kait:    "brady",
-		Now:     now,
-		YesOrNo: true,
-		Pi:      3.14,
-		Colors: [][]string{
-			{"red", "green", "blue"},
-			{"cyan", "magenta", "yellow", "black"},
-		},
-		My: map[string]cats{
-			"Cats": cats{Plato: "cat 1", Cauchy: "cat 2"},
-		},
-	}
-	if !reflect.DeepEqual(val, answer) {
-		t.Fatalf("Expected\n-----\n%#v\n-----\nbut got\n-----\n%#v\n",
-			answer, val)
-	}
-}
-
-func TestDecodeEmbedded(t *testing.T) {
-	type Dog struct{ Name string }
-	type Age int
-
-	tests := map[string]struct {
-		input       string
-		decodeInto  interface{}
-		wantDecoded interface{}
-	}{
-		"embedded struct": {
-			input:       `Name = "milton"`,
-			decodeInto:  &struct{ Dog }{},
-			wantDecoded: &struct{ Dog }{Dog{"milton"}},
-		},
-		"embedded non-nil pointer to struct": {
-			input:       `Name = "milton"`,
-			decodeInto:  &struct{ *Dog }{},
-			wantDecoded: &struct{ *Dog }{&Dog{"milton"}},
-		},
-		"embedded nil pointer to struct": {
-			input:       ``,
-			decodeInto:  &struct{ *Dog }{},
-			wantDecoded: &struct{ *Dog }{nil},
-		},
-		"embedded int": {
-			input:       `Age = -5`,
-			decodeInto:  &struct{ Age }{},
-			wantDecoded: &struct{ Age }{-5},
-		},
-	}
-
-	for label, test := range tests {
-		_, err := Decode(test.input, test.decodeInto)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(test.wantDecoded, test.decodeInto) {
-			t.Errorf("%s: want decoded == %+v, got %+v",
-				label, test.wantDecoded, test.decodeInto)
-		}
-	}
-}
-
-func TestTableArrays(t *testing.T) {
-	var tomlTableArrays = `
-[[albums]]
-name = "Born to Run"
-
-  [[albums.songs]]
-  name = "Jungleland"
-
-  [[albums.songs]]
-  name = "Meeting Across the River"
-
-[[albums]]
-name = "Born in the USA"
-
-  [[albums.songs]]
-  name = "Glory Days"
-
-  [[albums.songs]]
-  name = "Dancing in the Dark"
-`
-
-	type Song struct {
-		Name string
-	}
-
-	type Album struct {
-		Name  string
-		Songs []Song
-	}
-
-	type Music struct {
-		Albums []Album
-	}
-
-	expected := Music{[]Album{
-		{"Born to Run", []Song{{"Jungleland"}, {"Meeting Across the River"}}},
-		{"Born in the USA", []Song{{"Glory Days"}, {"Dancing in the Dark"}}},
-	}}
-	var got Music
-	if _, err := Decode(tomlTableArrays, &got); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expected, got) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
-	}
-}
-
-// Case insensitive matching tests.
-// A bit more comprehensive than needed given the current implementation,
-// but implementations change.
-// Probably still missing demonstrations of some ugly corner cases regarding
-// case insensitive matching and multiple fields.
-func TestCase(t *testing.T) {
-	var caseToml = `
-tOpString = "string"
-tOpInt = 1
-tOpFloat = 1.1
-tOpBool = true
-tOpdate = 2006-01-02T15:04:05Z
-tOparray = [ "array" ]
-Match = "i should be in Match only"
-MatcH = "i should be in MatcH only"
-once = "just once"
-[nEst.eD]
-nEstedString = "another string"
-`
-
-	type InsensitiveEd struct {
-		NestedString string
-	}
-
-	type InsensitiveNest struct {
-		Ed InsensitiveEd
-	}
-
-	type Insensitive struct {
-		TopString string
-		TopInt    int
-		TopFloat  float64
-		TopBool   bool
-		TopDate   time.Time
-		TopArray  []string
-		Match     string
-		MatcH     string
-		Once      string
-		OncE      string
-		Nest      InsensitiveNest
-	}
-
-	tme, err := time.Parse(time.RFC3339, time.RFC3339[:len(time.RFC3339)-5])
-	if err != nil {
-		panic(err)
-	}
-	expected := Insensitive{
-		TopString: "string",
-		TopInt:    1,
-		TopFloat:  1.1,
-		TopBool:   true,
-		TopDate:   tme,
-		TopArray:  []string{"array"},
-		MatcH:     "i should be in MatcH only",
-		Match:     "i should be in Match only",
-		Once:      "just once",
-		OncE:      "",
-		Nest: InsensitiveNest{
-			Ed: InsensitiveEd{NestedString: "another string"},
-		},
-	}
-	var got Insensitive
-	if _, err := Decode(caseToml, &got); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expected, got) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, got)
-	}
-}
-
-func TestPointers(t *testing.T) {
-	type Object struct {
-		Type        string
-		Description string
-	}
-
-	type Dict struct {
-		NamedObject map[string]*Object
-		BaseObject  *Object
-		Strptr      *string
-		Strptrs     []*string
-	}
-	s1, s2, s3 := "blah", "abc", "def"
-	expected := &Dict{
-		Strptr:  &s1,
-		Strptrs: []*string{&s2, &s3},
-		NamedObject: map[string]*Object{
-			"foo": {"FOO", "fooooo!!!"},
-			"bar": {"BAR", "ba-ba-ba-ba-barrrr!!!"},
-		},
-		BaseObject: &Object{"BASE", "da base"},
-	}
-
-	ex1 := `
-Strptr = "blah"
-Strptrs = ["abc", "def"]
-
-[NamedObject.foo]
-Type = "FOO"
-Description = "fooooo!!!"
-
-[NamedObject.bar]
-Type = "BAR"
-Description = "ba-ba-ba-ba-barrrr!!!"
-
-[BaseObject]
-Type = "BASE"
-Description = "da base"
-`
-	dict := new(Dict)
-	_, err := Decode(ex1, dict)
-	if err != nil {
-		t.Errorf("Decode error: %v", err)
-	}
-	if !reflect.DeepEqual(expected, dict) {
-		t.Fatalf("\n%#v\n!=\n%#v\n", expected, dict)
-	}
-}
-
-type sphere struct {
-	Center [3]float64
-	Radius float64
-}
-
-func TestDecodeSimpleArray(t *testing.T) {
-	var s1 sphere
-	if _, err := Decode(`center = [0.0, 1.5, 0.0]`, &s1); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDecodeArrayWrongSize(t *testing.T) {
-	var s1 sphere
-	if _, err := Decode(`center = [0.1, 2.3]`, &s1); err == nil {
-		t.Fatal("Expected array type mismatch error")
-	}
-}
-
-func TestDecodeLargeIntoSmallInt(t *testing.T) {
-	type table struct {
-		Value int8
-	}
-	var tab table
-	if _, err := Decode(`value = 500`, &tab); err == nil {
-		t.Fatal("Expected integer out-of-bounds error.")
-	}
-}
-
-func TestDecodeSizedInts(t *testing.T) {
-	type table struct {
-		U8  uint8
-		U16 uint16
-		U32 uint32
-		U64 uint64
-		U   uint
-		I8  int8
-		I16 int16
-		I32 int32
-		I64 int64
-		I   int
-	}
-	answer := table{1, 1, 1, 1, 1, -1, -1, -1, -1, -1}
-	toml := `
-	u8 = 1
-	u16 = 1
-	u32 = 1
-	u64 = 1
-	u = 1
-	i8 = -1
-	i16 = -1
-	i32 = -1
-	i64 = -1
-	i = -1
-	`
-	var tab table
-	if _, err := Decode(toml, &tab); err != nil {
-		t.Fatal(err.Error())
-	}
-	if answer != tab {
-		t.Fatalf("Expected %#v but got %#v", answer, tab)
-	}
-}
-
-func TestUnmarshaler(t *testing.T) {
-
-	var tomlBlob = `
-[dishes.hamboogie]
-name = "Hamboogie with fries"
-price = 10.99
-
-[[dishes.hamboogie.ingredients]]
-name = "Bread Bun"
-
-[[dishes.hamboogie.ingredients]]
-name = "Lettuce"
-
-[[dishes.hamboogie.ingredients]]
-name = "Real Beef Patty"
-
-[[dishes.hamboogie.ingredients]]
-name = "Tomato"
-
-[dishes.eggsalad]
-name = "Egg Salad with rice"
-price = 3.99
-
-[[dishes.eggsalad.ingredients]]
-name = "Egg"
-
-[[dishes.eggsalad.ingredients]]
-name = "Mayo"
-
-[[dishes.eggsalad.ingredients]]
-name = "Rice"
-`
-	m := &menu{}
-	if _, err := Decode(tomlBlob, m); err != nil {
-		log.Fatal(err)
-	}
-
-	if len(m.Dishes) != 2 {
-		t.Log("two dishes should be loaded with UnmarshalTOML()")
-		t.Errorf("expected %d but got %d", 2, len(m.Dishes))
-	}
-
-	eggSalad := m.Dishes["eggsalad"]
-	if _, ok := interface{}(eggSalad).(dish); !ok {
-		t.Errorf("expected a dish")
-	}
-
-	if eggSalad.Name != "Egg Salad with rice" {
-		t.Errorf("expected the dish to be named 'Egg Salad with rice'")
-	}
-
-	if len(eggSalad.Ingredients) != 3 {
-		t.Log("dish should be loaded with UnmarshalTOML()")
-		t.Errorf("expected %d but got %d", 3, len(eggSalad.Ingredients))
-	}
-
-	found := false
-	for _, i := range eggSalad.Ingredients {
-		if i.Name == "Rice" {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Error("Rice was not loaded in UnmarshalTOML()")
-	}
-
-	// test on a value - must be passed as *
-	o := menu{}
-	if _, err := Decode(tomlBlob, &o); err != nil {
-		log.Fatal(err)
-	}
-
-}
-
-type menu struct {
-	Dishes map[string]dish
-}
-
-func (m *menu) UnmarshalTOML(p interface{}) error {
-	m.Dishes = make(map[string]dish)
-	data, _ := p.(map[string]interface{})
-	dishes := data["dishes"].(map[string]interface{})
-	for n, v := range dishes {
-		if d, ok := v.(map[string]interface{}); ok {
-			nd := dish{}
-			nd.UnmarshalTOML(d)
-			m.Dishes[n] = nd
-		} else {
-			return fmt.Errorf("not a dish")
-		}
-	}
-	return nil
-}
-
-type dish struct {
-	Name        string
-	Price       float32
-	Ingredients []ingredient
-}
-
-func (d *dish) UnmarshalTOML(p interface{}) error {
-	data, _ := p.(map[string]interface{})
-	d.Name, _ = data["name"].(string)
-	d.Price, _ = data["price"].(float32)
-	ingredients, _ := data["ingredients"].([]map[string]interface{})
-	for _, e := range ingredients {
-		n, _ := interface{}(e).(map[string]interface{})
-		name, _ := n["name"].(string)
-		i := ingredient{name}
-		d.Ingredients = append(d.Ingredients, i)
-	}
-	return nil
-}
-
-type ingredient struct {
-	Name string
-}
-
-func ExampleMetaData_PrimitiveDecode() {
-	var md MetaData
-	var err error
-
-	var tomlBlob = `
-ranking = ["Springsteen", "J Geils"]
-
-[bands.Springsteen]
-started = 1973
-albums = ["Greetings", "WIESS", "Born to Run", "Darkness"]
-
-[bands."J Geils"]
-started = 1970
-albums = ["The J. Geils Band", "Full House", "Blow Your Face Out"]
-`
-
-	type band struct {
-		Started int
-		Albums  []string
-	}
-	type classics struct {
-		Ranking []string
-		Bands   map[string]Primitive
-	}
-
-	// Do the initial decode. Reflection is delayed on Primitive values.
-	var music classics
-	if md, err = Decode(tomlBlob, &music); err != nil {
-		log.Fatal(err)
-	}
-
-	// MetaData still includes information on Primitive values.
-	fmt.Printf("Is `bands.Springsteen` defined? %v\n",
-		md.IsDefined("bands", "Springsteen"))
-
-	// Decode primitive data into Go values.
-	for _, artist := range music.Ranking {
-		// A band is a primitive value, so we need to decode it to get a
-		// real `band` value.
-		primValue := music.Bands[artist]
-
-		var aBand band
-		if err = md.PrimitiveDecode(primValue, &aBand); err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s started in %d.\n", artist, aBand.Started)
-	}
-	// Check to see if there were any fields left undecoded.
-	// Note that this won't be empty before decoding the Primitive value!
-	fmt.Printf("Undecoded: %q\n", md.Undecoded())
-
-	// Output:
-	// Is `bands.Springsteen` defined? true
-	// Springsteen started in 1973.
-	// J Geils started in 1970.
-	// Undecoded: []
-}
-
-func ExampleDecode() {
-	var tomlBlob = `
-# Some comments.
-[alpha]
-ip = "10.0.0.1"
-
-	[alpha.config]
-	Ports = [ 8001, 8002 ]
-	Location = "Toronto"
-	Created = 1987-07-05T05:45:00Z
-
-[beta]
-ip = "10.0.0.2"
-
-	[beta.config]
-	Ports = [ 9001, 9002 ]
-	Location = "New Jersey"
-	Created = 1887-01-05T05:55:00Z
-`
-
-	type serverConfig struct {
-		Ports    []int
-		Location string
-		Created  time.Time
-	}
-
-	type server struct {
-		IP     string       `toml:"ip"`
-		Config serverConfig `toml:"config"`
-	}
-
-	type servers map[string]server
-
-	var config servers
-	if _, err := Decode(tomlBlob, &config); err != nil {
-		log.Fatal(err)
-	}
-
-	for _, name := range []string{"alpha", "beta"} {
-		s := config[name]
-		fmt.Printf("Server: %s (ip: %s) in %s created on %s\n",
-			name, s.IP, s.Config.Location,
-			s.Config.Created.Format("2006-01-02"))
-		fmt.Printf("Ports: %v\n", s.Config.Ports)
-	}
-
-	// Output:
-	// Server: alpha (ip: 10.0.0.1) in Toronto created on 1987-07-05
-	// Ports: [8001 8002]
-	// Server: beta (ip: 10.0.0.2) in New Jersey created on 1887-01-05
-	// Ports: [9001 9002]
-}
-
-type duration struct {
-	time.Duration
-}
-
-func (d *duration) UnmarshalText(text []byte) error {
-	var err error
-	d.Duration, err = time.ParseDuration(string(text))
-	return err
-}
-
-// Example Unmarshaler shows how to decode TOML strings into your own
-// custom data type.
-func Example_unmarshaler() {
-	blob := `
-[[song]]
-name = "Thunder Road"
-duration = "4m49s"
-
-[[song]]
-name = "Stairway to Heaven"
-duration = "8m03s"
-`
-	type song struct {
-		Name     string
-		Duration duration
-	}
-	type songs struct {
-		Song []song
-	}
-	var favorites songs
-	if _, err := Decode(blob, &favorites); err != nil {
-		log.Fatal(err)
-	}
-
-	// Code to implement the TextUnmarshaler interface for `duration`:
-	//
-	// type duration struct {
-	// 	time.Duration
-	// }
-	//
-	// func (d *duration) UnmarshalText(text []byte) error {
-	// 	var err error
-	// 	d.Duration, err = time.ParseDuration(string(text))
-	// 	return err
-	// }
-
-	for _, s := range favorites.Song {
-		fmt.Printf("%s (%s)\n", s.Name, s.Duration)
-	}
-	// Output:
-	// Thunder Road (4m49s)
-	// Stairway to Heaven (8m3s)
-}
-
-// Example StrictDecoding shows how to detect whether there are keys in the
-// TOML document that weren't decoded into the value given. This is useful
-// for returning an error to the user if they've included extraneous fields
-// in their configuration.
-func Example_strictDecoding() {
-	var blob = `
-key1 = "value1"
-key2 = "value2"
-key3 = "value3"
-`
-	type config struct {
-		Key1 string
-		Key3 string
-	}
-
-	var conf config
-	md, err := Decode(blob, &conf)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Undecoded keys: %q\n", md.Undecoded())
-	// Output:
-	// Undecoded keys: ["key2"]
-}
-
-// Example UnmarshalTOML shows how to implement a struct type that knows how to
-// unmarshal itself. The struct must take full responsibility for mapping the
-// values passed into the struct. The method may be used with interfaces in a
-// struct in cases where the actual type is not known until the data is
-// examined.
-func Example_unmarshalTOML() {
-
-	var blob = `
-[[parts]]
-type = "valve"
-id = "valve-1"
-size = 1.2
-rating = 4
-
-[[parts]]
-type = "valve"
-id = "valve-2"
-size = 2.1
-rating = 5
-
-[[parts]]
-type = "pipe"
-id = "pipe-1"
-length = 2.1
-diameter = 12
-
-[[parts]]
-type = "cable"
-id = "cable-1"
-length = 12
-rating = 3.1
-`
-	o := &order{}
-	err := Unmarshal([]byte(blob), o)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(len(o.parts))
-
-	for _, part := range o.parts {
-		fmt.Println(part.Name())
-	}
-
-	// Code to implement UmarshalJSON.
-
-	// type order struct {
-	// 	// NOTE `order.parts` is a private slice of type `part` which is an
-	// 	// interface and may only be loaded from toml using the
-	// 	// UnmarshalTOML() method of the Umarshaler interface.
-	// 	parts parts
-	// }
-
-	// func (o *order) UnmarshalTOML(data interface{}) error {
-
-	// 	// NOTE the example below contains detailed type casting to show how
-	// 	// the 'data' is retrieved. In operational use, a type cast wrapper
-	// 	// may be prefered e.g.
-	// 	//
-	// 	// func AsMap(v interface{}) (map[string]interface{}, error) {
-	// 	// 		return v.(map[string]interface{})
-	// 	// }
-	// 	//
-	// 	// resulting in:
-	// 	// d, _ := AsMap(data)
-	// 	//
-
-	// 	d, _ := data.(map[string]interface{})
-	// 	parts, _ := d["parts"].([]map[string]interface{})
-
-	// 	for _, p := range parts {
-
-	// 		typ, _ := p["type"].(string)
-	// 		id, _ := p["id"].(string)
-
-	// 		// detect the type of part and handle each case
-	// 		switch p["type"] {
-	// 		case "valve":
-
-	// 			size := float32(p["size"].(float64))
-	// 			rating := int(p["rating"].(int64))
-
-	// 			valve := &valve{
-	// 				Type:   typ,
-	// 				ID:     id,
-	// 				Size:   size,
-	// 				Rating: rating,
-	// 			}
-
-	// 			o.parts = append(o.parts, valve)
-
-	// 		case "pipe":
-
-	// 			length := float32(p["length"].(float64))
-	// 			diameter := int(p["diameter"].(int64))
-
-	// 			pipe := &pipe{
-	// 				Type:     typ,
-	// 				ID:       id,
-	// 				Length:   length,
-	// 				Diameter: diameter,
-	// 			}
-
-	// 			o.parts = append(o.parts, pipe)
-
-	// 		case "cable":
-
-	// 			length := int(p["length"].(int64))
-	// 			rating := float32(p["rating"].(float64))
-
-	// 			cable := &cable{
-	// 				Type:   typ,
-	// 				ID:     id,
-	// 				Length: length,
-	// 				Rating: rating,
-	// 			}
-
-	// 			o.parts = append(o.parts, cable)
-
-	// 		}
-	// 	}
-
-	// 	return nil
-	// }
-
-	// type parts []part
-
-	// type part interface {
-	// 	Name() string
-	// }
-
-	// type valve struct {
-	// 	Type   string
-	// 	ID     string
-	// 	Size   float32
-	// 	Rating int
-	// }
-
-	// func (v *valve) Name() string {
-	// 	return fmt.Sprintf("VALVE: %s", v.ID)
-	// }
-
-	// type pipe struct {
-	// 	Type     string
-	// 	ID       string
-	// 	Length   float32
-	// 	Diameter int
-	// }
-
-	// func (p *pipe) Name() string {
-	// 	return fmt.Sprintf("PIPE: %s", p.ID)
-	// }
-
-	// type cable struct {
-	// 	Type   string
-	// 	ID     string
-	// 	Length int
-	// 	Rating float32
-	// }
-
-	// func (c *cable) Name() string {
-	// 	return fmt.Sprintf("CABLE: %s", c.ID)
-	// }
-
-	// Output:
-	// 4
-	// VALVE: valve-1
-	// VALVE: valve-2
-	// PIPE: pipe-1
-	// CABLE: cable-1
-
-}
-
-type order struct {
-	// NOTE `order.parts` is a private slice of type `part` which is an
-	// interface and may only be loaded from toml using the UnmarshalTOML()
-	// method of the Umarshaler interface.
-	parts parts
-}
-
-func (o *order) UnmarshalTOML(data interface{}) error {
-
-	// NOTE the example below contains detailed type casting to show how
-	// the 'data' is retrieved. In operational use, a type cast wrapper
-	// may be prefered e.g.
-	//
-	// func AsMap(v interface{}) (map[string]interface{}, error) {
-	// 		return v.(map[string]interface{})
-	// }
-	//
-	// resulting in:
-	// d, _ := AsMap(data)
-	//
-
-	d, _ := data.(map[string]interface{})
-	parts, _ := d["parts"].([]map[string]interface{})
-
-	for _, p := range parts {
-
-		typ, _ := p["type"].(string)
-		id, _ := p["id"].(string)
-
-		// detect the type of part and handle each case
-		switch p["type"] {
-		case "valve":
-
-			size := float32(p["size"].(float64))
-			rating := int(p["rating"].(int64))
-
-			valve := &valve{
-				Type:   typ,
-				ID:     id,
-				Size:   size,
-				Rating: rating,
-			}
-
-			o.parts = append(o.parts, valve)
-
-		case "pipe":
-
-			length := float32(p["length"].(float64))
-			diameter := int(p["diameter"].(int64))
-
-			pipe := &pipe{
-				Type:     typ,
-				ID:       id,
-				Length:   length,
-				Diameter: diameter,
-			}
-
-			o.parts = append(o.parts, pipe)
-
-		case "cable":
-
-			length := int(p["length"].(int64))
-			rating := float32(p["rating"].(float64))
-
-			cable := &cable{
-				Type:   typ,
-				ID:     id,
-				Length: length,
-				Rating: rating,
-			}
-
-			o.parts = append(o.parts, cable)
-
-		}
-	}
-
-	return nil
-}
-
-type parts []part
-
-type part interface {
-	Name() string
-}
-
-type valve struct {
-	Type   string
-	ID     string
-	Size   float32
-	Rating int
-}
-
-func (v *valve) Name() string {
-	return fmt.Sprintf("VALVE: %s", v.ID)
-}
-
-type pipe struct {
-	Type     string
-	ID       string
-	Length   float32
-	Diameter int
-}
-
-func (p *pipe) Name() string {
-	return fmt.Sprintf("PIPE: %s", p.ID)
-}
-
-type cable struct {
-	Type   string
-	ID     string
-	Length int
-	Rating float32
-}
-
-func (c *cable) Name() string {
-	return fmt.Sprintf("CABLE: %s", c.ID)
-}
diff --git a/vendor/github.com/BurntSushi/toml/encode_test.go b/vendor/github.com/BurntSushi/toml/encode_test.go
deleted file mode 100644
index 445ca8e21..000000000
--- a/vendor/github.com/BurntSushi/toml/encode_test.go
+++ /dev/null
@@ -1,542 +0,0 @@
-package toml
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"net"
-	"testing"
-	"time"
-)
-
-func TestEncodeRoundTrip(t *testing.T) {
-	type Config struct {
-		Age        int
-		Cats       []string
-		Pi         float64
-		Perfection []int
-		DOB        time.Time
-		Ipaddress  net.IP
-	}
-
-	var inputs = Config{
-		13,
-		[]string{"one", "two", "three"},
-		3.145,
-		[]int{11, 2, 3, 4},
-		time.Now(),
-		net.ParseIP("192.168.59.254"),
-	}
-
-	var firstBuffer bytes.Buffer
-	e := NewEncoder(&firstBuffer)
-	err := e.Encode(inputs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var outputs Config
-	if _, err := Decode(firstBuffer.String(), &outputs); err != nil {
-		log.Printf("Could not decode:\n-----\n%s\n-----\n",
-			firstBuffer.String())
-		t.Fatal(err)
-	}
-
-	// could test each value individually, but I'm lazy
-	var secondBuffer bytes.Buffer
-	e2 := NewEncoder(&secondBuffer)
-	err = e2.Encode(outputs)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if firstBuffer.String() != secondBuffer.String() {
-		t.Error(
-			firstBuffer.String(),
-			"\n\n is not identical to\n\n",
-			secondBuffer.String())
-	}
-}
-
-// XXX(burntsushi)
-// I think these tests probably should be removed. They are good, but they
-// ought to be obsolete by toml-test.
-func TestEncode(t *testing.T) {
-	type Embedded struct {
-		Int int `toml:"_int"`
-	}
-	type NonStruct int
-
-	date := time.Date(2014, 5, 11, 20, 30, 40, 0, time.FixedZone("IST", 3600))
-	dateStr := "2014-05-11T19:30:40Z"
-
-	tests := map[string]struct {
-		input      interface{}
-		wantOutput string
-		wantError  error
-	}{
-		"bool field": {
-			input: struct {
-				BoolTrue  bool
-				BoolFalse bool
-			}{true, false},
-			wantOutput: "BoolTrue = true\nBoolFalse = false\n",
-		},
-		"int fields": {
-			input: struct {
-				Int   int
-				Int8  int8
-				Int16 int16
-				Int32 int32
-				Int64 int64
-			}{1, 2, 3, 4, 5},
-			wantOutput: "Int = 1\nInt8 = 2\nInt16 = 3\nInt32 = 4\nInt64 = 5\n",
-		},
-		"uint fields": {
-			input: struct {
-				Uint   uint
-				Uint8  uint8
-				Uint16 uint16
-				Uint32 uint32
-				Uint64 uint64
-			}{1, 2, 3, 4, 5},
-			wantOutput: "Uint = 1\nUint8 = 2\nUint16 = 3\nUint32 = 4" +
-				"\nUint64 = 5\n",
-		},
-		"float fields": {
-			input: struct {
-				Float32 float32
-				Float64 float64
-			}{1.5, 2.5},
-			wantOutput: "Float32 = 1.5\nFloat64 = 2.5\n",
-		},
-		"string field": {
-			input:      struct{ String string }{"foo"},
-			wantOutput: "String = \"foo\"\n",
-		},
-		"string field and unexported field": {
-			input: struct {
-				String     string
-				unexported int
-			}{"foo", 0},
-			wantOutput: "String = \"foo\"\n",
-		},
-		"datetime field in UTC": {
-			input:      struct{ Date time.Time }{date},
-			wantOutput: fmt.Sprintf("Date = %s\n", dateStr),
-		},
-		"datetime field as primitive": {
-			// Using a map here to fail if isStructOrMap() returns true for
-			// time.Time.
-			input: map[string]interface{}{
-				"Date": date,
-				"Int":  1,
-			},
-			wantOutput: fmt.Sprintf("Date = %s\nInt = 1\n", dateStr),
-		},
-		"array fields": {
-			input: struct {
-				IntArray0 [0]int
-				IntArray3 [3]int
-			}{[0]int{}, [3]int{1, 2, 3}},
-			wantOutput: "IntArray0 = []\nIntArray3 = [1, 2, 3]\n",
-		},
-		"slice fields": {
-			input: struct{ IntSliceNil, IntSlice0, IntSlice3 []int }{
-				nil, []int{}, []int{1, 2, 3},
-			},
-			wantOutput: "IntSlice0 = []\nIntSlice3 = [1, 2, 3]\n",
-		},
-		"datetime slices": {
-			input: struct{ DatetimeSlice []time.Time }{
-				[]time.Time{date, date},
-			},
-			wantOutput: fmt.Sprintf("DatetimeSlice = [%s, %s]\n",
-				dateStr, dateStr),
-		},
-		"nested arrays and slices": {
-			input: struct {
-				SliceOfArrays         [][2]int
-				ArrayOfSlices         [2][]int
-				SliceOfArraysOfSlices [][2][]int
-				ArrayOfSlicesOfArrays [2][][2]int
-				SliceOfMixedArrays    [][2]interface{}
-				ArrayOfMixedSlices    [2][]interface{}
-			}{
-				[][2]int{{1, 2}, {3, 4}},
-				[2][]int{{1, 2}, {3, 4}},
-				[][2][]int{
-					{
-						{1, 2}, {3, 4},
-					},
-					{
-						{5, 6}, {7, 8},
-					},
-				},
-				[2][][2]int{
-					{
-						{1, 2}, {3, 4},
-					},
-					{
-						{5, 6}, {7, 8},
-					},
-				},
-				[][2]interface{}{
-					{1, 2}, {"a", "b"},
-				},
-				[2][]interface{}{
-					{1, 2}, {"a", "b"},
-				},
-			},
-			wantOutput: `SliceOfArrays = [[1, 2], [3, 4]]
-ArrayOfSlices = [[1, 2], [3, 4]]
-SliceOfArraysOfSlices = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-ArrayOfSlicesOfArrays = [[[1, 2], [3, 4]], [[5, 6], [7, 8]]]
-SliceOfMixedArrays = [[1, 2], ["a", "b"]]
-ArrayOfMixedSlices = [[1, 2], ["a", "b"]]
-`,
-		},
-		"empty slice": {
-			input:      struct{ Empty []interface{} }{[]interface{}{}},
-			wantOutput: "Empty = []\n",
-		},
-		"(error) slice with element type mismatch (string and integer)": {
-			input:     struct{ Mixed []interface{} }{[]interface{}{1, "a"}},
-			wantError: errArrayMixedElementTypes,
-		},
-		"(error) slice with element type mismatch (integer and float)": {
-			input:     struct{ Mixed []interface{} }{[]interface{}{1, 2.5}},
-			wantError: errArrayMixedElementTypes,
-		},
-		"slice with elems of differing Go types, same TOML types": {
-			input: struct {
-				MixedInts   []interface{}
-				MixedFloats []interface{}
-			}{
-				[]interface{}{
-					int(1), int8(2), int16(3), int32(4), int64(5),
-					uint(1), uint8(2), uint16(3), uint32(4), uint64(5),
-				},
-				[]interface{}{float32(1.5), float64(2.5)},
-			},
-			wantOutput: "MixedInts = [1, 2, 3, 4, 5, 1, 2, 3, 4, 5]\n" +
-				"MixedFloats = [1.5, 2.5]\n",
-		},
-		"(error) slice w/ element type mismatch (one is nested array)": {
-			input: struct{ Mixed []interface{} }{
-				[]interface{}{1, []interface{}{2}},
-			},
-			wantError: errArrayMixedElementTypes,
-		},
-		"(error) slice with 1 nil element": {
-			input:     struct{ NilElement1 []interface{} }{[]interface{}{nil}},
-			wantError: errArrayNilElement,
-		},
-		"(error) slice with 1 nil element (and other non-nil elements)": {
-			input: struct{ NilElement []interface{} }{
-				[]interface{}{1, nil},
-			},
-			wantError: errArrayNilElement,
-		},
-		"simple map": {
-			input:      map[string]int{"a": 1, "b": 2},
-			wantOutput: "a = 1\nb = 2\n",
-		},
-		"map with interface{} value type": {
-			input:      map[string]interface{}{"a": 1, "b": "c"},
-			wantOutput: "a = 1\nb = \"c\"\n",
-		},
-		"map with interface{} value type, some of which are structs": {
-			input: map[string]interface{}{
-				"a": struct{ Int int }{2},
-				"b": 1,
-			},
-			wantOutput: "b = 1\n\n[a]\n  Int = 2\n",
-		},
-		"nested map": {
-			input: map[string]map[string]int{
-				"a": {"b": 1},
-				"c": {"d": 2},
-			},
-			wantOutput: "[a]\n  b = 1\n\n[c]\n  d = 2\n",
-		},
-		"nested struct": {
-			input: struct{ Struct struct{ Int int } }{
-				struct{ Int int }{1},
-			},
-			wantOutput: "[Struct]\n  Int = 1\n",
-		},
-		"nested struct and non-struct field": {
-			input: struct {
-				Struct struct{ Int int }
-				Bool   bool
-			}{struct{ Int int }{1}, true},
-			wantOutput: "Bool = true\n\n[Struct]\n  Int = 1\n",
-		},
-		"2 nested structs": {
-			input: struct{ Struct1, Struct2 struct{ Int int } }{
-				struct{ Int int }{1}, struct{ Int int }{2},
-			},
-			wantOutput: "[Struct1]\n  Int = 1\n\n[Struct2]\n  Int = 2\n",
-		},
-		"deeply nested structs": {
-			input: struct {
-				Struct1, Struct2 struct{ Struct3 *struct{ Int int } }
-			}{
-				struct{ Struct3 *struct{ Int int } }{&struct{ Int int }{1}},
-				struct{ Struct3 *struct{ Int int } }{nil},
-			},
-			wantOutput: "[Struct1]\n  [Struct1.Struct3]\n    Int = 1" +
-				"\n\n[Struct2]\n",
-		},
-		"nested struct with nil struct elem": {
-			input: struct {
-				Struct struct{ Inner *struct{ Int int } }
-			}{
-				struct{ Inner *struct{ Int int } }{nil},
-			},
-			wantOutput: "[Struct]\n",
-		},
-		"nested struct with no fields": {
-			input: struct {
-				Struct struct{ Inner struct{} }
-			}{
-				struct{ Inner struct{} }{struct{}{}},
-			},
-			wantOutput: "[Struct]\n  [Struct.Inner]\n",
-		},
-		"struct with tags": {
-			input: struct {
-				Struct struct {
-					Int int `toml:"_int"`
-				} `toml:"_struct"`
-				Bool bool `toml:"_bool"`
-			}{
-				struct {
-					Int int `toml:"_int"`
-				}{1}, true,
-			},
-			wantOutput: "_bool = true\n\n[_struct]\n  _int = 1\n",
-		},
-		"embedded struct": {
-			input:      struct{ Embedded }{Embedded{1}},
-			wantOutput: "_int = 1\n",
-		},
-		"embedded *struct": {
-			input:      struct{ *Embedded }{&Embedded{1}},
-			wantOutput: "_int = 1\n",
-		},
-		"nested embedded struct": {
-			input: struct {
-				Struct struct{ Embedded } `toml:"_struct"`
-			}{struct{ Embedded }{Embedded{1}}},
-			wantOutput: "[_struct]\n  _int = 1\n",
-		},
-		"nested embedded *struct": {
-			input: struct {
-				Struct struct{ *Embedded } `toml:"_struct"`
-			}{struct{ *Embedded }{&Embedded{1}}},
-			wantOutput: "[_struct]\n  _int = 1\n",
-		},
-		"array of tables": {
-			input: struct {
-				Structs []*struct{ Int int } `toml:"struct"`
-			}{
-				[]*struct{ Int int }{{1}, {3}},
-			},
-			wantOutput: "[[struct]]\n  Int = 1\n\n[[struct]]\n  Int = 3\n",
-		},
-		"array of tables order": {
-			input: map[string]interface{}{
-				"map": map[string]interface{}{
-					"zero": 5,
-					"arr": []map[string]int{
-						map[string]int{
-							"friend": 5,
-						},
-					},
-				},
-			},
-			wantOutput: "[map]\n  zero = 5\n\n  [[map.arr]]\n    friend = 5\n",
-		},
-		"(error) top-level slice": {
-			input:     []struct{ Int int }{{1}, {2}, {3}},
-			wantError: errNoKey,
-		},
-		"(error) slice of slice": {
-			input: struct {
-				Slices [][]struct{ Int int }
-			}{
-				[][]struct{ Int int }{{{1}}, {{2}}, {{3}}},
-			},
-			wantError: errArrayNoTable,
-		},
-		"(error) map no string key": {
-			input:     map[int]string{1: ""},
-			wantError: errNonString,
-		},
-		"(error) anonymous non-struct": {
-			input:     struct{ NonStruct }{5},
-			wantError: errAnonNonStruct,
-		},
-		"(error) empty key name": {
-			input:     map[string]int{"": 1},
-			wantError: errAnything,
-		},
-		"(error) empty map name": {
-			input: map[string]interface{}{
-				"": map[string]int{"v": 1},
-			},
-			wantError: errAnything,
-		},
-	}
-	for label, test := range tests {
-		encodeExpected(t, label, test.input, test.wantOutput, test.wantError)
-	}
-}
-
-func TestEncodeNestedTableArrays(t *testing.T) {
-	type song struct {
-		Name string `toml:"name"`
-	}
-	type album struct {
-		Name  string `toml:"name"`
-		Songs []song `toml:"songs"`
-	}
-	type springsteen struct {
-		Albums []album `toml:"albums"`
-	}
-	value := springsteen{
-		[]album{
-			{"Born to Run",
-				[]song{{"Jungleland"}, {"Meeting Across the River"}}},
-			{"Born in the USA",
-				[]song{{"Glory Days"}, {"Dancing in the Dark"}}},
-		},
-	}
-	expected := `[[albums]]
-  name = "Born to Run"
-
-  [[albums.songs]]
-    name = "Jungleland"
-
-  [[albums.songs]]
-    name = "Meeting Across the River"
-
-[[albums]]
-  name = "Born in the USA"
-
-  [[albums.songs]]
-    name = "Glory Days"
-
-  [[albums.songs]]
-    name = "Dancing in the Dark"
-`
-	encodeExpected(t, "nested table arrays", value, expected, nil)
-}
-
-func TestEncodeArrayHashWithNormalHashOrder(t *testing.T) {
-	type Alpha struct {
-		V int
-	}
-	type Beta struct {
-		V int
-	}
-	type Conf struct {
-		V int
-		A Alpha
-		B []Beta
-	}
-
-	val := Conf{
-		V: 1,
-		A: Alpha{2},
-		B: []Beta{{3}},
-	}
-	expected := "V = 1\n\n[A]\n  V = 2\n\n[[B]]\n  V = 3\n"
-	encodeExpected(t, "array hash with normal hash order", val, expected, nil)
-}
-
-func TestEncodeWithOmitEmpty(t *testing.T) {
-	type simple struct {
-		User string `toml:"user"`
-		Pass string `toml:"password,omitempty"`
-	}
-
-	value := simple{"Testing", ""}
-	expected := fmt.Sprintf("user = %q\n", value.User)
-	encodeExpected(t, "simple with omitempty, is empty", value, expected, nil)
-	value.Pass = "some password"
-	expected = fmt.Sprintf("user = %q\npassword = %q\n", value.User, value.Pass)
-	encodeExpected(t, "simple with omitempty, not empty", value, expected, nil)
-}
-
-func TestEncodeWithOmitZero(t *testing.T) {
-	type simple struct {
-		Number   int     `toml:"number,omitzero"`
-		Real     float64 `toml:"real,omitzero"`
-		Unsigned uint    `toml:"unsigned,omitzero"`
-	}
-
-	value := simple{0, 0.0, uint(0)}
-	expected := ""
-
-	encodeExpected(t, "simple with omitzero, all zero", value, expected, nil)
-
-	value.Number = 10
-	value.Real = 20
-	value.Unsigned = 5
-	expected = `number = 10
-real = 20.0
-unsigned = 5
-`
-	encodeExpected(t, "simple with omitzero, non-zero", value, expected, nil)
-}
-
-func encodeExpected(
-	t *testing.T, label string, val interface{}, wantStr string, wantErr error,
-) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	err := enc.Encode(val)
-	if err != wantErr {
-		if wantErr != nil {
-			if wantErr == errAnything && err != nil {
-				return
-			}
-			t.Errorf("%s: want Encode error %v, got %v", label, wantErr, err)
-		} else {
-			t.Errorf("%s: Encode failed: %s", label, err)
-		}
-	}
-	if err != nil {
-		return
-	}
-	if got := buf.String(); wantStr != got {
-		t.Errorf("%s: want\n-----\n%q\n-----\nbut got\n-----\n%q\n-----\n",
-			label, wantStr, got)
-	}
-}
-
-func ExampleEncoder_Encode() {
-	date, _ := time.Parse(time.RFC822, "14 Mar 10 18:00 UTC")
-	var config = map[string]interface{}{
-		"date":   date,
-		"counts": []int{1, 1, 2, 3, 5, 8},
-		"hash": map[string]string{
-			"key1": "val1",
-			"key2": "val2",
-		},
-	}
-	buf := new(bytes.Buffer)
-	if err := NewEncoder(buf).Encode(config); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(buf.String())
-
-	// Output:
-	// counts = [1, 1, 2, 3, 5, 8]
-	// date = 2010-03-14T18:00:00Z
-	//
-	// [hash]
-	//   key1 = "val1"
-	//   key2 = "val2"
-}
diff --git a/vendor/github.com/bitly/go-notify/.gitignore b/vendor/github.com/bitly/go-notify/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/vendor/github.com/bitly/go-notify/.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/vendor/github.com/bitly/go-notify/README.md b/vendor/github.com/bitly/go-notify/README.md
deleted file mode 100644
index 5d578bcc6..000000000
--- a/vendor/github.com/bitly/go-notify/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-## go-notify
-
-Package notify enables independent components of an application to
-observe notable events in a decoupled fashion.
-
-It generalizes the pattern of *multiple* consumers of an event (ie: the
-same message delivered to multiple channels) and obviates the need for
-components to have intimate knowledge of each other (only `import
-notify` and the name of the event are shared).
-
-Example:
-
-    // producer of "my_event"
-    go func() {
-        for {
-            time.Sleep(time.Duration(1) * time.Second):
-            notify.Post("my_event", time.Now().Unix())
-        }
-    }()
-
-    // observer of "my_event" (normally some independent component that
-    // needs to be notified when "my_event" occurs)
-    myEventChan := make(chan interface{})
-    notify.Start("my_event", myEventChan)
-    go func() {
-        for {
-            data := <-myEventChan
-            log.Printf("MY_EVENT: %#v", data)
-        }
-    }()
-
-### Functions
-
-    func Post(event string, data interface{}) error
-        Post a notification (arbitrary data) to the specified event
-
-    func PostTimeout(event string, data interface{}, timeout time.Duration) error
-        Post a notification to the specified event using the provided timeout for
-        any output channels that are blocking
-
-    func Start(event string, outputChan chan interface{})
-        Start observing the specified event via provided output channel
-
-    func Stop(event string, outputChan chan interface{}) error
-        Stop observing the specified event on the provided output channel
-
-    func StopAll(event string) error
-        Stop observing the specified event on all channels
-
-    func Version() string
-        returns the current version
diff --git a/vendor/github.com/bitly/go-notify/notify.go b/vendor/github.com/bitly/go-notify/notify.go
deleted file mode 100644
index 7b40d5dca..000000000
--- a/vendor/github.com/bitly/go-notify/notify.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Package notify enables independent components of an application to
-// observe notable events in a decoupled fashion.
-//
-// It generalizes the pattern of *multiple* consumers of an event (ie:
-// the same message delivered to multiple channels) and obviates the need
-// for components to have intimate knowledge of each other (only `import notify`
-// and the name of the event are shared).
-//
-// Example:
-//     // producer of "my_event"
-//     go func() {
-//         for {
-//             time.Sleep(time.Duration(1) * time.Second):
-//             notify.Post("my_event", time.Now().Unix())
-//         }
-//     }()
-//
-//     // observer of "my_event" (normally some independent component that
-//     // needs to be notified when "my_event" occurs)
-//     myEventChan := make(chan interface{})
-//     notify.Start("my_event", myEventChan)
-//     go func() {
-//         for {
-//             data := <-myEventChan
-//             log.Printf("MY_EVENT: %#v", data)
-//         }
-//     }()
-package notify
-
-import (
-	"errors"
-	"sync"
-	"time"
-)
-
-const E_NOT_FOUND = "E_NOT_FOUND"
-
-// returns the current version
-func Version() string {
-	return "0.2"
-}
-
-// internal mapping of event names to observing channels
-var events = make(map[string][]chan interface{})
-
-// mutex for touching the event map
-var rwMutex sync.RWMutex
-
-// Start observing the specified event via provided output channel
-func Start(event string, outputChan chan interface{}) {
-	rwMutex.Lock()
-	defer rwMutex.Unlock()
-
-	events[event] = append(events[event], outputChan)
-}
-
-// Stop observing the specified event on the provided output channel
-func Stop(event string, outputChan chan interface{}) error {
-	rwMutex.Lock()
-	defer rwMutex.Unlock()
-
-	newArray := make([]chan interface{}, 0)
-	outChans, ok := events[event]
-	if !ok {
-		return errors.New(E_NOT_FOUND)
-	}
-	for _, ch := range outChans {
-		if ch != outputChan {
-			newArray = append(newArray, ch)
-		} else {
-			close(ch)
-		}
-	}
-	events[event] = newArray
-
-	return nil
-}
-
-// Stop observing the specified event on all channels
-func StopAll(event string) error {
-	rwMutex.Lock()
-	defer rwMutex.Unlock()
-
-	outChans, ok := events[event]
-	if !ok {
-		return errors.New(E_NOT_FOUND)
-	}
-	for _, ch := range outChans {
-		close(ch)
-	}
-	delete(events, event)
-
-	return nil
-}
-
-// Post a notification (arbitrary data) to the specified event
-func Post(event string, data interface{}) error {
-	rwMutex.RLock()
-	defer rwMutex.RUnlock()
-
-	outChans, ok := events[event]
-	if !ok {
-		return errors.New(E_NOT_FOUND)
-	}
-	for _, outputChan := range outChans {
-		outputChan <- data
-	}
-
-	return nil
-}
-
-// Post a notification to the specified event using the provided timeout for
-// any output channels that are blocking
-func PostTimeout(event string, data interface{}, timeout time.Duration) error {
-	rwMutex.RLock()
-	defer rwMutex.RUnlock()
-
-	outChans, ok := events[event]
-	if !ok {
-		return errors.New(E_NOT_FOUND)
-	}
-	for _, outputChan := range outChans {
-		select {
-		case outputChan <- data:
-		case <-time.After(timeout):
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/cactus/go-statsd-client/statsd/doc.go b/vendor/github.com/cactus/go-statsd-client/statsd/doc.go
deleted file mode 100644
index 722e98046..000000000
--- a/vendor/github.com/cactus/go-statsd-client/statsd/doc.go
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-Package statsd provides a StatsD client implementation that is safe for
-concurrent use by multiple goroutines and for efficiency can be created and
-reused.
-
-Example usage:
-
-	// first create a client
-	client, err := statsd.New("127.0.0.1:8125", "test-client")
-	// handle any errors
-	if err != nil {
-		log.Fatal(err)
-	}
-	// make sure to clean up
-	defer client.Close()
-
-	// Send a stat
-	err = client.Inc("stat1", 42, 1.0)
-	// handle any errors
-	if err != nil {
-		log.Printf("Error sending metric: %+v", err)
-	}
-
-*/
-package statsd
diff --git a/vendor/github.com/cactus/go-statsd-client/statsd/main.go b/vendor/github.com/cactus/go-statsd-client/statsd/main.go
deleted file mode 100644
index f5717f25c..000000000
--- a/vendor/github.com/cactus/go-statsd-client/statsd/main.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package statsd
-
-import (
-	"errors"
-	"fmt"
-	"math/rand"
-	"net"
-)
-
-type Statter interface {
-	Inc(stat string, value int64, rate float32) error
-	Dec(stat string, value int64, rate float32) error
-	Gauge(stat string, value int64, rate float32) error
-	GaugeDelta(stat string, value int64, rate float32) error
-	Timing(stat string, delta int64, rate float32) error
-	Raw(stat string, value string, rate float32) error
-	SetPrefix(prefix string)
-	Close() error
-}
-
-
-type Client struct {
-	// underlying connection
-	c net.PacketConn
-	// resolved udp address
-	ra *net.UDPAddr
-	// prefix for statsd name
-	prefix string
-}
-
-// Close closes the connection and cleans up.
-func (s *Client) Close() error {
-	err := s.c.Close()
-	return err
-}
-
-// Increments a statsd count type.
-// stat is a string name for the metric.
-// value is the integer value
-// rate is the sample rate (0.0 to 1.0)
-func (s *Client) Inc(stat string, value int64, rate float32) error {
-	dap := fmt.Sprintf("%d|c", value)
-	return s.Raw(stat, dap, rate)
-}
-
-// Decrements a statsd count type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *Client) Dec(stat string, value int64, rate float32) error {
-	return s.Inc(stat, -value, rate)
-}
-
-// Submits/Updates a statsd gauge type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *Client) Gauge(stat string, value int64, rate float32) error {
-	dap := fmt.Sprintf("%d|g", value)
-	return s.Raw(stat, dap, rate)
-}
-
-// Submits a delta to a statsd gauge.
-// stat is the string name for the metric.
-// value is the (positive or negative) change.
-// rate is the sample rate (0.0 to 1.0).
-func (s *Client) GaugeDelta(stat string, value int64, rate float32) error {
-	dap := fmt.Sprintf("%+d|g", value)
-	return s.Raw(stat, dap, rate)
-}
-
-// Submits a statsd timing type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *Client) Timing(stat string, delta int64, rate float32) error {
-	dap := fmt.Sprintf("%d|ms", delta)
-	return s.Raw(stat, dap, rate)
-}
-
-// Raw formats the statsd event data, handles sampling, prepares it,
-// and sends it to the server.
-// stat is the string name for the metric.
-// value is a preformatted "raw" value string.
-// rate is the sample rate (0.0 to 1.0).
-func (s *Client) Raw(stat string, value string, rate float32) error {
-	if rate < 1 {
-		if rand.Float32() < rate {
-			value = fmt.Sprintf("%s|@%f", value, rate)
-		} else {
-			return nil
-		}
-	}
-
-	if s.prefix != "" {
-		stat = fmt.Sprintf("%s.%s", s.prefix, stat)
-	}
-
-	data := fmt.Sprintf("%s:%s", stat, value)
-
-	_, err := s.send([]byte(data))
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// Sets/Updates the statsd client prefix
-func (s *Client) SetPrefix(prefix string) {
-	s.prefix = prefix
-}
-
-// sends the data to the server endpoint
-func (s *Client) send(data []byte) (int, error) {
-	// no need for locking here, as the underlying fdNet
-	// already serialized writes
-	n, err := s.c.(*net.UDPConn).WriteToUDP([]byte(data), s.ra)
-	if err != nil {
-		return 0, err
-	}
-	if n == 0 {
-		return n, errors.New("Wrote no bytes")
-	}
-	return n, nil
-}
-
-// Returns a pointer to a new Client, and an error.
-// addr is a string of the format "hostname:port", and must be parsable by
-// net.ResolveUDPAddr.
-// prefix is the statsd client prefix. Can be "" if no prefix is desired.
-func New(addr, prefix string) (*Client, error) {
-	c, err := net.ListenPacket("udp", ":0")
-	if err != nil {
-		return nil, err
-	}
-
-	ra, err := net.ResolveUDPAddr("udp", addr)
-	if err != nil {
-		return nil, err
-	}
-
-	client := &Client{
-		c:      c,
-		ra:     ra,
-		prefix: prefix}
-
-	return client, nil
-}
-
-// Compatibility alias
-var Dial = New
diff --git a/vendor/github.com/cactus/go-statsd-client/statsd/main_test.go b/vendor/github.com/cactus/go-statsd-client/statsd/main_test.go
deleted file mode 100644
index 8d304a293..000000000
--- a/vendor/github.com/cactus/go-statsd-client/statsd/main_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package statsd
-
-import (
-	"bytes"
-	"log"
-	"net"
-	"reflect"
-	"testing"
-	"time"
-)
-
-var statsdPacketTests = []struct {
-	Prefix   string
-	Method   string
-	Stat     string
-	Value    int64
-	Rate     float32
-	Expected string
-}{
-	{"test", "Gauge", "gauge", 1, 1.0, "test.gauge:1|g"},
-	{"test", "Inc", "count", 1, 0.999999, "test.count:1|c|@0.999999"},
-	{"test", "Inc", "count", 1, 1.0, "test.count:1|c"},
-	{"test", "Dec", "count", 1, 1.0, "test.count:-1|c"},
-	{"test", "Timing", "timing", 1, 1.0, "test.timing:1|ms"},
-	{"", "Inc", "count", 1, 1.0, "count:1|c"},
-	{"", "GaugeDelta", "gauge", 1, 1.0, "gauge:+1|g"},
-	{"", "GaugeDelta", "gauge", -1, 1.0, "gauge:-1|g"},
-}
-
-func TestClient(t *testing.T) {
-	l, err := newUDPListener("127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-	for _, tt := range statsdPacketTests {
-		c, err := New(l.LocalAddr().String(), tt.Prefix)
-		if err != nil {
-			t.Fatal(err)
-		}
-		method := reflect.ValueOf(c).MethodByName(tt.Method)
-		e := method.Call([]reflect.Value{
-			reflect.ValueOf(tt.Stat),
-			reflect.ValueOf(tt.Value),
-			reflect.ValueOf(tt.Rate)})[0]
-		errInter := e.Interface()
-		if errInter != nil {
-			t.Fatal(errInter.(error))
-		}
-
-		data := make([]byte, 128)
-		_, _, err = l.ReadFrom(data)
-		if err != nil {
-			c.Close()
-			t.Fatal(err)
-		}
-
-		data = bytes.TrimRight(data, "\x00")
-		if bytes.Equal(data, []byte(tt.Expected)) != true {
-			c.Close()
-			t.Fatalf("%s got '%s' expected '%s'", tt.Method, data, tt.Expected)
-		}
-		c.Close()
-	}
-}
-
-func TestNoopClient(t *testing.T) {
-	l, err := newUDPListener("127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-	for _, tt := range statsdPacketTests {
-		c, err := NewNoop(l.LocalAddr().String(), tt.Prefix)
-		if err != nil {
-			t.Fatal(err)
-		}
-		method := reflect.ValueOf(c).MethodByName(tt.Method)
-		e := method.Call([]reflect.Value{
-			reflect.ValueOf(tt.Stat),
-			reflect.ValueOf(tt.Value),
-			reflect.ValueOf(tt.Rate)})[0]
-		errInter := e.Interface()
-		if errInter != nil {
-			t.Fatal(errInter.(error))
-		}
-
-		data := make([]byte, 128)
-		n, _, err := l.ReadFrom(data)
-		// this is expected to error, since there should
-		// be no udp data sent, so the read will time out
-		if err == nil || n != 0 {
-			c.Close()
-			t.Fatal(err)
-		}
-		c.Close()
-	}
-}
-
-func newUDPListener(addr string) (*net.UDPConn, error) {
-	l, err := net.ListenPacket("udp", addr)
-	if err != nil {
-		return nil, err
-	}
-	l.SetDeadline(time.Now().Add(100 * time.Millisecond))
-	l.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
-	l.SetWriteDeadline(time.Now().Add(100 * time.Millisecond))
-	return l.(*net.UDPConn), nil
-}
-
-func ExampleClient() {
-	// first create a client
-	client, err := Dial("127.0.0.1:8125", "test-client")
-	// handle any errors
-	if err != nil {
-		log.Fatal(err)
-	}
-	// make sure to clean up
-	defer client.Close()
-
-	// Send a stat
-	err = client.Inc("stat1", 42, 1.0)
-	// handle any errors
-	if err != nil {
-		log.Printf("Error sending metric: %+v", err)
-	}
-}
-
-func ExampleNoopClient() {
-	// use interface so we can sub noop client if needed
-	var client Statter
-	var err error
-
-	// first try to create a real client
-	client, err = Dial("not-resolvable:8125", "test-client")
-	// Lets say real client creation fails, but you don't care enough about
-	// stats that you don't want your program to run. Just log an error and
-	// make a NoopClient instead
-	if err != nil {
-		log.Println("Remote endpoint did not resolve. Disabling stats", err)
-		client, err = NewNoop()
-	}
-	// make sure to clean up
-	defer client.Close()
-
-	// Send a stat
-	err = client.Inc("stat1", 42, 1.0)
-	// handle any errors
-	if err != nil {
-		log.Printf("Error sending metric: %+v", err)
-	}
-}
diff --git a/vendor/github.com/cactus/go-statsd-client/statsd/noop.go b/vendor/github.com/cactus/go-statsd-client/statsd/noop.go
deleted file mode 100644
index ee11e74a9..000000000
--- a/vendor/github.com/cactus/go-statsd-client/statsd/noop.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package statsd
-
-type NoopClient struct {
-	// prefix for statsd name
-	prefix string
-}
-
-// Close closes the connection and cleans up.
-func (s *NoopClient) Close() error {
-	return nil
-}
-
-// Increments a statsd count type.
-// stat is a string name for the metric.
-// value is the integer value
-// rate is the sample rate (0.0 to 1.0)
-func (s *NoopClient) Inc(stat string, value int64, rate float32) error {
-	return nil
-}
-
-// Decrements a statsd count type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *NoopClient) Dec(stat string, value int64, rate float32) error {
-	return nil
-}
-
-// Submits/Updates a statsd gauge type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *NoopClient) Gauge(stat string, value int64, rate float32) error {
-	return nil
-}
-
-// Submits a delta to a statsd gauge.
-// stat is the string name for the metric.
-// value is the (positive or negative) change.
-// rate is the sample rate (0.0 to 1.0).
-func (s *NoopClient) GaugeDelta(stat string, value int64, rate float32) error {
-	return nil
-}
-
-// Submits a statsd timing type.
-// stat is a string name for the metric.
-// value is the integer value.
-// rate is the sample rate (0.0 to 1.0).
-func (s *NoopClient) Timing(stat string, delta int64, rate float32) error {
-	return nil
-}
-
-// Raw formats the statsd event data, handles sampling, prepares it,
-// and sends it to the server.
-// stat is the string name for the metric.
-// value is the preformatted "raw" value string.
-// rate is the sample rate (0.0 to 1.0).
-func (s *NoopClient) Raw(stat string, value string, rate float32) error {
-	return nil
-}
-
-// Sets/Updates the statsd client prefix
-func (s *NoopClient) SetPrefix(prefix string) {
-	s.prefix = prefix
-}
-
-// Returns a pointer to a new NoopClient, and an error (always nil, just
-// supplied to support api convention).
-// Use variadic arguments to support identical format as New, or a more
-// conventional no argument form.
-func NewNoop(a ...interface{}) (*NoopClient, error) {
-	noopClient := &NoopClient{}
-	return noopClient, nil
-}
diff --git a/vendor/github.com/cactus/go-statsd-client/statsd/test-client/main.go b/vendor/github.com/cactus/go-statsd-client/statsd/test-client/main.go
deleted file mode 100644
index 484c60381..000000000
--- a/vendor/github.com/cactus/go-statsd-client/statsd/test-client/main.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package main
-
-import (
-	"github.com/cactus/go-statsd-client/statsd"
-	flags "github.com/jessevdk/go-flags"
-	"fmt"
-	"log"
-	"os"
-	"time"
-)
-
-func main() {
-
-	// command line flags
-	var opts struct {
-		HostPort  string        `long:"host" default:"127.0.0.1:8125" description:"host:port of statsd server"`
-		Prefix    string        `long:"prefix" default:"test-client" description:"Statsd prefix"`
-		StatType  string        `long:"type" default:"count" description:"stat type to send. Can be timing, count, guage"`
-		StatValue int64         `long:"value" default:"1" description:"Value to send"`
-		Name      string        `short:"n" long:"name" default:"counter" description:"stat name"`
-		Rate      float32       `short:"r" long:"rate" default:"1.0" description:"sample rate"`
-		Volume    int           `short:"c" long:"count" default:"1000" description:"Number of stats to send. Volume."`
-		Noop      bool          `long:"noop" default:"false" description:"Use noop client"`
-		Duration  time.Duration `short:"d" long:"duration" default:"10s" description:"How long to spread the volume across. Each second of duration volume/seconds events will be sent."`
-	}
-
-	// parse said flags
-	_, err := flags.Parse(&opts)
-	if err != nil {
-		if e, ok := err.(*flags.Error); ok {
-			if e.Type == flags.ErrHelp {
-				os.Exit(0)
-			}
-		}
-		fmt.Printf("Error: %+v\n", err)
-		os.Exit(1)
-	}
-
-	var client statsd.Statter
-	if !opts.Noop {
-		client, err = statsd.New(opts.HostPort, opts.Prefix)
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer client.Close()
-	} else {
-		client, err = statsd.NewNoop(opts.HostPort, opts.Prefix)
-	}
-
-	var stat func(stat string, value int64, rate float32) error
-	switch opts.StatType {
-	case "count":
-		stat = func(stat string, value int64, rate float32) error {
-			return client.Inc(stat, value, rate)
-		}
-	case "gauge":
-		stat = func(stat string, value int64, rate float32) error {
-			return client.Gauge(stat, value, rate)
-		}
-	case "timing":
-		stat = func(stat string, value int64, rate float32) error {
-			return client.Timing(stat, value, rate)
-		}
-	default:
-		log.Fatal("Unsupported state type")
-	}
-
-	pertick := opts.Volume / int(opts.Duration.Seconds()) / 10
-	// add some extra tiem, because the first tick takes a while
-	ender := time.After(opts.Duration + 100*time.Millisecond)
-	c := time.Tick(time.Second / 10)
-	count := 0
-	for {
-		select {
-		case <-c:
-			for x := 0; x < pertick; x++ {
-				err := stat(opts.Name, opts.StatValue, opts.Rate)
-				if err != nil {
-					log.Printf("Got Error: %+v", err)
-					break
-				}
-				count += 1
-			}
-		case <-ender:
-			log.Printf("%d events called", count)
-			os.Exit(0)
-			return
-		}
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/LICENSE.txt b/vendor/github.com/cihub/seelog/LICENSE.txt
deleted file mode 100644
index 8c7068141..000000000
--- a/vendor/github.com/cihub/seelog/LICENSE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2012, Cloud Instruments Co., Ltd. <info@cin.io>
-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 Cloud Instruments Co., 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 <COPYRIGHT HOLDER> 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/vendor/github.com/cihub/seelog/README.markdown b/vendor/github.com/cihub/seelog/README.markdown
deleted file mode 100644
index b9acd2d1d..000000000
--- a/vendor/github.com/cihub/seelog/README.markdown
+++ /dev/null
@@ -1,113 +0,0 @@
-Seelog
-=======
-
-Seelog is a powerful and easy-to-learn logging framework that provides functionality for flexible dispatching, filtering, and formatting log messages.
-It is natively written in the [Go](http://golang.org/) programming language. 
-
-[![Build Status](https://drone.io/github.com/cihub/seelog/status.png)](https://drone.io/github.com/cihub/seelog/latest)
-
-Features
-------------------
-
-* Xml configuring to be able to change logger parameters without recompilation
-* Changing configurations on the fly without app restart
-* Possibility to set different log configurations for different project files and functions
-* Adjustable message formatting
-* Simultaneous log output to multiple streams
-* Choosing logger priority strategy to minimize performance hit
-* Different output writers
-  * Console writer
-  * File writer 
-  * Buffered writer (Chunk writer)
-  * Rolling log writer (Logging with rotation)
-  * SMTP writer
-  * Others... (See [Wiki](https://github.com/cihub/seelog/wiki))
-* Log message wrappers (JSON, XML, etc.)
-* Global variables and functions for easy usage in standalone apps
-* Functions for flexible usage in libraries
-
-Quick-start
------------
-
-```go
-package main
-
-import log "github.com/cihub/seelog"
-
-func main() {
-    defer log.Flush()
-    log.Info("Hello from Seelog!")
-}
-```
-
-Installation
-------------
-
-If you don't have the Go development environment installed, visit the 
-[Getting Started](http://golang.org/doc/install.html) document and follow the instructions. Once you're ready, execute the following command:
-
-```
-go get -u github.com/cihub/seelog
-```
-
-*IMPORTANT*: If you are not using the latest release version of Go, check out this [wiki page](https://github.com/cihub/seelog/wiki/Notes-on-'go-get')
-
-Documentation
----------------
-
-Seelog has github wiki pages, which contain detailed how-tos references: https://github.com/cihub/seelog/wiki
-
-Examples
----------------
-
-Seelog examples can be found here: [seelog-examples](https://github.com/cihub/seelog-examples)
-
-Issues
----------------
-
-Feel free to push issues that could make Seelog better: https://github.com/cihub/seelog/issues
-
-Changelog
----------------
-
-* **v2.5** : Interaction with other systems. Part 2: custom receivers
-    * Finished custom receivers feature. Check [wiki](https://github.com/cihub/seelog/wiki/custom-receivers)
-    * Added 'LoggerFromCustomReceiver'
-    * Added 'LoggerFromWriterWithMinLevelAndFormat'
-    * Added 'LoggerFromCustomReceiver'
-    * Added 'LoggerFromParamConfigAs...' 
-* **v2.4** : Interaction with other systems. Part 1: wrapping seelog
-    * Added configurable caller stack skip logic
-    * Added 'SetAdditionalStackDepth' to 'LoggerInterface'
-* **v2.3** : Rethinking 'rolling' receiver
-    * Reimplemented 'rolling' receiver
-    * Added 'Max rolls' feature for 'rolling' receiver with type='date'
-    * Fixed 'rolling' receiver issue: renaming on Windows
-* **v2.2** : go1.0 compatibility point [go1.0 tag]
-    * Fixed internal bugs
-    * Added 'ANSI n [;k]' format identifier:  %EscN
-    * Made current release go1 compatible 
-* **v2.1** : Some new features
-    * Rolling receiver archiving option.
-    * Added format identifier: %Line
-    * Smtp: added paths to PEM files directories
-    * Added format identifier: %FuncShort
-    * Warn, Error and Critical methods now return an error
-* **v2.0** : Second major release. BREAKING CHANGES.
-    * Support of binaries with stripped symbols
-    * Added log strategy: adaptive
-    * Critical message now forces Flush()
-    * Added predefined formats: xml-debug, xml-debug-short, xml, xml-short, json-debug, json-debug-short, json, json-short, debug, debug-short, fast
-    * Added receiver: conn (network connection writer)
-    * BREAKING CHANGE: added Tracef, Debugf, Infof, etc. to satisfy the print/printf principle
-    * Bug fixes
-* **v1.0** : Initial release. Features:
-    * Xml config
-    * Changing configurations on the fly without app restart
-    * Contraints and exceptions
-    * Formatting
-    * Log strategies: sync, async loop, async timer
-    * Receivers: buffered, console, file, rolling, smtp
-
-
-
diff --git a/vendor/github.com/cihub/seelog/behavior_adaptive_test.go b/vendor/github.com/cihub/seelog/behavior_adaptive_test.go
deleted file mode 100644
index e99194930..000000000
--- a/vendor/github.com/cihub/seelog/behavior_adaptive_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strconv"
-	"testing"
-)
-
-func countSequencedRowsInFile(filePath string) (int64, error) {
-	bts, err := ioutil.ReadFile(filePath)
-	if err != nil {
-		return 0, err
-	}
-
-	bufReader := bufio.NewReader(bytes.NewBuffer(bts))
-
-	var gotCounter int64
-	for {
-		line, _, bufErr := bufReader.ReadLine()
-		if bufErr != nil && bufErr != io.EOF {
-			return 0, bufErr
-		}
-
-		lineString := string(line)
-		if lineString == "" {
-			break
-		}
-
-		intVal, atoiErr := strconv.ParseInt(lineString, 10, 64)
-		if atoiErr != nil {
-			return 0, atoiErr
-		}
-
-		if intVal != gotCounter {
-			return 0, fmt.Errorf("wrong order: %d Expected: %d\n", intVal, gotCounter)
-		}
-
-		gotCounter++
-	}
-
-	return gotCounter, nil
-}
-
-func Test_Adaptive(t *testing.T) {
-	fileName := "beh_test_adaptive.log"
-	count := 100
-
-	Current.Close()
-
-	if e := tryRemoveFile(fileName); e != nil {
-		t.Error(e)
-		return
-	}
-	defer func() {
-		if e := tryRemoveFile(fileName); e != nil {
-			t.Error(e)
-		}
-	}()
-
-	testConfig := `
-<seelog type="adaptive" mininterval="1000" maxinterval="1000000" critmsgcount="100">
-	<outputs formatid="msg">
-		<file path="` + fileName + `"/>
-	</outputs>
-	<formats>
-		<format id="msg" format="%Msg%n"/>
-	</formats>
-</seelog>`
-
-	logger, _ := LoggerFromConfigAsString(testConfig)
-
-	err := ReplaceLogger(logger)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for i := 0; i < count; i++ {
-		Trace(strconv.Itoa(i))
-	}
-
-	Flush()
-
-	gotCount, err := countSequencedRowsInFile(fileName)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if int64(count) != gotCount {
-		t.Errorf("wrong count of log messages. Expected: %v, got: %v.", count, gotCount)
-		return
-	}
-
-	Current.Close()
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_adaptivelogger.go b/vendor/github.com/cihub/seelog/behavior_adaptivelogger.go
deleted file mode 100644
index 11f10c210..000000000
--- a/vendor/github.com/cihub/seelog/behavior_adaptivelogger.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"math"
-	"time"
-)
-
-var (
-	adaptiveLoggerMaxInterval         = time.Minute
-	adaptiveLoggerMaxCriticalMsgCount = uint32(1000)
-)
-
-// asyncAdaptiveLogger represents asynchronous adaptive logger which acts like
-// an async timer logger, but its interval depends on the current message count
-// in the queue.
-//
-// Interval = I, minInterval = m, maxInterval = M, criticalMsgCount = C, msgCount = c:
-// I = m + (C - Min(c, C)) / C * (M - m)
-type asyncAdaptiveLogger struct {
-	asyncLogger
-	minInterval      time.Duration
-	criticalMsgCount uint32
-	maxInterval      time.Duration
-}
-
-// newAsyncLoopLogger creates a new asynchronous adaptive logger
-func newAsyncAdaptiveLogger(
-	config *logConfig,
-	minInterval time.Duration,
-	maxInterval time.Duration,
-	criticalMsgCount uint32) (*asyncAdaptiveLogger, error) {
-
-	if minInterval <= 0 {
-		return nil, errors.New("async adaptive logger min interval should be > 0")
-	}
-
-	if maxInterval > adaptiveLoggerMaxInterval {
-		return nil, fmt.Errorf("async adaptive logger max interval should be <= %s",
-			adaptiveLoggerMaxInterval)
-	}
-
-	if criticalMsgCount <= 0 {
-		return nil, errors.New("async adaptive logger critical msg count should be > 0")
-	}
-
-	if criticalMsgCount > adaptiveLoggerMaxCriticalMsgCount {
-		return nil, fmt.Errorf("async adaptive logger critical msg count should be <= %s",
-			adaptiveLoggerMaxInterval)
-	}
-
-	asnAdaptiveLogger := new(asyncAdaptiveLogger)
-
-	asnAdaptiveLogger.asyncLogger = *newAsyncLogger(config)
-	asnAdaptiveLogger.minInterval = minInterval
-	asnAdaptiveLogger.maxInterval = maxInterval
-	asnAdaptiveLogger.criticalMsgCount = criticalMsgCount
-
-	go asnAdaptiveLogger.processQueue()
-
-	return asnAdaptiveLogger, nil
-}
-
-func (asnAdaptiveLogger *asyncAdaptiveLogger) processItem() (closed bool, itemCount int) {
-	asnAdaptiveLogger.queueHasElements.L.Lock()
-	defer asnAdaptiveLogger.queueHasElements.L.Unlock()
-
-	for asnAdaptiveLogger.msgQueue.Len() == 0 && !asnAdaptiveLogger.Closed() {
-		asnAdaptiveLogger.queueHasElements.Wait()
-	}
-
-	if asnAdaptiveLogger.Closed() {
-		return true, asnAdaptiveLogger.msgQueue.Len()
-	}
-
-	asnAdaptiveLogger.processQueueElement()
-	return false, asnAdaptiveLogger.msgQueue.Len() - 1
-}
-
-// I = m + (C - Min(c, C)) / C * (M - m) =>
-// I = m + cDiff * mDiff,
-// 		cDiff = (C - Min(c, C)) / C)
-//		mDiff = (M - m)
-func (asnAdaptiveLogger *asyncAdaptiveLogger) calcAdaptiveInterval(msgCount int) time.Duration {
-	critCountF := float64(asnAdaptiveLogger.criticalMsgCount)
-	cDiff := (critCountF - math.Min(float64(msgCount), critCountF)) / critCountF
-	mDiff := float64(asnAdaptiveLogger.maxInterval - asnAdaptiveLogger.minInterval)
-
-	return asnAdaptiveLogger.minInterval + time.Duration(cDiff*mDiff)
-}
-
-func (asnAdaptiveLogger *asyncAdaptiveLogger) processQueue() {
-	for !asnAdaptiveLogger.Closed() {
-		closed, itemCount := asnAdaptiveLogger.processItem()
-
-		if closed {
-			break
-		}
-
-		interval := asnAdaptiveLogger.calcAdaptiveInterval(itemCount)
-
-		<-time.After(interval)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_asynclogger.go b/vendor/github.com/cihub/seelog/behavior_asynclogger.go
deleted file mode 100644
index 75231067b..000000000
--- a/vendor/github.com/cihub/seelog/behavior_asynclogger.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"container/list"
-	"fmt"
-	"sync"
-)
-
-// MaxQueueSize is the critical number of messages in the queue that result in an immediate flush.
-const (
-	MaxQueueSize = 10000
-)
-
-type msgQueueItem struct {
-	level   LogLevel
-	context LogContextInterface
-	message fmt.Stringer
-}
-
-// asyncLogger represents common data for all asynchronous loggers
-type asyncLogger struct {
-	commonLogger
-	msgQueue         *list.List
-	queueHasElements *sync.Cond
-}
-
-// newAsyncLogger creates a new asynchronous logger
-func newAsyncLogger(config *logConfig) *asyncLogger {
-	asnLogger := new(asyncLogger)
-
-	asnLogger.msgQueue = list.New()
-	asnLogger.queueHasElements = sync.NewCond(new(sync.Mutex))
-
-	asnLogger.commonLogger = *newCommonLogger(config, asnLogger)
-
-	return asnLogger
-}
-
-func (asnLogger *asyncLogger) innerLog(
-	level LogLevel,
-	context LogContextInterface,
-	message fmt.Stringer) {
-
-	asnLogger.addMsgToQueue(level, context, message)
-}
-
-func (asnLogger *asyncLogger) Close() {
-	asnLogger.m.Lock()
-	defer asnLogger.m.Unlock()
-
-	if !asnLogger.Closed() {
-		asnLogger.flushQueue(true)
-		asnLogger.config.RootDispatcher.Flush()
-
-		if err := asnLogger.config.RootDispatcher.Close(); err != nil {
-			reportInternalError(err)
-		}
-
-		asnLogger.closedM.Lock()
-		asnLogger.closed = true
-		asnLogger.closedM.Unlock()
-		asnLogger.queueHasElements.Broadcast()
-	}
-}
-
-func (asnLogger *asyncLogger) Flush() {
-	asnLogger.m.Lock()
-	defer asnLogger.m.Unlock()
-
-	if !asnLogger.Closed() {
-		asnLogger.flushQueue(true)
-		asnLogger.config.RootDispatcher.Flush()
-	}
-}
-
-func (asnLogger *asyncLogger) flushQueue(lockNeeded bool) {
-	if lockNeeded {
-		asnLogger.queueHasElements.L.Lock()
-		defer asnLogger.queueHasElements.L.Unlock()
-	}
-
-	for asnLogger.msgQueue.Len() > 0 {
-		asnLogger.processQueueElement()
-	}
-}
-
-func (asnLogger *asyncLogger) processQueueElement() {
-	if asnLogger.msgQueue.Len() > 0 {
-		backElement := asnLogger.msgQueue.Front()
-		msg, _ := backElement.Value.(msgQueueItem)
-		asnLogger.processLogMsg(msg.level, msg.message, msg.context)
-		asnLogger.msgQueue.Remove(backElement)
-	}
-}
-
-func (asnLogger *asyncLogger) addMsgToQueue(
-	level LogLevel,
-	context LogContextInterface,
-	message fmt.Stringer) {
-
-	if !asnLogger.Closed() {
-		asnLogger.queueHasElements.L.Lock()
-		defer asnLogger.queueHasElements.L.Unlock()
-
-		if asnLogger.msgQueue.Len() >= MaxQueueSize {
-			fmt.Printf("Seelog queue overflow: more than %v messages in the queue. Flushing.\n", MaxQueueSize)
-			asnLogger.flushQueue(false)
-		}
-
-		queueItem := msgQueueItem{level, context, message}
-
-		asnLogger.msgQueue.PushBack(queueItem)
-		asnLogger.queueHasElements.Broadcast()
-	} else {
-		err := fmt.Errorf("queue closed! Cannot process element: %d %#v", level, message)
-		reportInternalError(err)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_asyncloop_test.go b/vendor/github.com/cihub/seelog/behavior_asyncloop_test.go
deleted file mode 100644
index 142c4fcff..000000000
--- a/vendor/github.com/cihub/seelog/behavior_asyncloop_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"strconv"
-	"testing"
-)
-
-func Test_Asyncloop(t *testing.T) {
-	fileName := "beh_test_asyncloop.log"
-	count := 100
-
-	Current.Close()
-
-	if e := tryRemoveFile(fileName); e != nil {
-		t.Error(e)
-		return
-	}
-	defer func() {
-		if e := tryRemoveFile(fileName); e != nil {
-			t.Error(e)
-		}
-	}()
-
-	testConfig := `
-<seelog type="asyncloop">
-	<outputs formatid="msg">
-		<file path="` + fileName + `"/>
-	</outputs>
-	<formats>
-		<format id="msg" format="%Msg%n"/>
-	</formats>
-</seelog>`
-
-	logger, _ := LoggerFromConfigAsString(testConfig)
-	err := ReplaceLogger(logger)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for i := 0; i < count; i++ {
-		Trace(strconv.Itoa(i))
-	}
-
-	Flush()
-
-	gotCount, err := countSequencedRowsInFile(fileName)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if int64(count) != gotCount {
-		t.Errorf("wrong count of log messages. Expected: %v, got: %v.", count, gotCount)
-		return
-	}
-
-	Current.Close()
-}
-
-func Test_AsyncloopOff(t *testing.T) {
-	fileName := "beh_test_asyncloopoff.log"
-	count := 100
-
-	Current.Close()
-
-	if e := tryRemoveFile(fileName); e != nil {
-		t.Error(e)
-		return
-	}
-
-	testConfig := `
-<seelog type="asyncloop" levels="off">
-	<outputs formatid="msg">
-		<file path="` + fileName + `"/>
-	</outputs>
-	<formats>
-		<format id="msg" format="%Msg%n"/>
-	</formats>
-</seelog>`
-
-	logger, _ := LoggerFromConfigAsString(testConfig)
-	err := ReplaceLogger(logger)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for i := 0; i < count; i++ {
-		Trace(strconv.Itoa(i))
-	}
-
-	Flush()
-
-	ex, err := fileExists(fileName)
-	if err != nil {
-		t.Error(err)
-	}
-	if ex {
-		t.Errorf("logger at level OFF is not expected to create log file at all.")
-		defer func() {
-			if e := tryRemoveFile(fileName); e != nil {
-				t.Error(e)
-			}
-		}()
-	}
-
-	Current.Close()
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_asynclooplogger.go b/vendor/github.com/cihub/seelog/behavior_asynclooplogger.go
deleted file mode 100644
index fdb354230..000000000
--- a/vendor/github.com/cihub/seelog/behavior_asynclooplogger.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-// asyncLoopLogger represents asynchronous logger which processes the log queue in
-// a 'for' loop
-type asyncLoopLogger struct {
-	asyncLogger
-}
-
-// newAsyncLoopLogger creates a new asynchronous loop logger
-func newAsyncLoopLogger(config *logConfig) *asyncLoopLogger {
-
-	asnLoopLogger := new(asyncLoopLogger)
-
-	asnLoopLogger.asyncLogger = *newAsyncLogger(config)
-
-	go asnLoopLogger.processQueue()
-
-	return asnLoopLogger
-}
-
-func (asnLoopLogger *asyncLoopLogger) processItem() (closed bool) {
-	asnLoopLogger.queueHasElements.L.Lock()
-	defer asnLoopLogger.queueHasElements.L.Unlock()
-
-	for asnLoopLogger.msgQueue.Len() == 0 && !asnLoopLogger.Closed() {
-		asnLoopLogger.queueHasElements.Wait()
-	}
-
-	if asnLoopLogger.Closed() {
-		return true
-	}
-
-	asnLoopLogger.processQueueElement()
-	return false
-}
-
-func (asnLoopLogger *asyncLoopLogger) processQueue() {
-	for !asnLoopLogger.Closed() {
-		closed := asnLoopLogger.processItem()
-
-		if closed {
-			break
-		}
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_asynctimer_test.go b/vendor/github.com/cihub/seelog/behavior_asynctimer_test.go
deleted file mode 100644
index 37bfa6a90..000000000
--- a/vendor/github.com/cihub/seelog/behavior_asynctimer_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"strconv"
-	"testing"
-)
-
-func Test_Asynctimer(t *testing.T) {
-	fileName := "beh_test_asynctimer.log"
-	count := 100
-
-	Current.Close()
-
-	if e := tryRemoveFile(fileName); e != nil {
-		t.Error(e)
-		return
-	}
-	defer func() {
-		if e := tryRemoveFile(fileName); e != nil {
-			t.Error(e)
-		}
-	}()
-
-	testConfig := `
-<seelog type="asynctimer" asyncinterval="100">
-	<outputs formatid="msg">
-		<file path="` + fileName + `"/>
-	</outputs>
-	<formats>
-		<format id="msg" format="%Msg%n"/>
-	</formats>
-</seelog>`
-
-	logger, _ := LoggerFromConfigAsString(testConfig)
-	err := ReplaceLogger(logger)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for i := 0; i < count; i++ {
-		Trace(strconv.Itoa(i))
-	}
-
-	Flush()
-
-	gotCount, err := countSequencedRowsInFile(fileName)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if int64(count) != gotCount {
-		t.Errorf("wrong count of log messages. Expected: %v, got: %v.", count, gotCount)
-		return
-	}
-
-	Current.Close()
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_asynctimerlogger.go b/vendor/github.com/cihub/seelog/behavior_asynctimerlogger.go
deleted file mode 100644
index 581e984df..000000000
--- a/vendor/github.com/cihub/seelog/behavior_asynctimerlogger.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"time"
-)
-
-// asyncTimerLogger represents asynchronous logger which processes the log queue each
-// 'duration' nanoseconds
-type asyncTimerLogger struct {
-	asyncLogger
-	interval time.Duration
-}
-
-// newAsyncLoopLogger creates a new asynchronous loop logger
-func newAsyncTimerLogger(config *logConfig, interval time.Duration) (*asyncTimerLogger, error) {
-
-	if interval <= 0 {
-		return nil, errors.New("async logger interval should be > 0")
-	}
-
-	asnTimerLogger := new(asyncTimerLogger)
-
-	asnTimerLogger.asyncLogger = *newAsyncLogger(config)
-	asnTimerLogger.interval = interval
-
-	go asnTimerLogger.processQueue()
-
-	return asnTimerLogger, nil
-}
-
-func (asnTimerLogger *asyncTimerLogger) processItem() (closed bool) {
-	asnTimerLogger.queueHasElements.L.Lock()
-	defer asnTimerLogger.queueHasElements.L.Unlock()
-
-	for asnTimerLogger.msgQueue.Len() == 0 && !asnTimerLogger.Closed() {
-		asnTimerLogger.queueHasElements.Wait()
-	}
-
-	if asnTimerLogger.Closed() {
-		return true
-	}
-
-	asnTimerLogger.processQueueElement()
-	return false
-}
-
-func (asnTimerLogger *asyncTimerLogger) processQueue() {
-	for !asnTimerLogger.Closed() {
-		closed := asnTimerLogger.processItem()
-
-		if closed {
-			break
-		}
-
-		<-time.After(asnTimerLogger.interval)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_synclogger.go b/vendor/github.com/cihub/seelog/behavior_synclogger.go
deleted file mode 100644
index 1a6932ae3..000000000
--- a/vendor/github.com/cihub/seelog/behavior_synclogger.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-)
-
-// syncLogger performs logging in the same goroutine where 'Trace/Debug/...'
-// func was called
-type syncLogger struct {
-	commonLogger
-}
-
-// newSyncLogger creates a new synchronous logger
-func newSyncLogger(config *logConfig) *syncLogger {
-	syncLogger := new(syncLogger)
-
-	syncLogger.commonLogger = *newCommonLogger(config, syncLogger)
-
-	return syncLogger
-}
-
-func (syncLogger *syncLogger) innerLog(
-	level LogLevel,
-	context LogContextInterface,
-	message fmt.Stringer) {
-
-	syncLogger.processLogMsg(level, message, context)
-}
-
-func (syncLogger *syncLogger) Close() {
-	syncLogger.m.Lock()
-	defer syncLogger.m.Unlock()
-
-	if !syncLogger.Closed() {
-		if err := syncLogger.config.RootDispatcher.Close(); err != nil {
-			reportInternalError(err)
-		}
-		syncLogger.closedM.Lock()
-		syncLogger.closed = true
-		syncLogger.closedM.Unlock()
-	}
-}
-
-func (syncLogger *syncLogger) Flush() {
-	syncLogger.m.Lock()
-	defer syncLogger.m.Unlock()
-
-	if !syncLogger.Closed() {
-		syncLogger.config.RootDispatcher.Flush()
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/behavior_synclogger_test.go b/vendor/github.com/cihub/seelog/behavior_synclogger_test.go
deleted file mode 100644
index ddcbbb60b..000000000
--- a/vendor/github.com/cihub/seelog/behavior_synclogger_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"strconv"
-	"testing"
-)
-
-func Test_Sync(t *testing.T) {
-	fileName := "beh_test_sync.log"
-	count := 100
-
-	Current.Close()
-
-	if e := tryRemoveFile(fileName); e != nil {
-		t.Error(e)
-		return
-	}
-	defer func() {
-		if e := tryRemoveFile(fileName); e != nil {
-			t.Error(e)
-		}
-	}()
-
-	testConfig := `
-<seelog type="sync">
-	<outputs formatid="msg">
-		<file path="` + fileName + `"/>
-	</outputs>
-	<formats>
-		<format id="msg" format="%Msg%n"/>
-	</formats>
-</seelog>`
-
-	logger, _ := LoggerFromConfigAsString(testConfig)
-	err := ReplaceLogger(logger)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for i := 0; i < count; i++ {
-		Trace(strconv.Itoa(i))
-	}
-
-	gotCount, err := countSequencedRowsInFile(fileName)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if int64(count) != gotCount {
-		t.Errorf("wrong count of log messages. Expected: %v, got: %v.", count, gotCount)
-		return
-	}
-
-	Current.Close()
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_config.go b/vendor/github.com/cihub/seelog/cfg_config.go
deleted file mode 100644
index e06dc2751..000000000
--- a/vendor/github.com/cihub/seelog/cfg_config.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"bytes"
-	"encoding/xml"
-	"io"
-	"os"
-)
-
-// LoggerFromConfigAsFile creates logger with config from file. File should contain valid seelog xml.
-func LoggerFromConfigAsFile(fileName string) (LoggerInterface, error) {
-	file, err := os.Open(fileName)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	conf, err := configFromReader(file)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromConfigAsBytes creates a logger with config from bytes stream. Bytes should contain valid seelog xml.
-func LoggerFromConfigAsBytes(data []byte) (LoggerInterface, error) {
-	conf, err := configFromReader(bytes.NewBuffer(data))
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromConfigAsString creates a logger with config from a string. String should contain valid seelog xml.
-func LoggerFromConfigAsString(data string) (LoggerInterface, error) {
-	return LoggerFromConfigAsBytes([]byte(data))
-}
-
-// LoggerFromParamConfigAsFile does the same as LoggerFromConfigAsFile, but includes special parser options.
-// See 'CfgParseParams' comments.
-func LoggerFromParamConfigAsFile(fileName string, parserParams *CfgParseParams) (LoggerInterface, error) {
-	file, err := os.Open(fileName)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	conf, err := configFromReaderWithConfig(file, parserParams)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromParamConfigAsBytes does the same as LoggerFromConfigAsBytes, but includes special parser options.
-// See 'CfgParseParams' comments.
-func LoggerFromParamConfigAsBytes(data []byte, parserParams *CfgParseParams) (LoggerInterface, error) {
-	conf, err := configFromReaderWithConfig(bytes.NewBuffer(data), parserParams)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromParamConfigAsString does the same as LoggerFromConfigAsString, but includes special parser options.
-// See 'CfgParseParams' comments.
-func LoggerFromParamConfigAsString(data string, parserParams *CfgParseParams) (LoggerInterface, error) {
-	return LoggerFromParamConfigAsBytes([]byte(data), parserParams)
-}
-
-// LoggerFromWriterWithMinLevel is shortcut for LoggerFromWriterWithMinLevelAndFormat(output, minLevel, DefaultMsgFormat)
-func LoggerFromWriterWithMinLevel(output io.Writer, minLevel LogLevel) (LoggerInterface, error) {
-	return LoggerFromWriterWithMinLevelAndFormat(output, minLevel, DefaultMsgFormat)
-}
-
-// LoggerFromWriterWithMinLevelAndFormat creates a proxy logger that uses io.Writer as the
-// receiver with minimal level = minLevel and with specified format.
-//
-// All messages with level more or equal to minLevel will be written to output and
-// formatted using the default seelog format.
-//
-// Can be called for usage with non-Seelog systems
-func LoggerFromWriterWithMinLevelAndFormat(output io.Writer, minLevel LogLevel, format string) (LoggerInterface, error) {
-	constraints, err := newMinMaxConstraints(minLevel, CriticalLvl)
-	if err != nil {
-		return nil, err
-	}
-	formatter, err := newFormatter(format)
-	if err != nil {
-		return nil, err
-	}
-	dispatcher, err := newSplitDispatcher(formatter, []interface{}{output})
-	if err != nil {
-		return nil, err
-	}
-
-	conf, err := newConfig(constraints, make([]*logLevelException, 0), dispatcher, syncloggerTypeFromString, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromXMLDecoder creates logger with config from a XML decoder starting from a specific node.
-// It should contain valid seelog xml, except for root node name.
-func LoggerFromXMLDecoder(xmlParser *xml.Decoder, rootNode xml.Token) (LoggerInterface, error) {
-	conf, err := configFromXMLDecoder(xmlParser, rootNode)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
-
-// LoggerFromCustomReceiver creates a proxy logger that uses a CustomReceiver as the
-// receiver.
-//
-// All messages will be sent to the specified custom receiver without additional
-// formatting ('%Msg' format is used).
-//
-// Check CustomReceiver, RegisterReceiver for additional info.
-//
-// NOTE 1: CustomReceiver.AfterParse is only called when a receiver is instantiated
-// by the config parser while parsing config. So, if you are not planning to use the
-// same CustomReceiver for both proxying (via LoggerFromCustomReceiver call) and
-// loading from config, just leave AfterParse implementation empty.
-//
-// NOTE 2: Unlike RegisterReceiver, LoggerFromCustomReceiver takes an already initialized
-// instance that implements CustomReceiver. So, fill it with data and perform any initialization
-// logic before calling this func and it won't be lost.
-//
-// So:
-// * RegisterReceiver takes value just to get the reflect.Type from it and then
-// instantiate it as many times as config is reloaded.
-//
-// * LoggerFromCustomReceiver takes value and uses it without modification and
-// reinstantiation, directy passing it to the dispatcher tree.
-func LoggerFromCustomReceiver(receiver CustomReceiver) (LoggerInterface, error) {
-	constraints, err := newMinMaxConstraints(TraceLvl, CriticalLvl)
-	if err != nil {
-		return nil, err
-	}
-
-	output, err := newCustomReceiverDispatcherByValue(msgonlyformatter, receiver, "user-proxy", CustomReceiverInitArgs{})
-	if err != nil {
-		return nil, err
-	}
-	dispatcher, err := newSplitDispatcher(msgonlyformatter, []interface{}{output})
-	if err != nil {
-		return nil, err
-	}
-
-	conf, err := newConfig(constraints, make([]*logLevelException, 0), dispatcher, syncloggerTypeFromString, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return createLoggerFromConfig(conf)
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_errors.go b/vendor/github.com/cihub/seelog/cfg_errors.go
deleted file mode 100644
index c1fb4d101..000000000
--- a/vendor/github.com/cihub/seelog/cfg_errors.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-)
-
-var (
-	errNodeMustHaveChildren   = errors.New("node must have children")
-	errNodeCannotHaveChildren = errors.New("node cannot have children")
-)
-
-type unexpectedChildElementError struct {
-	baseError
-}
-
-func newUnexpectedChildElementError(msg string) *unexpectedChildElementError {
-	custmsg := "Unexpected child element: " + msg
-	return &unexpectedChildElementError{baseError{message: custmsg}}
-}
-
-type missingArgumentError struct {
-	baseError
-}
-
-func newMissingArgumentError(nodeName, attrName string) *missingArgumentError {
-	custmsg := "Output '" + nodeName + "' has no '" + attrName + "' attribute"
-	return &missingArgumentError{baseError{message: custmsg}}
-}
-
-type unexpectedAttributeError struct {
-	baseError
-}
-
-func newUnexpectedAttributeError(nodeName, attr string) *unexpectedAttributeError {
-	custmsg := nodeName + " has unexpected attribute: " + attr
-	return &unexpectedAttributeError{baseError{message: custmsg}}
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_logconfig.go b/vendor/github.com/cihub/seelog/cfg_logconfig.go
deleted file mode 100644
index 0898c51c8..000000000
--- a/vendor/github.com/cihub/seelog/cfg_logconfig.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-)
-
-type loggerTypeFromString uint8
-
-const (
-	syncloggerTypeFromString = iota
-	asyncLooploggerTypeFromString
-	asyncTimerloggerTypeFromString
-	adaptiveLoggerTypeFromString
-	defaultloggerTypeFromString = asyncLooploggerTypeFromString
-)
-
-const (
-	syncloggerTypeFromStringStr       = "sync"
-	asyncloggerTypeFromStringStr      = "asyncloop"
-	asyncTimerloggerTypeFromStringStr = "asynctimer"
-	adaptiveLoggerTypeFromStringStr   = "adaptive"
-)
-
-// asyncTimerLoggerData represents specific data for async timer logger
-type asyncTimerLoggerData struct {
-	AsyncInterval uint32
-}
-
-// adaptiveLoggerData represents specific data for adaptive timer logger
-type adaptiveLoggerData struct {
-	MinInterval      uint32
-	MaxInterval      uint32
-	CriticalMsgCount uint32
-}
-
-var loggerTypeToStringRepresentations = map[loggerTypeFromString]string{
-	syncloggerTypeFromString:       syncloggerTypeFromStringStr,
-	asyncLooploggerTypeFromString:  asyncloggerTypeFromStringStr,
-	asyncTimerloggerTypeFromString: asyncTimerloggerTypeFromStringStr,
-	adaptiveLoggerTypeFromString:   adaptiveLoggerTypeFromStringStr,
-}
-
-// getLoggerTypeFromString parses a string and returns a corresponding logger type, if successful.
-func getLoggerTypeFromString(logTypeString string) (level loggerTypeFromString, found bool) {
-	for logType, logTypeStr := range loggerTypeToStringRepresentations {
-		if logTypeStr == logTypeString {
-			return logType, true
-		}
-	}
-
-	return 0, false
-}
-
-// logConfig stores logging configuration. Contains messages dispatcher, allowed log level rules
-// (general constraints and exceptions), and messages formats (used by nodes of dispatcher tree)
-type logConfig struct {
-	Constraints    logLevelConstraints  // General log level rules (>min and <max, or set of allowed levels)
-	Exceptions     []*logLevelException // Exceptions to general rules for specific files or funcs
-	RootDispatcher dispatcherInterface  // Root of output tree
-	LogType        loggerTypeFromString
-	LoggerData     interface{}
-	Params         *CfgParseParams // Check cfg_parser: CfgParseParams
-}
-
-func newConfig(
-	constraints logLevelConstraints,
-	exceptions []*logLevelException,
-	rootDispatcher dispatcherInterface,
-	logType loggerTypeFromString,
-	logData interface{},
-	cfgParams *CfgParseParams) (*logConfig, error) {
-	if constraints == nil {
-		return nil, errors.New("constraints can not be nil")
-	}
-	if rootDispatcher == nil {
-		return nil, errors.New("rootDispatcher can not be nil")
-	}
-
-	config := new(logConfig)
-	config.Constraints = constraints
-	config.Exceptions = exceptions
-	config.RootDispatcher = rootDispatcher
-	config.LogType = logType
-	config.LoggerData = logData
-	config.Params = cfgParams
-
-	return config, nil
-}
-
-// IsAllowed returns true if logging with specified log level is allowed in current context.
-// If any of exception patterns match current context, then exception constraints are applied. Otherwise,
-// the general constraints are used.
-func (config *logConfig) IsAllowed(level LogLevel, context LogContextInterface) bool {
-	allowed := config.Constraints.IsAllowed(level) // General rule
-
-	// Exceptions:
-	if context.IsValid() {
-		for _, exception := range config.Exceptions {
-			if exception.MatchesContext(context) {
-				return exception.IsAllowed(level)
-			}
-		}
-	}
-
-	return allowed
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_logconfig_test.go b/vendor/github.com/cihub/seelog/cfg_logconfig_test.go
deleted file mode 100644
index a53baae60..000000000
--- a/vendor/github.com/cihub/seelog/cfg_logconfig_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestConfig(t *testing.T) {
-	testConfig :=
-		`
-<seelog levels="trace, debug">
-	<exceptions>
-		<exception funcpattern="*getFirst*" filepattern="*" minlevel="off" />
-		<exception funcpattern="*getSecond*" filepattern="*" levels="info, error" />
-	</exceptions>
-</seelog>
-`
-
-	conf, err := configFromReader(strings.NewReader(testConfig))
-	if err != nil {
-		t.Errorf("parse error: %s\n", err.Error())
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Errorf("cannot get current context:" + err.Error())
-		return
-	}
-	firstContext, err := getFirstContext()
-	if err != nil {
-		t.Errorf("cannot get current context:" + err.Error())
-		return
-	}
-	secondContext, err := getSecondContext()
-	if err != nil {
-		t.Errorf("cannot get current context:" + err.Error())
-		return
-	}
-
-	if !conf.IsAllowed(TraceLvl, context) {
-		t.Errorf("error: deny trace in current context")
-	}
-	if conf.IsAllowed(TraceLvl, firstContext) {
-		t.Errorf("error: allow trace in first context")
-	}
-	if conf.IsAllowed(ErrorLvl, context) {
-		t.Errorf("error: allow error in current context")
-	}
-	if !conf.IsAllowed(ErrorLvl, secondContext) {
-		t.Errorf("error: deny error in second context")
-	}
-
-	// cache test
-	if !conf.IsAllowed(TraceLvl, context) {
-		t.Errorf("error: deny trace in current context")
-	}
-	if conf.IsAllowed(TraceLvl, firstContext) {
-		t.Errorf("error: allow trace in first context")
-	}
-	if conf.IsAllowed(ErrorLvl, context) {
-		t.Errorf("error: allow error in current context")
-	}
-	if !conf.IsAllowed(ErrorLvl, secondContext) {
-		t.Errorf("error: deny error in second context")
-	}
-}
-
-func getFirstContext() (LogContextInterface, error) {
-	return currentContext()
-}
-
-func getSecondContext() (LogContextInterface, error) {
-	return currentContext()
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_parser.go b/vendor/github.com/cihub/seelog/cfg_parser.go
deleted file mode 100644
index c5fbf46c0..000000000
--- a/vendor/github.com/cihub/seelog/cfg_parser.go
+++ /dev/null
@@ -1,1238 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"crypto/tls"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Names of elements of seelog config.
-const (
-	seelogConfigID                   = "seelog"
-	outputsID                        = "outputs"
-	formatsID                        = "formats"
-	minLevelID                       = "minlevel"
-	maxLevelID                       = "maxlevel"
-	levelsID                         = "levels"
-	exceptionsID                     = "exceptions"
-	exceptionID                      = "exception"
-	funcPatternID                    = "funcpattern"
-	filePatternID                    = "filepattern"
-	formatID                         = "format"
-	formatAttrID                     = "format"
-	formatKeyAttrID                  = "id"
-	outputFormatID                   = "formatid"
-	pathID                           = "path"
-	fileWriterID                     = "file"
-	smtpWriterID                     = "smtp"
-	senderaddressID                  = "senderaddress"
-	senderNameID                     = "sendername"
-	recipientID                      = "recipient"
-	mailHeaderID                     = "header"
-	mailHeaderNameID                 = "name"
-	mailHeaderValueID                = "value"
-	addressID                        = "address"
-	hostNameID                       = "hostname"
-	hostPortID                       = "hostport"
-	userNameID                       = "username"
-	userPassID                       = "password"
-	cACertDirpathID                  = "cacertdirpath"
-	subjectID                        = "subject"
-	splitterDispatcherID             = "splitter"
-	consoleWriterID                  = "console"
-	customReceiverID                 = "custom"
-	customNameAttrID                 = "name"
-	customNameDataAttrPrefix         = "data-"
-	filterDispatcherID               = "filter"
-	filterLevelsAttrID               = "levels"
-	rollingfileWriterID              = "rollingfile"
-	rollingFileTypeAttr              = "type"
-	rollingFilePathAttr              = "filename"
-	rollingFileMaxSizeAttr           = "maxsize"
-	rollingFileMaxRollsAttr          = "maxrolls"
-	rollingFileNameModeAttr          = "namemode"
-	rollingFileDataPatternAttr       = "datepattern"
-	rollingFileArchiveAttr           = "archivetype"
-	rollingFileArchivePathAttr       = "archivepath"
-	bufferedWriterID                 = "buffered"
-	bufferedSizeAttr                 = "size"
-	bufferedFlushPeriodAttr          = "flushperiod"
-	loggerTypeFromStringAttr         = "type"
-	asyncLoggerIntervalAttr          = "asyncinterval"
-	adaptLoggerMinIntervalAttr       = "mininterval"
-	adaptLoggerMaxIntervalAttr       = "maxinterval"
-	adaptLoggerCriticalMsgCountAttr  = "critmsgcount"
-	predefinedPrefix                 = "std:"
-	connWriterID                     = "conn"
-	connWriterAddrAttr               = "addr"
-	connWriterNetAttr                = "net"
-	connWriterReconnectOnMsgAttr     = "reconnectonmsg"
-	connWriterUseTLSAttr             = "tls"
-	connWriterInsecureSkipVerifyAttr = "insecureskipverify"
-)
-
-// CustomReceiverProducer is the signature of the function CfgParseParams needs to create
-// custom receivers.
-type CustomReceiverProducer func(CustomReceiverInitArgs) (CustomReceiver, error)
-
-// CfgParseParams represent specific parse options or flags used by parser. It is used if seelog parser needs
-// some special directives or additional info to correctly parse a config.
-type CfgParseParams struct {
-	// CustomReceiverProducers expose the same functionality as RegisterReceiver func
-	// but only in the scope (context) of the config parse func instead of a global package scope.
-	//
-	// It means that if you use custom receivers in your code, you may either register them globally once with
-	// RegisterReceiver or you may call funcs like LoggerFromParamConfigAsFile (with 'ParamConfig')
-	// and use CustomReceiverProducers to provide custom producer funcs.
-	//
-	// A producer func is called when config parser processes a '<custom>' element. It takes the 'name' attribute
-	// of the element and tries to find a match in two places:
-	// 1) CfgParseParams.CustomReceiverProducers map
-	// 2) Global type map, filled by RegisterReceiver
-	//
-	// If a match is found in the CustomReceiverProducers map, parser calls the corresponding producer func
-	// passing the init args to it.	The func takes exactly the same args as CustomReceiver.AfterParse.
-	// The producer func must return a correct receiver or an error. If case of error, seelog will behave
-	// in the same way as with any other config error.
-	//
-	// You may use this param to set custom producers in case you need to pass some context when instantiating
-	// a custom receiver or if you frequently change custom receivers with different parameters or in any other
-	// situation where package-level registering (RegisterReceiver) is not an option for you.
-	CustomReceiverProducers map[string]CustomReceiverProducer
-}
-
-func (cfg *CfgParseParams) String() string {
-	return fmt.Sprintf("CfgParams: {custom_recs=%d}", len(cfg.CustomReceiverProducers))
-}
-
-type elementMapEntry struct {
-	constructor func(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error)
-}
-
-var elementMap map[string]elementMapEntry
-var predefinedFormats map[string]*formatter
-
-func init() {
-	elementMap = map[string]elementMapEntry{
-		fileWriterID:         {createfileWriter},
-		splitterDispatcherID: {createSplitter},
-		customReceiverID:     {createCustomReceiver},
-		filterDispatcherID:   {createFilter},
-		consoleWriterID:      {createConsoleWriter},
-		rollingfileWriterID:  {createRollingFileWriter},
-		bufferedWriterID:     {createbufferedWriter},
-		smtpWriterID:         {createSMTPWriter},
-		connWriterID:         {createconnWriter},
-	}
-
-	err := fillPredefinedFormats()
-	if err != nil {
-		panic(fmt.Sprintf("Seelog couldn't start: predefined formats creation failed. Error: %s", err.Error()))
-	}
-}
-
-func fillPredefinedFormats() error {
-	predefinedFormatsWithoutPrefix := map[string]string{
-		"xml-debug":       `<time>%Ns</time><lev>%Lev</lev><msg>%Msg</msg><path>%RelFile</path><func>%Func</func><line>%Line</line>`,
-		"xml-debug-short": `<t>%Ns</t><l>%l</l><m>%Msg</m><p>%RelFile</p><f>%Func</f>`,
-		"xml":             `<time>%Ns</time><lev>%Lev</lev><msg>%Msg</msg>`,
-		"xml-short":       `<t>%Ns</t><l>%l</l><m>%Msg</m>`,
-
-		"json-debug":       `{"time":%Ns,"lev":"%Lev","msg":"%Msg","path":"%RelFile","func":"%Func","line":"%Line"}`,
-		"json-debug-short": `{"t":%Ns,"l":"%Lev","m":"%Msg","p":"%RelFile","f":"%Func"}`,
-		"json":             `{"time":%Ns,"lev":"%Lev","msg":"%Msg"}`,
-		"json-short":       `{"t":%Ns,"l":"%Lev","m":"%Msg"}`,
-
-		"debug":       `[%LEVEL] %RelFile:%Func.%Line %Date %Time %Msg%n`,
-		"debug-short": `[%LEVEL] %Date %Time %Msg%n`,
-		"fast":        `%Ns %l %Msg%n`,
-	}
-
-	predefinedFormats = make(map[string]*formatter)
-
-	for formatKey, format := range predefinedFormatsWithoutPrefix {
-		formatter, err := newFormatter(format)
-		if err != nil {
-			return err
-		}
-
-		predefinedFormats[predefinedPrefix+formatKey] = formatter
-	}
-
-	return nil
-}
-
-// configFromXMLDecoder parses data from a given XML decoder.
-// Returns parsed config which can be used to create logger in case no errors occured.
-// Returns error if format is incorrect or anything happened.
-func configFromXMLDecoder(xmlParser *xml.Decoder, rootNode xml.Token) (*logConfig, error) {
-	return configFromXMLDecoderWithConfig(xmlParser, rootNode, nil)
-}
-
-// configFromXMLDecoderWithConfig parses data from a given XML decoder.
-// Returns parsed config which can be used to create logger in case no errors occured.
-// Returns error if format is incorrect or anything happened.
-func configFromXMLDecoderWithConfig(xmlParser *xml.Decoder, rootNode xml.Token, cfg *CfgParseParams) (*logConfig, error) {
-	_, ok := rootNode.(xml.StartElement)
-	if !ok {
-		return nil, errors.New("rootNode must be XML startElement")
-	}
-
-	config, err := unmarshalNode(xmlParser, rootNode)
-	if err != nil {
-		return nil, err
-	}
-	if config == nil {
-		return nil, errors.New("xml has no content")
-	}
-
-	return configFromXMLNodeWithConfig(config, cfg)
-}
-
-// configFromReader parses data from a given reader.
-// Returns parsed config which can be used to create logger in case no errors occured.
-// Returns error if format is incorrect or anything happened.
-func configFromReader(reader io.Reader) (*logConfig, error) {
-	return configFromReaderWithConfig(reader, nil)
-}
-
-// configFromReaderWithConfig parses data from a given reader.
-// Returns parsed config which can be used to create logger in case no errors occured.
-// Returns error if format is incorrect or anything happened.
-func configFromReaderWithConfig(reader io.Reader, cfg *CfgParseParams) (*logConfig, error) {
-	config, err := unmarshalConfig(reader)
-	if err != nil {
-		return nil, err
-	}
-
-	if config.name != seelogConfigID {
-		return nil, errors.New("root xml tag must be '" + seelogConfigID + "'")
-	}
-
-	return configFromXMLNodeWithConfig(config, cfg)
-}
-
-func configFromXMLNodeWithConfig(config *xmlNode, cfg *CfgParseParams) (*logConfig, error) {
-	err := checkUnexpectedAttribute(
-		config,
-		minLevelID,
-		maxLevelID,
-		levelsID,
-		loggerTypeFromStringAttr,
-		asyncLoggerIntervalAttr,
-		adaptLoggerMinIntervalAttr,
-		adaptLoggerMaxIntervalAttr,
-		adaptLoggerCriticalMsgCountAttr,
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	err = checkExpectedElements(config, optionalElement(outputsID), optionalElement(formatsID), optionalElement(exceptionsID))
-	if err != nil {
-		return nil, err
-	}
-
-	constraints, err := getConstraints(config)
-	if err != nil {
-		return nil, err
-	}
-
-	exceptions, err := getExceptions(config)
-	if err != nil {
-		return nil, err
-	}
-	err = checkDistinctExceptions(exceptions)
-	if err != nil {
-		return nil, err
-	}
-
-	formats, err := getFormats(config)
-	if err != nil {
-		return nil, err
-	}
-
-	dispatcher, err := getOutputsTree(config, formats, cfg)
-	if err != nil {
-		// If we open several files, but then fail to parse the config, we should close
-		// those files before reporting that config is invalid.
-		if dispatcher != nil {
-			dispatcher.Close()
-		}
-
-		return nil, err
-	}
-
-	loggerType, logData, err := getloggerTypeFromStringData(config)
-	if err != nil {
-		return nil, err
-	}
-
-	return newConfig(constraints, exceptions, dispatcher, loggerType, logData, cfg)
-}
-
-func getConstraints(node *xmlNode) (logLevelConstraints, error) {
-	minLevelStr, isMinLevel := node.attributes[minLevelID]
-	maxLevelStr, isMaxLevel := node.attributes[maxLevelID]
-	levelsStr, isLevels := node.attributes[levelsID]
-
-	if isLevels && (isMinLevel && isMaxLevel) {
-		return nil, errors.New("for level declaration use '" + levelsID + "'' OR '" + minLevelID +
-			"', '" + maxLevelID + "'")
-	}
-
-	offString := LogLevel(Off).String()
-
-	if (isLevels && strings.TrimSpace(levelsStr) == offString) ||
-		(isMinLevel && !isMaxLevel && minLevelStr == offString) {
-
-		return newOffConstraints()
-	}
-
-	if isLevels {
-		levels, err := parseLevels(levelsStr)
-		if err != nil {
-			return nil, err
-		}
-		return newListConstraints(levels)
-	}
-
-	var minLevel = LogLevel(TraceLvl)
-	if isMinLevel {
-		found := true
-		minLevel, found = LogLevelFromString(minLevelStr)
-		if !found {
-			return nil, errors.New("declared " + minLevelID + " not found: " + minLevelStr)
-		}
-	}
-
-	var maxLevel = LogLevel(CriticalLvl)
-	if isMaxLevel {
-		found := true
-		maxLevel, found = LogLevelFromString(maxLevelStr)
-		if !found {
-			return nil, errors.New("declared " + maxLevelID + " not found: " + maxLevelStr)
-		}
-	}
-
-	return newMinMaxConstraints(minLevel, maxLevel)
-}
-
-func parseLevels(str string) ([]LogLevel, error) {
-	levelsStrArr := strings.Split(strings.Replace(str, " ", "", -1), ",")
-	var levels []LogLevel
-	for _, levelStr := range levelsStrArr {
-		level, found := LogLevelFromString(levelStr)
-		if !found {
-			return nil, errors.New("declared level not found: " + levelStr)
-		}
-
-		levels = append(levels, level)
-	}
-
-	return levels, nil
-}
-
-func getExceptions(config *xmlNode) ([]*logLevelException, error) {
-	var exceptions []*logLevelException
-
-	var exceptionsNode *xmlNode
-	for _, child := range config.children {
-		if child.name == exceptionsID {
-			exceptionsNode = child
-			break
-		}
-	}
-
-	if exceptionsNode == nil {
-		return exceptions, nil
-	}
-
-	err := checkUnexpectedAttribute(exceptionsNode)
-	if err != nil {
-		return nil, err
-	}
-
-	err = checkExpectedElements(exceptionsNode, multipleMandatoryElements("exception"))
-	if err != nil {
-		return nil, err
-	}
-
-	for _, exceptionNode := range exceptionsNode.children {
-		if exceptionNode.name != exceptionID {
-			return nil, errors.New("incorrect nested element in exceptions section: " + exceptionNode.name)
-		}
-
-		err := checkUnexpectedAttribute(exceptionNode, minLevelID, maxLevelID, levelsID, funcPatternID, filePatternID)
-		if err != nil {
-			return nil, err
-		}
-
-		constraints, err := getConstraints(exceptionNode)
-		if err != nil {
-			return nil, errors.New("incorrect " + exceptionsID + " node: " + err.Error())
-		}
-
-		funcPattern, isFuncPattern := exceptionNode.attributes[funcPatternID]
-		filePattern, isFilePattern := exceptionNode.attributes[filePatternID]
-		if !isFuncPattern {
-			funcPattern = "*"
-		}
-		if !isFilePattern {
-			filePattern = "*"
-		}
-
-		exception, err := newLogLevelException(funcPattern, filePattern, constraints)
-		if err != nil {
-			return nil, errors.New("incorrect exception node: " + err.Error())
-		}
-
-		exceptions = append(exceptions, exception)
-	}
-
-	return exceptions, nil
-}
-
-func checkDistinctExceptions(exceptions []*logLevelException) error {
-	for i, exception := range exceptions {
-		for j, exception1 := range exceptions {
-			if i == j {
-				continue
-			}
-
-			if exception.FuncPattern() == exception1.FuncPattern() &&
-				exception.FilePattern() == exception1.FilePattern() {
-
-				return fmt.Errorf("there are two or more duplicate exceptions. Func: %v, file %v",
-					exception.FuncPattern(), exception.FilePattern())
-			}
-		}
-	}
-
-	return nil
-}
-
-func getFormats(config *xmlNode) (map[string]*formatter, error) {
-	formats := make(map[string]*formatter, 0)
-
-	var formatsNode *xmlNode
-	for _, child := range config.children {
-		if child.name == formatsID {
-			formatsNode = child
-			break
-		}
-	}
-
-	if formatsNode == nil {
-		return formats, nil
-	}
-
-	err := checkUnexpectedAttribute(formatsNode)
-	if err != nil {
-		return nil, err
-	}
-
-	err = checkExpectedElements(formatsNode, multipleMandatoryElements("format"))
-	if err != nil {
-		return nil, err
-	}
-
-	for _, formatNode := range formatsNode.children {
-		if formatNode.name != formatID {
-			return nil, errors.New("incorrect nested element in " + formatsID + " section: " + formatNode.name)
-		}
-
-		err := checkUnexpectedAttribute(formatNode, formatKeyAttrID, formatID)
-		if err != nil {
-			return nil, err
-		}
-
-		id, isID := formatNode.attributes[formatKeyAttrID]
-		formatStr, isFormat := formatNode.attributes[formatAttrID]
-		if !isID {
-			return nil, errors.New("format has no '" + formatKeyAttrID + "' attribute")
-		}
-		if !isFormat {
-			return nil, errors.New("format[" + id + "] has no '" + formatAttrID + "' attribute")
-		}
-
-		formatter, err := newFormatter(formatStr)
-		if err != nil {
-			return nil, err
-		}
-
-		formats[id] = formatter
-	}
-
-	return formats, nil
-}
-
-func getloggerTypeFromStringData(config *xmlNode) (logType loggerTypeFromString, logData interface{}, err error) {
-	logTypeStr, loggerTypeExists := config.attributes[loggerTypeFromStringAttr]
-
-	if !loggerTypeExists {
-		return defaultloggerTypeFromString, nil, nil
-	}
-
-	logType, found := getLoggerTypeFromString(logTypeStr)
-
-	if !found {
-		return 0, nil, fmt.Errorf("unknown logger type: %s", logTypeStr)
-	}
-
-	if logType == asyncTimerloggerTypeFromString {
-		intervalStr, intervalExists := config.attributes[asyncLoggerIntervalAttr]
-		if !intervalExists {
-			return 0, nil, newMissingArgumentError(config.name, asyncLoggerIntervalAttr)
-		}
-
-		interval, err := strconv.ParseUint(intervalStr, 10, 32)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		logData = asyncTimerLoggerData{uint32(interval)}
-	} else if logType == adaptiveLoggerTypeFromString {
-
-		// Min interval
-		minIntStr, minIntExists := config.attributes[adaptLoggerMinIntervalAttr]
-		if !minIntExists {
-			return 0, nil, newMissingArgumentError(config.name, adaptLoggerMinIntervalAttr)
-		}
-		minInterval, err := strconv.ParseUint(minIntStr, 10, 32)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		// Max interval
-		maxIntStr, maxIntExists := config.attributes[adaptLoggerMaxIntervalAttr]
-		if !maxIntExists {
-			return 0, nil, newMissingArgumentError(config.name, adaptLoggerMaxIntervalAttr)
-		}
-		maxInterval, err := strconv.ParseUint(maxIntStr, 10, 32)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		// Critical msg count
-		criticalMsgCountStr, criticalMsgCountExists := config.attributes[adaptLoggerCriticalMsgCountAttr]
-		if !criticalMsgCountExists {
-			return 0, nil, newMissingArgumentError(config.name, adaptLoggerCriticalMsgCountAttr)
-		}
-		criticalMsgCount, err := strconv.ParseUint(criticalMsgCountStr, 10, 32)
-		if err != nil {
-			return 0, nil, err
-		}
-
-		logData = adaptiveLoggerData{uint32(minInterval), uint32(maxInterval), uint32(criticalMsgCount)}
-	}
-
-	return logType, logData, nil
-}
-
-func getOutputsTree(config *xmlNode, formats map[string]*formatter, cfg *CfgParseParams) (dispatcherInterface, error) {
-	var outputsNode *xmlNode
-	for _, child := range config.children {
-		if child.name == outputsID {
-			outputsNode = child
-			break
-		}
-	}
-
-	if outputsNode != nil {
-		err := checkUnexpectedAttribute(outputsNode, outputFormatID)
-		if err != nil {
-			return nil, err
-		}
-
-		formatter, err := getCurrentFormat(outputsNode, defaultformatter, formats)
-		if err != nil {
-			return nil, err
-		}
-
-		output, err := createSplitter(outputsNode, formatter, formats, cfg)
-		if err != nil {
-			return nil, err
-		}
-
-		dispatcher, ok := output.(dispatcherInterface)
-		if ok {
-			return dispatcher, nil
-		}
-	}
-
-	console, err := newConsoleWriter()
-	if err != nil {
-		return nil, err
-	}
-	return newSplitDispatcher(defaultformatter, []interface{}{console})
-}
-
-func getCurrentFormat(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter) (*formatter, error) {
-	formatID, isFormatID := node.attributes[outputFormatID]
-	if !isFormatID {
-		return formatFromParent, nil
-	}
-
-	format, ok := formats[formatID]
-	if ok {
-		return format, nil
-	}
-
-	// Test for predefined format match
-	pdFormat, pdOk := predefinedFormats[formatID]
-
-	if !pdOk {
-		return nil, errors.New("formatid = '" + formatID + "' doesn't exist")
-	}
-
-	return pdFormat, nil
-}
-
-func createInnerReceivers(node *xmlNode, format *formatter, formats map[string]*formatter, cfg *CfgParseParams) ([]interface{}, error) {
-	var outputs []interface{}
-	for _, childNode := range node.children {
-		entry, ok := elementMap[childNode.name]
-		if !ok {
-			return nil, errors.New("unnknown tag '" + childNode.name + "' in outputs section")
-		}
-
-		output, err := entry.constructor(childNode, format, formats, cfg)
-		if err != nil {
-			return nil, err
-		}
-
-		outputs = append(outputs, output)
-	}
-
-	return outputs, nil
-}
-
-func createSplitter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID)
-	if err != nil {
-		return nil, err
-	}
-
-	if !node.hasChildren() {
-		return nil, errNodeMustHaveChildren
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	receivers, err := createInnerReceivers(node, currentFormat, formats, cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return newSplitDispatcher(currentFormat, receivers)
-}
-
-func createCustomReceiver(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	dataCustomPrefixes := make(map[string]string)
-	// Expecting only 'formatid', 'name' and 'data-' attrs
-	for attr, attrval := range node.attributes {
-		isExpected := false
-		if attr == outputFormatID ||
-			attr == customNameAttrID {
-			isExpected = true
-		}
-		if strings.HasPrefix(attr, customNameDataAttrPrefix) {
-			dataCustomPrefixes[attr[len(customNameDataAttrPrefix):]] = attrval
-			isExpected = true
-		}
-		if !isExpected {
-			return nil, newUnexpectedAttributeError(node.name, attr)
-		}
-	}
-
-	if node.hasChildren() {
-		return nil, errNodeCannotHaveChildren
-	}
-	customName, hasCustomName := node.attributes[customNameAttrID]
-	if !hasCustomName {
-		return nil, newMissingArgumentError(node.name, customNameAttrID)
-	}
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-	args := CustomReceiverInitArgs{
-		XmlCustomAttrs: dataCustomPrefixes,
-	}
-
-	if cfg != nil && cfg.CustomReceiverProducers != nil {
-		if prod, ok := cfg.CustomReceiverProducers[customName]; ok {
-			rec, err := prod(args)
-			if err != nil {
-				return nil, err
-			}
-			creceiver, err := newCustomReceiverDispatcherByValue(currentFormat, rec, customName, args)
-			if err != nil {
-				return nil, err
-			}
-			err = rec.AfterParse(args)
-			if err != nil {
-				return nil, err
-			}
-			return creceiver, nil
-		}
-	}
-
-	return newCustomReceiverDispatcher(currentFormat, customName, args)
-}
-
-func createFilter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID, filterLevelsAttrID)
-	if err != nil {
-		return nil, err
-	}
-
-	if !node.hasChildren() {
-		return nil, errNodeMustHaveChildren
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	levelsStr, isLevels := node.attributes[filterLevelsAttrID]
-	if !isLevels {
-		return nil, newMissingArgumentError(node.name, filterLevelsAttrID)
-	}
-
-	levels, err := parseLevels(levelsStr)
-	if err != nil {
-		return nil, err
-	}
-
-	receivers, err := createInnerReceivers(node, currentFormat, formats, cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFilterDispatcher(currentFormat, receivers, levels...)
-}
-
-func createfileWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID, pathID)
-	if err != nil {
-		return nil, err
-	}
-
-	if node.hasChildren() {
-		return nil, errNodeCannotHaveChildren
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	path, isPath := node.attributes[pathID]
-	if !isPath {
-		return nil, newMissingArgumentError(node.name, pathID)
-	}
-
-	fileWriter, err := newFileWriter(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return newFormattedWriter(fileWriter, currentFormat)
-}
-
-// Creates new SMTP writer if encountered in the config file.
-func createSMTPWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID, senderaddressID, senderNameID, hostNameID, hostPortID, userNameID, userPassID, subjectID)
-	if err != nil {
-		return nil, err
-	}
-	// Node must have children.
-	if !node.hasChildren() {
-		return nil, errNodeMustHaveChildren
-	}
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-	senderAddress, ok := node.attributes[senderaddressID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, senderaddressID)
-	}
-	senderName, ok := node.attributes[senderNameID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, senderNameID)
-	}
-	// Process child nodes scanning for recipient email addresses and/or CA certificate paths.
-	var recipientAddresses []string
-	var caCertDirPaths []string
-	var mailHeaders []string
-	for _, childNode := range node.children {
-		switch childNode.name {
-		// Extract recipient address from child nodes.
-		case recipientID:
-			address, ok := childNode.attributes[addressID]
-			if !ok {
-				return nil, newMissingArgumentError(childNode.name, addressID)
-			}
-			recipientAddresses = append(recipientAddresses, address)
-		// Extract CA certificate file path from child nodes.
-		case cACertDirpathID:
-			path, ok := childNode.attributes[pathID]
-			if !ok {
-				return nil, newMissingArgumentError(childNode.name, pathID)
-			}
-			caCertDirPaths = append(caCertDirPaths, path)
-
-		// Extract email headers from child nodes.
-		case mailHeaderID:
-			headerName, ok := childNode.attributes[mailHeaderNameID]
-			if !ok {
-				return nil, newMissingArgumentError(childNode.name, mailHeaderNameID)
-			}
-
-			headerValue, ok := childNode.attributes[mailHeaderValueID]
-			if !ok {
-				return nil, newMissingArgumentError(childNode.name, mailHeaderValueID)
-			}
-
-			// Build header line
-			mailHeaders = append(mailHeaders, fmt.Sprintf("%s: %s", headerName, headerValue))
-		default:
-			return nil, newUnexpectedChildElementError(childNode.name)
-		}
-	}
-	hostName, ok := node.attributes[hostNameID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, hostNameID)
-	}
-
-	hostPort, ok := node.attributes[hostPortID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, hostPortID)
-	}
-
-	// Check if the string can really be converted into int.
-	if _, err := strconv.Atoi(hostPort); err != nil {
-		return nil, errors.New("invalid host port number")
-	}
-
-	userName, ok := node.attributes[userNameID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, userNameID)
-	}
-
-	userPass, ok := node.attributes[userPassID]
-	if !ok {
-		return nil, newMissingArgumentError(node.name, userPassID)
-	}
-
-	// subject is optionally set by configuration.
-	// default value is defined by DefaultSubjectPhrase constant in the writers_smtpwriter.go
-	var subjectPhrase = DefaultSubjectPhrase
-
-	subject, ok := node.attributes[subjectID]
-	if ok {
-		subjectPhrase = subject
-	}
-
-	smtpWriter := newSMTPWriter(
-		senderAddress,
-		senderName,
-		recipientAddresses,
-		hostName,
-		hostPort,
-		userName,
-		userPass,
-		caCertDirPaths,
-		subjectPhrase,
-		mailHeaders,
-	)
-
-	return newFormattedWriter(smtpWriter, currentFormat)
-}
-
-func createConsoleWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID)
-	if err != nil {
-		return nil, err
-	}
-
-	if node.hasChildren() {
-		return nil, errNodeCannotHaveChildren
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	consoleWriter, err := newConsoleWriter()
-	if err != nil {
-		return nil, err
-	}
-
-	return newFormattedWriter(consoleWriter, currentFormat)
-}
-
-func createconnWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	if node.hasChildren() {
-		return nil, errNodeCannotHaveChildren
-	}
-
-	err := checkUnexpectedAttribute(node, outputFormatID, connWriterAddrAttr, connWriterNetAttr, connWriterReconnectOnMsgAttr, connWriterUseTLSAttr, connWriterInsecureSkipVerifyAttr)
-	if err != nil {
-		return nil, err
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	addr, isAddr := node.attributes[connWriterAddrAttr]
-	if !isAddr {
-		return nil, newMissingArgumentError(node.name, connWriterAddrAttr)
-	}
-
-	net, isNet := node.attributes[connWriterNetAttr]
-	if !isNet {
-		return nil, newMissingArgumentError(node.name, connWriterNetAttr)
-	}
-
-	reconnectOnMsg := false
-	reconnectOnMsgStr, isReconnectOnMsgStr := node.attributes[connWriterReconnectOnMsgAttr]
-	if isReconnectOnMsgStr {
-		if reconnectOnMsgStr == "true" {
-			reconnectOnMsg = true
-		} else if reconnectOnMsgStr == "false" {
-			reconnectOnMsg = false
-		} else {
-			return nil, errors.New("node '" + node.name + "' has incorrect '" + connWriterReconnectOnMsgAttr + "' attribute value")
-		}
-	}
-
-	useTLS := false
-	useTLSStr, isUseTLSStr := node.attributes[connWriterUseTLSAttr]
-	if isUseTLSStr {
-		if useTLSStr == "true" {
-			useTLS = true
-		} else if useTLSStr == "false" {
-			useTLS = false
-		} else {
-			return nil, errors.New("node '" + node.name + "' has incorrect '" + connWriterUseTLSAttr + "' attribute value")
-		}
-		if useTLS {
-			insecureSkipVerify := false
-			insecureSkipVerifyStr, isInsecureSkipVerify := node.attributes[connWriterInsecureSkipVerifyAttr]
-			if isInsecureSkipVerify {
-				if insecureSkipVerifyStr == "true" {
-					insecureSkipVerify = true
-				} else if insecureSkipVerifyStr == "false" {
-					insecureSkipVerify = false
-				} else {
-					return nil, errors.New("node '" + node.name + "' has incorrect '" + connWriterInsecureSkipVerifyAttr + "' attribute value")
-				}
-			}
-			config := tls.Config{InsecureSkipVerify: insecureSkipVerify}
-			connWriter := newTLSWriter(net, addr, reconnectOnMsg, &config)
-			return newFormattedWriter(connWriter, currentFormat)
-		}
-	}
-
-	connWriter := newConnWriter(net, addr, reconnectOnMsg)
-
-	return newFormattedWriter(connWriter, currentFormat)
-}
-
-func createRollingFileWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	if node.hasChildren() {
-		return nil, errNodeCannotHaveChildren
-	}
-
-	rollingTypeStr, isRollingType := node.attributes[rollingFileTypeAttr]
-	if !isRollingType {
-		return nil, newMissingArgumentError(node.name, rollingFileTypeAttr)
-	}
-
-	rollingType, ok := rollingTypeFromString(rollingTypeStr)
-	if !ok {
-		return nil, errors.New("unknown rolling file type: " + rollingTypeStr)
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	path, isPath := node.attributes[rollingFilePathAttr]
-	if !isPath {
-		return nil, newMissingArgumentError(node.name, rollingFilePathAttr)
-	}
-
-	rollingArchiveStr, archiveAttrExists := node.attributes[rollingFileArchiveAttr]
-
-	var rArchiveType rollingArchiveType
-	var rArchivePath string
-	if !archiveAttrExists {
-		rArchiveType = rollingArchiveNone
-		rArchivePath = ""
-	} else {
-		rArchiveType, ok = rollingArchiveTypeFromString(rollingArchiveStr)
-		if !ok {
-			return nil, errors.New("unknown rolling archive type: " + rollingArchiveStr)
-		}
-
-		if rArchiveType == rollingArchiveNone {
-			rArchivePath = ""
-		} else {
-			rArchivePath, ok = node.attributes[rollingFileArchivePathAttr]
-			if !ok {
-				rArchivePath, ok = rollingArchiveTypesDefaultNames[rArchiveType]
-				if !ok {
-					return nil, fmt.Errorf("cannot get default filename for archive type = %v",
-						rArchiveType)
-				}
-			}
-		}
-	}
-
-	nameMode := rollingNameMode(rollingNameModePostfix)
-	nameModeStr, ok := node.attributes[rollingFileNameModeAttr]
-	if ok {
-		mode, found := rollingNameModeFromString(nameModeStr)
-		if !found {
-			return nil, errors.New("unknown rolling filename mode: " + nameModeStr)
-		} else {
-			nameMode = mode
-		}
-	}
-
-	if rollingType == rollingTypeSize {
-		err := checkUnexpectedAttribute(node, outputFormatID, rollingFileTypeAttr, rollingFilePathAttr,
-			rollingFileMaxSizeAttr, rollingFileMaxRollsAttr, rollingFileArchiveAttr,
-			rollingFileArchivePathAttr, rollingFileNameModeAttr)
-		if err != nil {
-			return nil, err
-		}
-
-		maxSizeStr, ok := node.attributes[rollingFileMaxSizeAttr]
-		if !ok {
-			return nil, newMissingArgumentError(node.name, rollingFileMaxSizeAttr)
-		}
-
-		maxSize, err := strconv.ParseInt(maxSizeStr, 10, 64)
-		if err != nil {
-			return nil, err
-		}
-
-		maxRolls := 0
-		maxRollsStr, ok := node.attributes[rollingFileMaxRollsAttr]
-		if ok {
-			maxRolls, err = strconv.Atoi(maxRollsStr)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		rollingWriter, err := newRollingFileWriterSize(path, rArchiveType, rArchivePath, maxSize, maxRolls, nameMode)
-		if err != nil {
-			return nil, err
-		}
-
-		return newFormattedWriter(rollingWriter, currentFormat)
-
-	} else if rollingType == rollingTypeTime {
-		err := checkUnexpectedAttribute(node, outputFormatID, rollingFileTypeAttr, rollingFilePathAttr,
-			rollingFileDataPatternAttr, rollingFileArchiveAttr, rollingFileMaxRollsAttr,
-			rollingFileArchivePathAttr, rollingFileNameModeAttr)
-		if err != nil {
-			return nil, err
-		}
-
-		maxRolls := 0
-		maxRollsStr, ok := node.attributes[rollingFileMaxRollsAttr]
-		if ok {
-			maxRolls, err = strconv.Atoi(maxRollsStr)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		dataPattern, ok := node.attributes[rollingFileDataPatternAttr]
-		if !ok {
-			return nil, newMissingArgumentError(node.name, rollingFileDataPatternAttr)
-		}
-
-		rollingWriter, err := newRollingFileWriterTime(path, rArchiveType, rArchivePath, maxRolls, dataPattern, rollingIntervalAny, nameMode)
-		if err != nil {
-			return nil, err
-		}
-
-		return newFormattedWriter(rollingWriter, currentFormat)
-	}
-
-	return nil, errors.New("incorrect rolling writer type " + rollingTypeStr)
-}
-
-func createbufferedWriter(node *xmlNode, formatFromParent *formatter, formats map[string]*formatter, cfg *CfgParseParams) (interface{}, error) {
-	err := checkUnexpectedAttribute(node, outputFormatID, bufferedSizeAttr, bufferedFlushPeriodAttr)
-	if err != nil {
-		return nil, err
-	}
-
-	if !node.hasChildren() {
-		return nil, errNodeMustHaveChildren
-	}
-
-	currentFormat, err := getCurrentFormat(node, formatFromParent, formats)
-	if err != nil {
-		return nil, err
-	}
-
-	sizeStr, isSize := node.attributes[bufferedSizeAttr]
-	if !isSize {
-		return nil, newMissingArgumentError(node.name, bufferedSizeAttr)
-	}
-
-	size, err := strconv.Atoi(sizeStr)
-	if err != nil {
-		return nil, err
-	}
-
-	flushPeriod := 0
-	flushPeriodStr, isFlushPeriod := node.attributes[bufferedFlushPeriodAttr]
-	if isFlushPeriod {
-		flushPeriod, err = strconv.Atoi(flushPeriodStr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Inner writer couldn't have its own format, so we pass 'currentFormat' as its parent format
-	receivers, err := createInnerReceivers(node, currentFormat, formats, cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	formattedWriter, ok := receivers[0].(*formattedWriter)
-	if !ok {
-		return nil, errors.New("buffered writer's child is not writer")
-	}
-
-	// ... and then we check that it hasn't changed
-	if formattedWriter.Format() != currentFormat {
-		return nil, errors.New("inner writer cannot have his own format")
-	}
-
-	bufferedWriter, err := newBufferedWriter(formattedWriter.Writer(), size, time.Duration(flushPeriod))
-	if err != nil {
-		return nil, err
-	}
-
-	return newFormattedWriter(bufferedWriter, currentFormat)
-}
-
-// Returns an error if node has any attributes not listed in expectedAttrs.
-func checkUnexpectedAttribute(node *xmlNode, expectedAttrs ...string) error {
-	for attr := range node.attributes {
-		isExpected := false
-		for _, expected := range expectedAttrs {
-			if attr == expected {
-				isExpected = true
-				break
-			}
-		}
-		if !isExpected {
-			return newUnexpectedAttributeError(node.name, attr)
-		}
-	}
-
-	return nil
-}
-
-type expectedElementInfo struct {
-	name      string
-	mandatory bool
-	multiple  bool
-}
-
-func optionalElement(name string) expectedElementInfo {
-	return expectedElementInfo{name, false, false}
-}
-func mandatoryElement(name string) expectedElementInfo {
-	return expectedElementInfo{name, true, false}
-}
-func multipleElements(name string) expectedElementInfo {
-	return expectedElementInfo{name, false, true}
-}
-func multipleMandatoryElements(name string) expectedElementInfo {
-	return expectedElementInfo{name, true, true}
-}
-
-func checkExpectedElements(node *xmlNode, elements ...expectedElementInfo) error {
-	for _, element := range elements {
-		count := 0
-		for _, child := range node.children {
-			if child.name == element.name {
-				count++
-			}
-		}
-
-		if count == 0 && element.mandatory {
-			return errors.New(node.name + " does not have mandatory subnode - " + element.name)
-		}
-		if count > 1 && !element.multiple {
-			return errors.New(node.name + " has more then one subnode - " + element.name)
-		}
-	}
-
-	for _, child := range node.children {
-		isExpected := false
-		for _, element := range elements {
-			if child.name == element.name {
-				isExpected = true
-			}
-		}
-
-		if !isExpected {
-			return errors.New(node.name + " has unexpected child: " + child.name)
-		}
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/cihub/seelog/cfg_parser_test.go b/vendor/github.com/cihub/seelog/cfg_parser_test.go
deleted file mode 100644
index 107d53231..000000000
--- a/vendor/github.com/cihub/seelog/cfg_parser_test.go
+++ /dev/null
@@ -1,1089 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"testing"
-)
-
-type customTestReceiverOutput struct {
-	initCalled    bool
-	dataPassed    string
-	messageOutput string
-	levelOutput   LogLevel
-	closed        bool
-	flushed       bool
-}
-type customTestReceiver struct{ co *customTestReceiverOutput }
-
-func (cr *customTestReceiver) ReceiveMessage(message string, level LogLevel, context LogContextInterface) error {
-	cr.co.messageOutput = message
-	cr.co.levelOutput = level
-	return nil
-}
-
-func (cr *customTestReceiver) String() string {
-	return fmt.Sprintf("custom data='%s'", cr.co.dataPassed)
-}
-
-func (cr *customTestReceiver) AfterParse(initArgs CustomReceiverInitArgs) error {
-	cr.co = new(customTestReceiverOutput)
-	cr.co.initCalled = true
-	cr.co.dataPassed = initArgs.XmlCustomAttrs["test"]
-	return nil
-}
-
-func (cr *customTestReceiver) Flush() {
-	cr.co.flushed = true
-}
-
-func (cr *customTestReceiver) Close() error {
-	cr.co.closed = true
-	return nil
-}
-
-var re = regexp.MustCompile(`[^a-zA-Z0-9]+`)
-
-func getTestFileName(testName, postfix string) string {
-	if len(postfix) != 0 {
-		return strings.ToLower(re.ReplaceAllString(testName, "_")) + "_" + postfix + "_test.log"
-	}
-	return strings.ToLower(re.ReplaceAllString(testName, "_")) + "_test.log"
-}
-
-var parserTests []parserTest
-
-type parserTest struct {
-	testName      string
-	config        string
-	expected      *logConfig //interface{}
-	errorExpected bool
-	parserConfig  *CfgParseParams
-}
-
-func getParserTests() []parserTest {
-	if parserTests == nil {
-		parserTests = make([]parserTest, 0)
-
-		testName := "Simple file output"
-		testLogFileName := getTestFileName(testName, "")
-		testConfig := `
-		<seelog>
-			<outputs>
-				<file path="` + testLogFileName + `"/>
-			</outputs>
-		</seelog>
-		`
-		testExpected := new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter, _ := newFileWriter(testLogFileName)
-		testHeadSplitter, _ := newSplitDispatcher(defaultformatter, []interface{}{testfileWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Filter dispatcher"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<filter levels="debug, info, critical">
-					<file path="` + testLogFileName + `"/>
-				</filter>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter, _ = newFileWriter(testLogFileName)
-		testFilter, _ := newFilterDispatcher(defaultformatter, []interface{}{testfileWriter}, DebugLvl, InfoLvl, CriticalLvl)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testFilter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Console writer"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<console />
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ := newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "SMTP writer"
-		testConfig = `
-<seelog>
-	<outputs>
-		<smtp senderaddress="sa" sendername="sn"  hostname="hn" hostport="123" username="un" password="up">
-			<recipient address="ra1"/>
-			<recipient address="ra2"/>
-			<recipient address="ra3"/>
-			<cacertdirpath path="cacdp1"/>
-			<cacertdirpath path="cacdp2"/>
-		</smtp>
-	</outputs>
-</seelog>
-		`
-
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testSMTPWriter := newSMTPWriter(
-			"sa",
-			"sn",
-			[]string{"ra1", "ra2", "ra3"},
-			"hn",
-			"123",
-			"un",
-			"up",
-			[]string{"cacdp1", "cacdp2"},
-			DefaultSubjectPhrase,
-			nil,
-		)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testSMTPWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "SMTP writer custom header and subject configuration"
-		testConfig = `
-<seelog>
-	<outputs>
-		<smtp senderaddress="sa" sendername="sn"  hostname="hn" hostport="123" username="un" password="up" subject="ohlala">
-			<recipient address="ra1"/>
-			<cacertdirpath path="cacdp1"/>
-			<header name="Priority" value="Urgent" />
-			<header name="Importance" value="high" />
-			<header name="Sensitivity" value="Company-Confidential" />
-			<header name="Auto-Submitted" value="auto-generated" />
-		</smtp>
-	</outputs>
-</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testSMTPWriter = newSMTPWriter(
-			"sa",
-			"sn",
-			[]string{"ra1"},
-			"hn",
-			"123",
-			"un",
-			"up",
-			[]string{"cacdp1"},
-			"ohlala",
-			[]string{"Priority: Urgent", "Importance: high", "Sensitivity: Company-Confidential", "Auto-Submitted: auto-generated"},
-		)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testSMTPWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Default output"
-		testConfig = `
-		<seelog type="sync"/>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Asyncloop behavior"
-		testConfig = `
-		<seelog type="asyncloop"/>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Asynctimer behavior"
-		testConfig = `
-		<seelog type="asynctimer" asyncinterval="101"/>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncTimerloggerTypeFromString
-		testExpected.LoggerData = asyncTimerLoggerData{101}
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Rolling file writer size"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<rollingfile type="size" filename="` + testLogFileName + `" maxsize="100" maxrolls="5" />
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriter, _ := newRollingFileWriterSize(testLogFileName, rollingArchiveNone, "", 100, 5, rollingNameModePostfix)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testrollingFileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Rolling file writer archive zip"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<rollingfile type="size" filename="` + testLogFileName + `" maxsize="100" maxrolls="5" archivetype="zip"/>
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriter, _ = newRollingFileWriterSize(testLogFileName, rollingArchiveZip, "log.zip", 100, 5, rollingNameModePostfix)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testrollingFileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Rolling file writer archive zip with specified path"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<rollingfile namemode="prefix" type="size" filename="` + testLogFileName + `" maxsize="100" maxrolls="5" archivetype="zip" archivepath="test.zip"/>
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriter, _ = newRollingFileWriterSize(testLogFileName, rollingArchiveZip, "test.zip", 100, 5, rollingNameModePrefix)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testrollingFileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Rolling file writer archive none"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<rollingfile namemode="postfix" type="size" filename="` + testLogFileName + `" maxsize="100" maxrolls="5" archivetype="none"/>
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriter, _ = newRollingFileWriterSize(testLogFileName, rollingArchiveNone, "", 100, 5, rollingNameModePostfix)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testrollingFileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Rolling file writer date"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<rollingfile type="date" filename="` + testLogFileName + `" datepattern="2006-01-02T15:04:05Z07:00" />
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriterTime, _ := newRollingFileWriterTime(testLogFileName, rollingArchiveNone, "", 0, "2006-01-02T15:04:05Z07:00", rollingIntervalAny, rollingNameModePostfix)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testrollingFileWriterTime})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Buffered writer"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<buffered size="100500" flushperiod="100">
-					<rollingfile type="date" filename="` + testLogFileName + `" datepattern="2006-01-02T15:04:05Z07:00" />
-				</buffered>
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriterTime, _ = newRollingFileWriterTime(testLogFileName, rollingArchiveNone, "", 0, "2006-01-02T15:04:05Z07:00", rollingIntervalDaily, rollingNameModePostfix)
-		testbufferedWriter, _ := newBufferedWriter(testrollingFileWriterTime, 100500, 100)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testbufferedWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Inner splitter output"
-		testLogFileName1 := getTestFileName(testName, "1")
-		testLogFileName2 := getTestFileName(testName, "2")
-		testLogFileName3 := getTestFileName(testName, "3")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<file path="` + testLogFileName1 + `"/>
-				<splitter>
-					<file path="` + testLogFileName2 + `"/>
-					<file path="` + testLogFileName3 + `"/>
-				</splitter>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter1, _ := newFileWriter(testLogFileName2)
-		testfileWriter2, _ := newFileWriter(testLogFileName3)
-		testInnerSplitter, _ := newSplitDispatcher(defaultformatter, []interface{}{testfileWriter1, testfileWriter2})
-		testfileWriter, _ = newFileWriter(testLogFileName1)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testfileWriter, testInnerSplitter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		RegisterReceiver("custom-name-1", &customTestReceiver{})
-
-		testName = "Custom receiver 1"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<custom name="custom-name-1" data-test="set"/>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testCustomReceiver, _ := newCustomReceiverDispatcher(defaultformatter, "custom-name-1", CustomReceiverInitArgs{
-			XmlCustomAttrs: map[string]string{
-				"test": "set",
-			},
-		})
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testCustomReceiver})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Custom receiver 2"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<custom name="custom-name-2" data-test="set2"/>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		crec := &customTestReceiver{}
-		cargs := CustomReceiverInitArgs{
-			XmlCustomAttrs: map[string]string{
-				"test": "set2",
-			},
-		}
-		crec.AfterParse(cargs)
-		testCustomReceiver2, _ := newCustomReceiverDispatcherByValue(defaultformatter, crec, "custom-name-2", cargs)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testCustomReceiver2})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		fnc := func(initArgs CustomReceiverInitArgs) (CustomReceiver, error) {
-			return &customTestReceiver{}, nil
-		}
-		cfg := CfgParseParams{
-			CustomReceiverProducers: map[string]CustomReceiverProducer{
-				"custom-name-2": CustomReceiverProducer(fnc),
-			},
-		}
-		testExpected.Params = &cfg
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, &cfg})
-
-		RegisterReceiver("-", &customTestReceiver{})
-		testName = "Custom receiver 3"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<custom name="-" data-test="set3"/>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		creccustom := &customTestReceiver{}
-		cargs3 := CustomReceiverInitArgs{
-			XmlCustomAttrs: map[string]string{
-				"test": "set3",
-			},
-		}
-		creccustom.AfterParse(cargs3)
-		testCustomReceiver, _ = newCustomReceiverDispatcherByValue(defaultformatter, creccustom, "-", cargs3)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testCustomReceiver})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Custom receivers with formats"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<custom name="custom-name-1" data-test="set1"/>
-				<custom name="custom-name-1" data-test="set2"/>
-				<custom name="custom-name-1" data-test="set3"/>
-			</outputs>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testCustomReceivers := make([]*customReceiverDispatcher, 3)
-		for i := 0; i < 3; i++ {
-			testCustomReceivers[i], _ = newCustomReceiverDispatcher(defaultformatter, "custom-name-1", CustomReceiverInitArgs{
-				XmlCustomAttrs: map[string]string{
-					"test": fmt.Sprintf("set%d", i+1),
-				},
-			})
-		}
-
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testCustomReceivers[0], testCustomReceivers[1], testCustomReceivers[2]})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Format"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs formatid="dateFormat">
-				<file path="` + testLogFileName + `"/>
-			</outputs>
-			<formats>
-				<format id="dateFormat" format="%Level %Msg %File" />
-			</formats>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter, _ = newFileWriter(testLogFileName)
-		testFormat, _ := newFormatter("%Level %Msg %File")
-		testHeadSplitter, _ = newSplitDispatcher(testFormat, []interface{}{testfileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Format2"
-		testLogFileName = getTestFileName(testName, "")
-		testLogFileName1 = getTestFileName(testName, "1")
-		testConfig = `
-		<seelog type="sync">
-			<outputs formatid="format1">
-				<file path="` + testLogFileName + `"/>
-				<file formatid="format2" path="` + testLogFileName1 + `"/>
-			</outputs>
-			<formats>
-				<format id="format1" format="%Level %Msg %File" />
-				<format id="format2" format="%l %Msg" />
-			</formats>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter, _ = newFileWriter(testLogFileName)
-		testfileWriter1, _ = newFileWriter(testLogFileName1)
-		testFormat1, _ := newFormatter("%Level %Msg %File")
-		testFormat2, _ := newFormatter("%l %Msg")
-		formattedWriter, _ := newFormattedWriter(testfileWriter1, testFormat2)
-		testHeadSplitter, _ = newSplitDispatcher(testFormat1, []interface{}{testfileWriter, formattedWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Minlevel = warn"
-		testConfig = `<seelog minlevel="warn"/>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(WarnLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Maxlevel = trace"
-		testConfig = `<seelog maxlevel="trace"/>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, TraceLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Level between info and error"
-		testConfig = `<seelog minlevel="info" maxlevel="error"/>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(InfoLvl, ErrorLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Off with minlevel"
-		testConfig = `<seelog minlevel="off"/>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newOffConstraints()
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Off with levels"
-		testConfig = `<seelog levels="off"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Levels list"
-		testConfig = `<seelog levels="debug, info, critical"/>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newListConstraints([]LogLevel{
-			DebugLvl, InfoLvl, CriticalLvl})
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = asyncLooploggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Errors #1"
-		testConfig = `<seelog minlevel="debug" minlevel="trace"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #2"
-		testConfig = `<seelog minlevel="error" maxlevel="debug"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #3"
-		testConfig = `<seelog maxlevel="debug" maxlevel="trace"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #4"
-		testConfig = `<seelog maxlevel="off"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #5"
-		testConfig = `<seelog minlevel="off" maxlevel="trace"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #6"
-		testConfig = `<seelog minlevel="warn" maxlevel="error" levels="debug"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #7"
-		testConfig = `<not_seelog/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #8"
-		testConfig = `<seelog levels="warn, debug, test"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #9"
-		testConfig = `<seelog levels=""/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #10"
-		testConfig = `<seelog levels="off" something="abc"/>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #11"
-		testConfig = `<seelog><output/></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #12"
-		testConfig = `<seelog><outputs/><outputs/></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #13"
-		testConfig = `<seelog><exceptions/></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #14"
-		testConfig = `<seelog><formats/></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #15"
-		testConfig = `<seelog><outputs><splitter/></outputs></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #16"
-		testConfig = `<seelog><outputs><filter/></outputs></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #17"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `<seelog><outputs><file path="` + testLogFileName + `"><something/></file></outputs></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #18"
-		testConfig = `<seelog><outputs><buffered size="100500" flushperiod="100"/></outputs></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #19"
-		testConfig = `<seelog><outputs></outputs></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Exceptions: restricting"
-		testConfig =
-			`
-		<seelog type="sync">
-			<exceptions>
-				<exception funcpattern="Test*" filepattern="someFile.go" minlevel="off"/>
-			</exceptions>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		listConstraint, _ := newOffConstraints()
-		exception, _ := newLogLevelException("Test*", "someFile.go", listConstraint)
-		testExpected.Exceptions = []*logLevelException{exception}
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Exceptions: allowing #1"
-		testConfig =
-			`
-		<seelog type="sync" levels="error">
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="trace"/>
-			</exceptions>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newListConstraints([]LogLevel{ErrorLvl})
-		minMaxConstraint, _ := newMinMaxConstraints(TraceLvl, CriticalLvl)
-		exception, _ = newLogLevelException("*", "testfile.go", minMaxConstraint)
-		testExpected.Exceptions = []*logLevelException{exception}
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Exceptions: allowing #2"
-		testConfig = `
-		<seelog type="sync" levels="off">
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="warn"/>
-			</exceptions>
-		</seelog>
-		`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newOffConstraints()
-		minMaxConstraint, _ = newMinMaxConstraints(WarnLvl, CriticalLvl)
-		exception, _ = newLogLevelException("*", "testfile.go", minMaxConstraint)
-		testExpected.Exceptions = []*logLevelException{exception}
-		testconsoleWriter, _ = newConsoleWriter()
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Predefined formats"
-		formatID := predefinedPrefix + "xml-debug-short"
-		testConfig = `
-		<seelog type="sync">
-			<outputs formatid="` + formatID + `">
-				<console />
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testconsoleWriter, _ = newConsoleWriter()
-		testFormat, _ = predefinedFormats[formatID]
-		testHeadSplitter, _ = newSplitDispatcher(testFormat, []interface{}{testconsoleWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Predefined formats redefine"
-		testLogFileName = getTestFileName(testName, "")
-		formatID = predefinedPrefix + "xml-debug-short"
-		testConfig = `
-		<seelog type="sync">
-			<outputs formatid="` + formatID + `">
-				<file path="` + testLogFileName + `"/>
-			</outputs>
-			<formats>
-				<format id="` + formatID + `" format="%Level %Msg %File" />
-			</formats>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testfileWriter, _ = newFileWriter(testLogFileName)
-		testFormat, _ = newFormatter("%Level %Msg %File")
-		testHeadSplitter, _ = newSplitDispatcher(testFormat, []interface{}{testfileWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Conn writer 1"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<conn net="tcp" addr=":8888" />
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testConnWriter := newConnWriter("tcp", ":8888", false)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testConnWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Conn writer 2"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<conn net="tcp" addr=":8888" reconnectonmsg="true" />
-			</outputs>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testConnWriter = newConnWriter("tcp", ":8888", true)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{testConnWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-		testName = "Errors #11"
-		testConfig = `
-		<seelog type="sync"><exceptions>
-				<exception filepattern="testfile.go" minlevel="trace"/>
-				<exception filepattern="testfile.go" minlevel="warn"/>
-		</exceptions></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #12"
-		testConfig = `
-		<seelog type="sync"><exceptions>
-				<exception filepattern="!@+$)!!%&@(^$" minlevel="trace"/>
-		</exceptions></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #13"
-		testConfig = `
-		<seelog type="sync"><exceptions>
-				<exception filepattern="*" minlevel="unknown"/>
-		</exceptions></seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #14"
-		testConfig = `
-		<seelog type="sync" levels=”off”>
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="off"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #15"
-		testConfig = `
-		<seelog type="sync" levels=”trace”>
-			<exceptions>
-				<exception filepattern="testfile.go" levels="trace"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #16"
-		testConfig = `
-		<seelog type="sync" minlevel=”trace”>
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="trace"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #17"
-		testConfig = `
-		<seelog type="sync" minlevel=”trace”>
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="warn"/>
-			</exceptions>
-			<exceptions>
-				<exception filepattern="testfile.go" minlevel="warn"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #18"
-		testConfig = `
-		<seelog type="sync" minlevel=”trace”>
-			<exceptions>
-				<exception filepattern="testfile.go"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #19"
-		testConfig = `
-		<seelog type="sync" minlevel=”trace”>
-			<exceptions>
-				<exception minlevel="warn"/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #20"
-		testConfig = `
-		<seelog type="sync" minlevel=”trace”>
-			<exceptions>
-				<exception/>
-			</exceptions>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #21"
-		testConfig = `
-		<seelog>
-			<outputs>
-				<splitter>
-				</splitter>
-			</outputs>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #22"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<filter levels="debug, info, critical">
-
-				</filter>
-			</outputs>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #23"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<buffered size="100500" flushperiod="100">
-
-				</buffered>
-			</outputs>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #24"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<buffered size="100500" flushperiod="100">
-					<rollingfile type="date" filename="` + testLogFileName + `" datepattern="2006-01-02T15:04:05Z07:00" formatid="testFormat"/>
-				</buffered>
-			</outputs>
-			<formats>
-				<format id="testFormat" format="%Level %Msg %File 123" />
-			</formats>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #25"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<outputs>
-					<file path="` + testLogFileName + `"/>
-				</outputs>
-				<outputs>
-					<file path="` + testLogFileName + `"/>
-				</outputs>
-			</outputs>
-		</seelog>
-		`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Errors #26"
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<conn net="tcp" addr=":8888" reconnectonmsg="true1" />
-			</outputs>
-		</seelog>`
-		parserTests = append(parserTests, parserTest{testName, testConfig, nil, true, nil})
-
-		testName = "Buffered writer same formatid override"
-		testLogFileName = getTestFileName(testName, "")
-		testConfig = `
-		<seelog type="sync">
-			<outputs>
-				<buffered size="100500" flushperiod="100" formatid="testFormat">
-					<rollingfile namemode="prefix" type="date" filename="` + testLogFileName + `" datepattern="2006-01-02T15:04:05Z07:00" formatid="testFormat"/>
-				</buffered>
-			</outputs>
-			<formats>
-				<format id="testFormat" format="%Level %Msg %File 123" />
-			</formats>
-		</seelog>`
-		testExpected = new(logConfig)
-		testExpected.Constraints, _ = newMinMaxConstraints(TraceLvl, CriticalLvl)
-		testExpected.Exceptions = nil
-		testrollingFileWriterTime, _ = newRollingFileWriterTime(testLogFileName, rollingArchiveNone, "", 0, "2006-01-02T15:04:05Z07:00", rollingIntervalDaily, rollingNameModePrefix)
-		testbufferedWriter, _ = newBufferedWriter(testrollingFileWriterTime, 100500, 100)
-		testFormat, _ = newFormatter("%Level %Msg %File 123")
-		formattedWriter, _ = newFormattedWriter(testbufferedWriter, testFormat)
-		testHeadSplitter, _ = newSplitDispatcher(defaultformatter, []interface{}{formattedWriter})
-		testExpected.LogType = syncloggerTypeFromString
-		testExpected.RootDispatcher = testHeadSplitter
-		parserTests = append(parserTests, parserTest{testName, testConfig, testExpected, false, nil})
-
-	}
-
-	return parserTests
-}
-
-// Temporary solution: compare by string identity. Not the best solution in
-// terms of performance, but a valid one in terms of comparison, because
-// every seelog dispatcher/receiver must have a valid String() func
-// that fully represents its internal parameters.
-func configsAreEqual(conf1 *logConfig, conf2 interface{}) bool {
-	if conf1 == nil {
-		return conf2 == nil
-	}
-	if conf2 == nil {
-		return conf1 == nil
-	}
-
-	// logConfig, ok := conf2 //.(*logConfig)
-	// if !ok {
-	// 	return false
-	// }
-
-	return fmt.Sprintf("%v", conf1) == fmt.Sprintf("%v", conf2) //logConfig)
-}
-
-func testLogFileFilter(fn string) bool {
-	return ".log" == filepath.Ext(fn)
-}
-
-func cleanupAfterCfgTest(t *testing.T) {
-	toDel, err := getDirFilePaths(".", testLogFileFilter, true)
-	if nil != err {
-		t.Fatal("Cannot list files in test directory!")
-	}
-
-	for _, p := range toDel {
-		err = tryRemoveFile(p)
-		if nil != err {
-			t.Errorf("cannot remove file %s in test directory: %s", p, err.Error())
-		}
-	}
-}
-
-func parseTest(test parserTest, t *testing.T) {
-	conf, err := configFromReaderWithConfig(strings.NewReader(test.config), test.parserConfig)
-	if /*err != nil &&*/ conf != nil && conf.RootDispatcher != nil {
-		defer func() {
-			if err = conf.RootDispatcher.Close(); err != nil {
-				t.Errorf("\n----ERROR while closing root dispatcher in %s test: %s", test.testName, err)
-			}
-		}()
-	}
-
-	if (err != nil) != test.errorExpected {
-		t.Errorf("\n----ERROR in %s:\nConfig: %s\n* Expected error:%t. Got error: %t\n",
-			test.testName, test.config, test.errorExpected, (err != nil))
-		if err != nil {
-			t.Logf("%s\n", err.Error())
-		}
-		return
-	}
-
-	if err == nil && !configsAreEqual(conf, test.expected) {
-		t.Errorf("\n----ERROR in %s:\nConfig: %s\n* Expected: %v. \n* Got: %v\n",
-			test.testName, test.config, test.expected, conf)
-	}
-}
-
-func TestParser(t *testing.T) {
-	defer cleanupAfterCfgTest(t)
-
-	for _, test := range getParserTests() {
-		parseTest(test, t)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/common_closer.go b/vendor/github.com/cihub/seelog/common_closer.go
deleted file mode 100644
index 1319c2217..000000000
--- a/vendor/github.com/cihub/seelog/common_closer.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
diff --git a/vendor/github.com/cihub/seelog/common_constraints.go b/vendor/github.com/cihub/seelog/common_constraints.go
deleted file mode 100644
index 23b3dd215..000000000
--- a/vendor/github.com/cihub/seelog/common_constraints.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-// Represents constraints which form a general rule for log levels selection
-type logLevelConstraints interface {
-	IsAllowed(level LogLevel) bool
-}
-
-// A minMaxConstraints represents constraints which use minimal and maximal allowed log levels.
-type minMaxConstraints struct {
-	min LogLevel
-	max LogLevel
-}
-
-// newMinMaxConstraints creates a new minMaxConstraints struct with the specified min and max levels.
-func newMinMaxConstraints(min LogLevel, max LogLevel) (*minMaxConstraints, error) {
-	if min > max {
-		return nil, fmt.Errorf("min level can't be greater than max. Got min: %d, max: %d", min, max)
-	}
-	if min < TraceLvl || min > CriticalLvl {
-		return nil, fmt.Errorf("min level can't be less than Trace or greater than Critical. Got min: %d", min)
-	}
-	if max < TraceLvl || max > CriticalLvl {
-		return nil, fmt.Errorf("max level can't be less than Trace or greater than Critical. Got max: %d", max)
-	}
-
-	return &minMaxConstraints{min, max}, nil
-}
-
-// IsAllowed returns true, if log level is in [min, max] range (inclusive).
-func (minMaxConstr *minMaxConstraints) IsAllowed(level LogLevel) bool {
-	return level >= minMaxConstr.min && level <= minMaxConstr.max
-}
-
-func (minMaxConstr *minMaxConstraints) String() string {
-	return fmt.Sprintf("Min: %s. Max: %s", minMaxConstr.min, minMaxConstr.max)
-}
-
-//=======================================================
-
-// A listConstraints represents constraints which use allowed log levels list.
-type listConstraints struct {
-	allowedLevels map[LogLevel]bool
-}
-
-// newListConstraints creates a new listConstraints struct with the specified allowed levels.
-func newListConstraints(allowList []LogLevel) (*listConstraints, error) {
-	if allowList == nil {
-		return nil, errors.New("list can't be nil")
-	}
-
-	allowLevels, err := createMapFromList(allowList)
-	if err != nil {
-		return nil, err
-	}
-	err = validateOffLevel(allowLevels)
-	if err != nil {
-		return nil, err
-	}
-
-	return &listConstraints{allowLevels}, nil
-}
-
-func (listConstr *listConstraints) String() string {
-	allowedList := "List: "
-
-	listLevel := make([]string, len(listConstr.allowedLevels))
-
-	var logLevel LogLevel
-	i := 0
-	for logLevel = TraceLvl; logLevel <= Off; logLevel++ {
-		if listConstr.allowedLevels[logLevel] {
-			listLevel[i] = logLevel.String()
-			i++
-		}
-	}
-
-	allowedList += strings.Join(listLevel, ",")
-
-	return allowedList
-}
-
-func createMapFromList(allowedList []LogLevel) (map[LogLevel]bool, error) {
-	allowedLevels := make(map[LogLevel]bool, 0)
-	for _, level := range allowedList {
-		if level < TraceLvl || level > Off {
-			return nil, fmt.Errorf("level can't be less than Trace or greater than Critical. Got level: %d", level)
-		}
-		allowedLevels[level] = true
-	}
-	return allowedLevels, nil
-}
-func validateOffLevel(allowedLevels map[LogLevel]bool) error {
-	if _, ok := allowedLevels[Off]; ok && len(allowedLevels) > 1 {
-		return errors.New("logLevel Off cant be mixed with other levels")
-	}
-
-	return nil
-}
-
-// IsAllowed returns true, if log level is in allowed log levels list.
-// If the list contains the only item 'common.Off' then IsAllowed will always return false for any input values.
-func (listConstr *listConstraints) IsAllowed(level LogLevel) bool {
-	for l := range listConstr.allowedLevels {
-		if l == level && level != Off {
-			return true
-		}
-	}
-
-	return false
-}
-
-// AllowedLevels returns allowed levels configuration as a map.
-func (listConstr *listConstraints) AllowedLevels() map[LogLevel]bool {
-	return listConstr.allowedLevels
-}
-
-//=======================================================
-
-type offConstraints struct {
-}
-
-func newOffConstraints() (*offConstraints, error) {
-	return &offConstraints{}, nil
-}
-
-func (offConstr *offConstraints) IsAllowed(level LogLevel) bool {
-	return false
-}
-
-func (offConstr *offConstraints) String() string {
-	return "Off constraint"
-}
diff --git a/vendor/github.com/cihub/seelog/common_constraints_test.go b/vendor/github.com/cihub/seelog/common_constraints_test.go
deleted file mode 100644
index 0f05b9df0..000000000
--- a/vendor/github.com/cihub/seelog/common_constraints_test.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-func TestInvalidminMaxConstraints(t *testing.T) {
-	constr, err := newMinMaxConstraints(CriticalLvl, WarnLvl)
-
-	if err == nil || constr != nil {
-		t.Errorf("expected an error and a nil value for minmax constraints: min = %d, max = %d. Got: %v, %v",
-			CriticalLvl, WarnLvl, err, constr)
-		return
-	}
-}
-
-func TestInvalidLogLevels(t *testing.T) {
-	var invalidMin uint8 = 123
-	var invalidMax uint8 = 124
-	minMaxConstr, errMinMax := newMinMaxConstraints(LogLevel(invalidMin), LogLevel(invalidMax))
-
-	if errMinMax == nil || minMaxConstr != nil {
-		t.Errorf("expected an error and a nil value for minmax constraints: min = %d, max = %d. Got: %v, %v",
-			invalidMin, invalidMax, errMinMax, minMaxConstr)
-		return
-	}
-
-	invalidList := []LogLevel{145}
-
-	listConstr, errList := newListConstraints(invalidList)
-
-	if errList == nil || listConstr != nil {
-		t.Errorf("expected an error and a nil value for constraints list: %v. Got: %v, %v",
-			invalidList, errList, listConstr)
-		return
-	}
-}
-
-func TestlistConstraintsWithDuplicates(t *testing.T) {
-	duplicateList := []LogLevel{TraceLvl, DebugLvl, InfoLvl,
-		WarnLvl, ErrorLvl, CriticalLvl, CriticalLvl, CriticalLvl}
-
-	listConstr, errList := newListConstraints(duplicateList)
-
-	if errList != nil || listConstr == nil {
-		t.Errorf("expected a valid constraints list struct for: %v, got error: %v, value: %v",
-			duplicateList, errList, listConstr)
-		return
-	}
-
-	listLevels := listConstr.AllowedLevels()
-
-	if listLevels == nil {
-		t.Fatalf("listConstr.AllowedLevels() == nil")
-		return
-	}
-
-	if len(listLevels) != 6 {
-		t.Errorf("expected: listConstr.AllowedLevels() length == 6. Got: %d", len(listLevels))
-		return
-	}
-}
-
-func TestlistConstraintsWithOffInList(t *testing.T) {
-	offList := []LogLevel{TraceLvl, DebugLvl, Off}
-
-	listConstr, errList := newListConstraints(offList)
-
-	if errList == nil || listConstr != nil {
-		t.Errorf("expected an error and a nil value for constraints list with 'Off':  %v. Got: %v, %v",
-			offList, errList, listConstr)
-		return
-	}
-}
-
-type logLevelTestCase struct {
-	level   LogLevel
-	allowed bool
-}
-
-var minMaxTests = []logLevelTestCase{
-	{TraceLvl, false},
-	{DebugLvl, false},
-	{InfoLvl, true},
-	{WarnLvl, true},
-	{ErrorLvl, false},
-	{CriticalLvl, false},
-	{123, false},
-	{6, false},
-}
-
-func TestValidminMaxConstraints(t *testing.T) {
-
-	constr, err := newMinMaxConstraints(InfoLvl, WarnLvl)
-
-	if err != nil || constr == nil {
-		t.Errorf("expected a valid constraints struct for minmax constraints: min = %d, max = %d. Got: %v, %v",
-			InfoLvl, WarnLvl, err, constr)
-		return
-	}
-
-	for _, minMaxTest := range minMaxTests {
-		allowed := constr.IsAllowed(minMaxTest.level)
-		if allowed != minMaxTest.allowed {
-			t.Errorf("expected IsAllowed() = %t for level = %d. Got: %t",
-				minMaxTest.allowed, minMaxTest.level, allowed)
-			return
-		}
-	}
-}
-
-var listTests = []logLevelTestCase{
-	{TraceLvl, true},
-	{DebugLvl, false},
-	{InfoLvl, true},
-	{WarnLvl, true},
-	{ErrorLvl, false},
-	{CriticalLvl, true},
-	{123, false},
-	{6, false},
-}
-
-func TestValidlistConstraints(t *testing.T) {
-	validList := []LogLevel{TraceLvl, InfoLvl, WarnLvl, CriticalLvl}
-	constr, err := newListConstraints(validList)
-
-	if err != nil || constr == nil {
-		t.Errorf("expected a valid constraints list struct for: %v. Got error: %v, value: %v",
-			validList, err, constr)
-		return
-	}
-
-	for _, minMaxTest := range listTests {
-		allowed := constr.IsAllowed(minMaxTest.level)
-		if allowed != minMaxTest.allowed {
-			t.Errorf("expected IsAllowed() = %t for level = %d. Got: %t",
-				minMaxTest.allowed, minMaxTest.level, allowed)
-			return
-		}
-	}
-}
-
-var offTests = []logLevelTestCase{
-	{TraceLvl, false},
-	{DebugLvl, false},
-	{InfoLvl, false},
-	{WarnLvl, false},
-	{ErrorLvl, false},
-	{CriticalLvl, false},
-	{123, false},
-	{6, false},
-}
-
-func TestValidListoffConstraints(t *testing.T) {
-	validList := []LogLevel{Off}
-	constr, err := newListConstraints(validList)
-
-	if err != nil || constr == nil {
-		t.Errorf("expected a valid constraints list struct for: %v. Got error: %v, value: %v",
-			validList, err, constr)
-		return
-	}
-
-	for _, minMaxTest := range offTests {
-		allowed := constr.IsAllowed(minMaxTest.level)
-		if allowed != minMaxTest.allowed {
-			t.Errorf("expected IsAllowed() = %t for level = %d. Got: %t",
-				minMaxTest.allowed, minMaxTest.level, allowed)
-			return
-		}
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/common_context.go b/vendor/github.com/cihub/seelog/common_context.go
deleted file mode 100644
index 01d948369..000000000
--- a/vendor/github.com/cihub/seelog/common_context.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-)
-
-var workingDir = "/"
-
-func init() {
-	wd, err := os.Getwd()
-	if err == nil {
-		workingDir = filepath.ToSlash(wd) + "/"
-	}
-}
-
-// Represents runtime caller context.
-type LogContextInterface interface {
-	// Caller's function name.
-	Func() string
-	// Caller's line number.
-	Line() int
-	// Caller's file short path (in slashed form).
-	ShortPath() string
-	// Caller's file full path (in slashed form).
-	FullPath() string
-	// Caller's file name (without path).
-	FileName() string
-	// True if the context is correct and may be used.
-	// If false, then an error in context evaluation occurred and
-	// all its other data may be corrupted.
-	IsValid() bool
-	// Time when log function was called.
-	CallTime() time.Time
-}
-
-// Returns context of the caller
-func currentContext() (LogContextInterface, error) {
-	return specifyContext(1)
-}
-
-func extractCallerInfo(skip int) (fullPath string, shortPath string, funcName string, line int, err error) {
-	pc, fp, ln, ok := runtime.Caller(skip)
-	if !ok {
-		err = fmt.Errorf("error during runtime.Caller")
-		return
-	}
-	line = ln
-	fullPath = fp
-	if strings.HasPrefix(fp, workingDir) {
-		shortPath = fp[len(workingDir):]
-	} else {
-		shortPath = fp
-	}
-	funcName = runtime.FuncForPC(pc).Name()
-	if strings.HasPrefix(funcName, workingDir) {
-		funcName = funcName[len(workingDir):]
-	}
-	return
-}
-
-// Returns context of the function with placed "skip" stack frames of the caller
-// If skip == 0 then behaves like currentContext
-// Context is returned in any situation, even if error occurs. But, if an error
-// occurs, the returned context is an error context, which contains no paths
-// or names, but states that they can't be extracted.
-func specifyContext(skip int) (LogContextInterface, error) {
-	callTime := time.Now()
-	if skip < 0 {
-		err := fmt.Errorf("can not skip negative stack frames")
-		return &errorContext{callTime, err}, err
-	}
-	fullPath, shortPath, funcName, line, err := extractCallerInfo(skip + 2)
-	if err != nil {
-		return &errorContext{callTime, err}, err
-	}
-	_, fileName := filepath.Split(fullPath)
-	return &logContext{funcName, line, shortPath, fullPath, fileName, callTime}, nil
-}
-
-// Represents a normal runtime caller context.
-type logContext struct {
-	funcName  string
-	line      int
-	shortPath string
-	fullPath  string
-	fileName  string
-	callTime  time.Time
-}
-
-func (context *logContext) IsValid() bool {
-	return true
-}
-
-func (context *logContext) Func() string {
-	return context.funcName
-}
-
-func (context *logContext) Line() int {
-	return context.line
-}
-
-func (context *logContext) ShortPath() string {
-	return context.shortPath
-}
-
-func (context *logContext) FullPath() string {
-	return context.fullPath
-}
-
-func (context *logContext) FileName() string {
-	return context.fileName
-}
-
-func (context *logContext) CallTime() time.Time {
-	return context.callTime
-}
-
-// Represents an error context
-type errorContext struct {
-	errorTime time.Time
-	err       error
-}
-
-func (errContext *errorContext) getErrorText(prefix string) string {
-	return fmt.Sprintf("%s() error: %s", prefix, errContext.err)
-}
-
-func (errContext *errorContext) IsValid() bool {
-	return false
-}
-
-func (errContext *errorContext) Line() int {
-	return -1
-}
-
-func (errContext *errorContext) Func() string {
-	return errContext.getErrorText("Func")
-}
-
-func (errContext *errorContext) ShortPath() string {
-	return errContext.getErrorText("ShortPath")
-}
-
-func (errContext *errorContext) FullPath() string {
-	return errContext.getErrorText("FullPath")
-}
-
-func (errContext *errorContext) FileName() string {
-	return errContext.getErrorText("FileName")
-}
-
-func (errContext *errorContext) CallTime() time.Time {
-	return errContext.errorTime
-}
diff --git a/vendor/github.com/cihub/seelog/common_context_test.go b/vendor/github.com/cihub/seelog/common_context_test.go
deleted file mode 100644
index 02c79c4fc..000000000
--- a/vendor/github.com/cihub/seelog/common_context_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-const (
-	testShortPath = "common_context_test.go"
-)
-
-var (
-	commonPrefix string
-	testFullPath string
-)
-
-func init() {
-	// Here we remove the hardcoding of the package name which
-	// may break forks and some CI environments such as jenkins.
-	_, _, funcName, _, _ := extractCallerInfo(1)
-	commonPrefix = funcName[:strings.Index(funcName, "init·")]
-	wd, err := os.Getwd()
-	if err == nil {
-		// Transform the file path into a slashed form:
-		// This is the proper platform-neutral way.
-		testFullPath = filepath.ToSlash(filepath.Join(wd, testShortPath))
-	}
-}
-
-func TestContext(t *testing.T) {
-	context, err := currentContext()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	if context == nil {
-		t.Fatalf("unexpected error: context is nil")
-	}
-	if fn, funcName := context.Func(), commonPrefix+"TestContext"; fn != funcName {
-		// Account for a case when the func full path is longer than commonPrefix but includes it.
-		if !strings.HasSuffix(fn, funcName) {
-			t.Errorf("expected context.Func == %s ; got %s", funcName, context.Func())
-		}
-	}
-	if context.ShortPath() != testShortPath {
-		t.Errorf("expected context.ShortPath == %s ; got %s", testShortPath, context.ShortPath())
-	}
-	if len(testFullPath) == 0 {
-		t.Fatal("working directory seems invalid")
-	}
-	if context.FullPath() != testFullPath {
-		t.Errorf("expected context.FullPath == %s ; got %s", testFullPath, context.FullPath())
-	}
-}
-
-func innerContext() (context LogContextInterface, err error) {
-	return currentContext()
-}
-
-func TestInnerContext(t *testing.T) {
-	context, err := innerContext()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	if context == nil {
-		t.Fatalf("unexpected error: context is nil")
-	}
-	if fn, funcName := context.Func(), commonPrefix+"innerContext"; fn != funcName {
-		// Account for a case when the func full path is longer than commonPrefix but includes it.
-		if !strings.HasSuffix(fn, funcName) {
-			t.Errorf("expected context.Func == %s ; got %s", funcName, context.Func())
-		}
-	}
-	if context.ShortPath() != testShortPath {
-		t.Errorf("expected context.ShortPath == %s ; got %s", testShortPath, context.ShortPath())
-	}
-	if len(testFullPath) == 0 {
-		t.Fatal("working directory seems invalid")
-	}
-	if context.FullPath() != testFullPath {
-		t.Errorf("expected context.FullPath == %s ; got %s", testFullPath, context.FullPath())
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/common_exception.go b/vendor/github.com/cihub/seelog/common_exception.go
deleted file mode 100644
index 9b5ebe0fc..000000000
--- a/vendor/github.com/cihub/seelog/common_exception.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-// Used in rules creation to validate input file and func filters
-var (
-	fileFormatValidator = regexp.MustCompile(`[a-zA-Z0-9\\/ _\*\.]*`)
-	funcFormatValidator = regexp.MustCompile(`[a-zA-Z0-9_\*\.]*`)
-)
-
-// logLevelException represents an exceptional case used when you need some specific files or funcs to
-// override general constraints and to use their own.
-type logLevelException struct {
-	funcPatternParts []string
-	filePatternParts []string
-
-	funcPattern string
-	filePattern string
-
-	constraints logLevelConstraints
-}
-
-// newLogLevelException creates a new exception.
-func newLogLevelException(funcPattern string, filePattern string, constraints logLevelConstraints) (*logLevelException, error) {
-	if constraints == nil {
-		return nil, errors.New("constraints can not be nil")
-	}
-
-	exception := new(logLevelException)
-
-	err := exception.initFuncPatternParts(funcPattern)
-	if err != nil {
-		return nil, err
-	}
-	exception.funcPattern = strings.Join(exception.funcPatternParts, "")
-
-	err = exception.initFilePatternParts(filePattern)
-	if err != nil {
-		return nil, err
-	}
-	exception.filePattern = strings.Join(exception.filePatternParts, "")
-
-	exception.constraints = constraints
-
-	return exception, nil
-}
-
-// MatchesContext returns true if context matches the patterns of this logLevelException
-func (logLevelEx *logLevelException) MatchesContext(context LogContextInterface) bool {
-	return logLevelEx.match(context.Func(), context.FullPath())
-}
-
-// IsAllowed returns true if log level is allowed according to the constraints of this logLevelException
-func (logLevelEx *logLevelException) IsAllowed(level LogLevel) bool {
-	return logLevelEx.constraints.IsAllowed(level)
-}
-
-// FuncPattern returns the function pattern of a exception
-func (logLevelEx *logLevelException) FuncPattern() string {
-	return logLevelEx.funcPattern
-}
-
-// FuncPattern returns the file pattern of a exception
-func (logLevelEx *logLevelException) FilePattern() string {
-	return logLevelEx.filePattern
-}
-
-// initFuncPatternParts checks whether the func filter has a correct format and splits funcPattern on parts
-func (logLevelEx *logLevelException) initFuncPatternParts(funcPattern string) (err error) {
-
-	if funcFormatValidator.FindString(funcPattern) != funcPattern {
-		return errors.New("func path \"" + funcPattern + "\" contains incorrect symbols. Only a-z A-Z 0-9 _ * . allowed)")
-	}
-
-	logLevelEx.funcPatternParts = splitPattern(funcPattern)
-	return nil
-}
-
-// Checks whether the file filter has a correct format and splits file patterns using splitPattern.
-func (logLevelEx *logLevelException) initFilePatternParts(filePattern string) (err error) {
-
-	if fileFormatValidator.FindString(filePattern) != filePattern {
-		return errors.New("file path \"" + filePattern + "\" contains incorrect symbols. Only a-z A-Z 0-9 \\ / _ * . allowed)")
-	}
-
-	logLevelEx.filePatternParts = splitPattern(filePattern)
-	return err
-}
-
-func (logLevelEx *logLevelException) match(funcPath string, filePath string) bool {
-	if !stringMatchesPattern(logLevelEx.funcPatternParts, funcPath) {
-		return false
-	}
-	return stringMatchesPattern(logLevelEx.filePatternParts, filePath)
-}
-
-func (logLevelEx *logLevelException) String() string {
-	str := fmt.Sprintf("Func: %s File: %s ", logLevelEx.funcPattern, logLevelEx.filePattern)
-
-	if logLevelEx.constraints != nil {
-		str += fmt.Sprintf("Constr: %s", logLevelEx.constraints)
-	} else {
-		str += "nil"
-	}
-
-	return str
-}
-
-// splitPattern splits pattern into strings and asterisks. Example: "ab*cde**f" -> ["ab", "*", "cde", "*", "f"]
-func splitPattern(pattern string) []string {
-	var patternParts []string
-	var lastChar rune
-	for _, char := range pattern {
-		if char == '*' {
-			if lastChar != '*' {
-				patternParts = append(patternParts, "*")
-			}
-		} else {
-			if len(patternParts) != 0 && lastChar != '*' {
-				patternParts[len(patternParts)-1] += string(char)
-			} else {
-				patternParts = append(patternParts, string(char))
-			}
-		}
-		lastChar = char
-	}
-
-	return patternParts
-}
-
-// stringMatchesPattern check whether testString matches pattern with asterisks.
-// Standard regexp functionality is not used here because of performance issues.
-func stringMatchesPattern(patternparts []string, testString string) bool {
-	if len(patternparts) == 0 {
-		return len(testString) == 0
-	}
-
-	part := patternparts[0]
-	if part != "*" {
-		index := strings.Index(testString, part)
-		if index == 0 {
-			return stringMatchesPattern(patternparts[1:], testString[len(part):])
-		}
-	} else {
-		if len(patternparts) == 1 {
-			return true
-		}
-
-		newTestString := testString
-		part = patternparts[1]
-		for {
-			index := strings.Index(newTestString, part)
-			if index == -1 {
-				break
-			}
-
-			newTestString = newTestString[index+len(part):]
-			result := stringMatchesPattern(patternparts[2:], newTestString)
-			if result {
-				return true
-			}
-		}
-	}
-	return false
-}
diff --git a/vendor/github.com/cihub/seelog/common_exception_test.go b/vendor/github.com/cihub/seelog/common_exception_test.go
deleted file mode 100644
index 4bff96113..000000000
--- a/vendor/github.com/cihub/seelog/common_exception_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-type exceptionTestCase struct {
-	funcPattern string
-	filePattern string
-	funcName    string
-	fileName    string
-	match       bool
-}
-
-var exceptionTestCases = []exceptionTestCase{
-	{"*", "*", "func", "file", true},
-	{"func*", "*", "func", "file", true},
-	{"*func", "*", "func", "file", true},
-	{"*func", "*", "1func", "file", true},
-	{"func*", "*", "func1", "file", true},
-	{"fu*nc", "*", "func", "file", true},
-	{"fu*nc", "*", "fu1nc", "file", true},
-	{"fu*nc", "*", "func1nc", "file", true},
-	{"*fu*nc*", "*", "somefuntonc", "file", true},
-	{"fu*nc", "*", "f1nc", "file", false},
-	{"func*", "*", "fun", "file", false},
-	{"fu*nc", "*", "func1n", "file", false},
-	{"**f**u**n**c**", "*", "func1n", "file", true},
-}
-
-func TestMatchingCorrectness(t *testing.T) {
-	constraints, err := newListConstraints([]LogLevel{TraceLvl})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	for _, testCase := range exceptionTestCases {
-		rule, ruleError := newLogLevelException(testCase.funcPattern, testCase.filePattern, constraints)
-		if ruleError != nil {
-			t.Fatalf("Unexpected error on rule creation: [ %v, %v ]. %v",
-				testCase.funcPattern, testCase.filePattern, ruleError)
-		}
-
-		match := rule.match(testCase.funcName, testCase.fileName)
-		if match != testCase.match {
-			t.Errorf("incorrect matching for [ %v, %v ] [ %v, %v ] Expected: %t. Got: %t",
-				testCase.funcPattern, testCase.filePattern, testCase.funcName, testCase.fileName, testCase.match, match)
-		}
-	}
-}
-
-func TestAsterisksReducing(t *testing.T) {
-	constraints, err := newListConstraints([]LogLevel{TraceLvl})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	rule, err := newLogLevelException("***func**", "fi*****le", constraints)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	expectFunc := "*func*"
-	if rule.FuncPattern() != expectFunc {
-		t.Errorf("asterisks must be reduced. Expect:%v, Got:%v", expectFunc, rule.FuncPattern())
-	}
-
-	expectFile := "fi*le"
-	if rule.FilePattern() != expectFile {
-		t.Errorf("asterisks must be reduced. Expect:%v, Got:%v", expectFile, rule.FilePattern())
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/common_flusher.go b/vendor/github.com/cihub/seelog/common_flusher.go
deleted file mode 100644
index 0ef077c8d..000000000
--- a/vendor/github.com/cihub/seelog/common_flusher.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-// flusherInterface represents all objects that have to do cleanup
-// at certain moments of time (e.g. before app shutdown to avoid data loss)
-type flusherInterface interface {
-	Flush()
-}
diff --git a/vendor/github.com/cihub/seelog/common_loglevel.go b/vendor/github.com/cihub/seelog/common_loglevel.go
deleted file mode 100644
index d54ecf270..000000000
--- a/vendor/github.com/cihub/seelog/common_loglevel.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-// Log level type
-type LogLevel uint8
-
-// Log levels
-const (
-	TraceLvl = iota
-	DebugLvl
-	InfoLvl
-	WarnLvl
-	ErrorLvl
-	CriticalLvl
-	Off
-)
-
-// Log level string representations (used in configuration files)
-const (
-	TraceStr    = "trace"
-	DebugStr    = "debug"
-	InfoStr     = "info"
-	WarnStr     = "warn"
-	ErrorStr    = "error"
-	CriticalStr = "critical"
-	OffStr      = "off"
-)
-
-var levelToStringRepresentations = map[LogLevel]string{
-	TraceLvl:    TraceStr,
-	DebugLvl:    DebugStr,
-	InfoLvl:     InfoStr,
-	WarnLvl:     WarnStr,
-	ErrorLvl:    ErrorStr,
-	CriticalLvl: CriticalStr,
-	Off:         OffStr,
-}
-
-// LogLevelFromString parses a string and returns a corresponding log level, if sucessfull.
-func LogLevelFromString(levelStr string) (level LogLevel, found bool) {
-	for lvl, lvlStr := range levelToStringRepresentations {
-		if lvlStr == levelStr {
-			return lvl, true
-		}
-	}
-
-	return 0, false
-}
-
-// LogLevelToString returns seelog string representation for a specified level. Returns "" for invalid log levels.
-func (level LogLevel) String() string {
-	levelStr, ok := levelToStringRepresentations[level]
-	if ok {
-		return levelStr
-	}
-
-	return ""
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_custom.go b/vendor/github.com/cihub/seelog/dispatch_custom.go
deleted file mode 100644
index 7c13b6701..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_custom.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) 2013 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"sort"
-)
-
-var registeredReceivers = make(map[string]reflect.Type)
-
-// RegisterReceiver records a custom receiver type, identified by a value
-// of that type (second argument), under the specified name. Registered
-// names can be used in the "name" attribute of <custom> config items.
-//
-// RegisterReceiver takes the type of the receiver argument, without taking
-// the value into the account. So do NOT enter any data to the second argument
-// and only call it like:
-//     RegisterReceiver("somename", &MyReceiverType{})
-//
-// After that, when a '<custom>' config tag with this name is used,
-// a receiver of the specified type would be instantiated. Check
-// CustomReceiver comments for interface details.
-//
-// NOTE 1: RegisterReceiver fails if you attempt to register different types
-// with the same name.
-//
-// NOTE 2: RegisterReceiver registers those receivers that must be used in
-// the configuration files (<custom> items). Basically it is just the way
-// you tell seelog config parser what should it do when it meets a
-// <custom> tag with a specific name and data attributes.
-//
-// But If you are only using seelog as a proxy to an already instantiated
-// CustomReceiver (via LoggerFromCustomReceiver func), you should not call RegisterReceiver.
-func RegisterReceiver(name string, receiver CustomReceiver) {
-	newType := reflect.TypeOf(reflect.ValueOf(receiver).Elem().Interface())
-	if t, ok := registeredReceivers[name]; ok && t != newType {
-		panic(fmt.Sprintf("duplicate types for %s: %s != %s", name, t, newType))
-	}
-	registeredReceivers[name] = newType
-}
-
-func customReceiverByName(name string) (creceiver CustomReceiver, err error) {
-	rt, ok := registeredReceivers[name]
-	if !ok {
-		return nil, fmt.Errorf("custom receiver name not registered: '%s'", name)
-	}
-	v, ok := reflect.New(rt).Interface().(CustomReceiver)
-	if !ok {
-		return nil, fmt.Errorf("cannot instantiate receiver with name='%s'", name)
-	}
-	return v, nil
-}
-
-// CustomReceiverInitArgs represent arguments passed to the CustomReceiver.Init
-// func when custom receiver is being initialized.
-type CustomReceiverInitArgs struct {
-	// XmlCustomAttrs represent '<custom>' xml config item attributes that
-	// start with "data-". Map keys will be the attribute names without the "data-".
-	// Map values will the those attribute values.
-	//
-	// E.g. if you have a '<custom name="somename" data-attr1="a1" data-attr2="a2"/>'
-	// you will get map with 2 key-value pairs: "attr1"->"a1", "attr2"->"a2"
-	//
-	// Note that in custom items you can only use allowed attributes, like "name" and
-	// your custom attributes, starting with "data-". Any other will lead to a
-	// parsing error.
-	XmlCustomAttrs map[string]string
-}
-
-// CustomReceiver is the interface that external custom seelog message receivers
-// must implement in order to be able to process seelog messages. Those receivers
-// are set in the xml config file using the <custom> tag. Check receivers reference
-// wiki section on that.
-//
-// Use seelog.RegisterReceiver on the receiver type before using it.
-type CustomReceiver interface {
-	// ReceiveMessage is called when the custom receiver gets seelog message from
-	// a parent dispatcher.
-	//
-	// Message, level and context args represent all data that was included in the seelog
-	// message at the time it was logged.
-	//
-	// The formatting is already applied to the message and depends on the config
-	// like with any other receiver.
-	//
-	// If you would like to inform seelog of an error that happened during the handling of
-	// the message, return a non-nil error. This way you'll end up seeing your error like
-	// any other internal seelog error.
-	ReceiveMessage(message string, level LogLevel, context LogContextInterface) error
-
-	// AfterParse is called immediately after your custom receiver is instantiated by
-	// the xml config parser. So, if you need to do any startup logic after config parsing,
-	// like opening file or allocating any resources after the receiver is instantiated, do it here.
-	//
-	// If this func returns a non-nil error, then the loading procedure will fail. E.g.
-	// if you are loading a seelog xml config, the parser would not finish the loading
-	// procedure and inform about an error like with any other config error.
-	//
-	// If your custom logger needs some configuration, you can use custom attributes in
-	// your config. Check CustomReceiverInitArgs.XmlCustomAttrs comments.
-	//
-	// IMPORTANT: This func is NOT called when the LoggerFromCustomReceiver func is used
-	// to create seelog proxy logger using the custom receiver. This func is only called when
-	// receiver is instantiated from a config.
-	AfterParse(initArgs CustomReceiverInitArgs) error
-
-	// Flush is called when the custom receiver gets a 'flush' directive from a
-	// parent receiver. If custom receiver implements some kind of buffering or
-	// queing, then the appropriate reaction on a flush message is synchronous
-	// flushing of all those queues/buffers. If custom receiver doesn't have
-	// such mechanisms, then flush implementation may be left empty.
-	Flush()
-
-	// Close is called when the custom receiver gets a 'close' directive from a
-	// parent receiver. This happens when a top-level seelog dispatcher is sending
-	// 'close' to all child nodes and it means that current seelog logger is being closed.
-	// If you need to do any cleanup after your custom receiver is done, you should do
-	// it here.
-	Close() error
-}
-
-type customReceiverDispatcher struct {
-	formatter          *formatter
-	innerReceiver      CustomReceiver
-	customReceiverName string
-	usedArgs           CustomReceiverInitArgs
-}
-
-// newCustomReceiverDispatcher creates a customReceiverDispatcher which dispatches data to a specific receiver created
-// using a <custom> tag in the config file.
-func newCustomReceiverDispatcher(formatter *formatter, customReceiverName string, cArgs CustomReceiverInitArgs) (*customReceiverDispatcher, error) {
-	if formatter == nil {
-		return nil, errors.New("formatter cannot be nil")
-	}
-	if len(customReceiverName) == 0 {
-		return nil, errors.New("custom receiver name cannot be empty")
-	}
-
-	creceiver, err := customReceiverByName(customReceiverName)
-	if err != nil {
-		return nil, err
-	}
-	err = creceiver.AfterParse(cArgs)
-	if err != nil {
-		return nil, err
-	}
-	disp := &customReceiverDispatcher{formatter, creceiver, customReceiverName, cArgs}
-
-	return disp, nil
-}
-
-// newCustomReceiverDispatcherByValue is basically the same as newCustomReceiverDispatcher, but using
-// a specific CustomReceiver value instead of instantiating a new one by type.
-func newCustomReceiverDispatcherByValue(formatter *formatter, customReceiver CustomReceiver, name string, cArgs CustomReceiverInitArgs) (*customReceiverDispatcher, error) {
-	if formatter == nil {
-		return nil, errors.New("formatter cannot be nil")
-	}
-	if customReceiver == nil {
-		return nil, errors.New("customReceiver cannot be nil")
-	}
-	disp := &customReceiverDispatcher{formatter, customReceiver, name, cArgs}
-
-	return disp, nil
-}
-
-// CustomReceiver implementation. Check CustomReceiver comments.
-func (disp *customReceiverDispatcher) Dispatch(
-	message string,
-	level LogLevel,
-	context LogContextInterface,
-	errorFunc func(err error)) {
-
-	defer func() {
-		if err := recover(); err != nil {
-			errorFunc(fmt.Errorf("panic in custom receiver '%s'.Dispatch: %s", reflect.TypeOf(disp.innerReceiver), err))
-		}
-	}()
-
-	err := disp.innerReceiver.ReceiveMessage(disp.formatter.Format(message, level, context), level, context)
-	if err != nil {
-		errorFunc(err)
-	}
-}
-
-// CustomReceiver implementation. Check CustomReceiver comments.
-func (disp *customReceiverDispatcher) Flush() {
-	disp.innerReceiver.Flush()
-}
-
-// CustomReceiver implementation. Check CustomReceiver comments.
-func (disp *customReceiverDispatcher) Close() error {
-	disp.innerReceiver.Flush()
-
-	err := disp.innerReceiver.Close()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (disp *customReceiverDispatcher) String() string {
-	datas := ""
-	skeys := make([]string, 0, len(disp.usedArgs.XmlCustomAttrs))
-	for i := range disp.usedArgs.XmlCustomAttrs {
-		skeys = append(skeys, i)
-	}
-	sort.Strings(skeys)
-	for _, key := range skeys {
-		datas += fmt.Sprintf("<%s, %s> ", key, disp.usedArgs.XmlCustomAttrs[key])
-	}
-
-	str := fmt.Sprintf("Custom receiver %s [fmt='%s'],[data='%s'],[inner='%s']\n",
-		disp.customReceiverName, disp.formatter.String(), datas, disp.innerReceiver)
-
-	return str
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_customdispatcher_test.go b/vendor/github.com/cihub/seelog/dispatch_customdispatcher_test.go
deleted file mode 100644
index 6510b2b6e..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_customdispatcher_test.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) 2013 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-type testCustomDispatcherMessageReceiver struct {
-	customTestReceiver
-}
-
-func TestCustomDispatcher_Message(t *testing.T) {
-	recName := "TestCustomDispatcher_Message"
-	RegisterReceiver(recName, &testCustomDispatcherMessageReceiver{})
-
-	customDispatcher, err := newCustomReceiverDispatcher(onlyMessageFormatForTest, recName, CustomReceiverInitArgs{
-		XmlCustomAttrs: map[string]string{
-			"test": "testdata",
-		},
-	})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	bytes := []byte("Hello")
-	customDispatcher.Dispatch(string(bytes), TraceLvl, context, func(err error) {})
-
-	cout := customDispatcher.innerReceiver.(*testCustomDispatcherMessageReceiver).customTestReceiver.co
-	if cout.initCalled != true {
-		t.Error("Init not called")
-		return
-	}
-	if cout.dataPassed != "testdata" {
-		t.Errorf("wrong data passed: '%s'", cout.dataPassed)
-		return
-	}
-	if cout.messageOutput != string(bytes) {
-		t.Errorf("wrong message output: '%s'", cout.messageOutput)
-		return
-	}
-	if cout.levelOutput != TraceLvl {
-		t.Errorf("wrong log level: '%s'", cout.levelOutput)
-		return
-	}
-	if cout.flushed {
-		t.Error("Flush was not expected")
-		return
-	}
-	if cout.closed {
-		t.Error("Closing was not expected")
-		return
-	}
-}
-
-type testCustomDispatcherFlushReceiver struct {
-	customTestReceiver
-}
-
-func TestCustomDispatcher_Flush(t *testing.T) {
-	recName := "TestCustomDispatcher_Flush"
-	RegisterReceiver(recName, &testCustomDispatcherFlushReceiver{})
-
-	customDispatcher, err := newCustomReceiverDispatcher(onlyMessageFormatForTest, recName, CustomReceiverInitArgs{
-		XmlCustomAttrs: map[string]string{
-			"test": "testdata",
-		},
-	})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	customDispatcher.Flush()
-
-	cout := customDispatcher.innerReceiver.(*testCustomDispatcherFlushReceiver).customTestReceiver.co
-	if cout.initCalled != true {
-		t.Error("Init not called")
-		return
-	}
-	if cout.dataPassed != "testdata" {
-		t.Errorf("wrong data passed: '%s'", cout.dataPassed)
-		return
-	}
-	if cout.messageOutput != "" {
-		t.Errorf("wrong message output: '%s'", cout.messageOutput)
-		return
-	}
-	if cout.levelOutput != TraceLvl {
-		t.Errorf("wrong log level: '%s'", cout.levelOutput)
-		return
-	}
-	if !cout.flushed {
-		t.Error("Flush was expected")
-		return
-	}
-	if cout.closed {
-		t.Error("Closing was not expected")
-		return
-	}
-}
-
-type testCustomDispatcherCloseReceiver struct {
-	customTestReceiver
-}
-
-func TestCustomDispatcher_Close(t *testing.T) {
-	recName := "TestCustomDispatcher_Close"
-	RegisterReceiver(recName, &testCustomDispatcherCloseReceiver{})
-
-	customDispatcher, err := newCustomReceiverDispatcher(onlyMessageFormatForTest, recName, CustomReceiverInitArgs{
-		XmlCustomAttrs: map[string]string{
-			"test": "testdata",
-		},
-	})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	customDispatcher.Close()
-
-	cout := customDispatcher.innerReceiver.(*testCustomDispatcherCloseReceiver).customTestReceiver.co
-	if cout.initCalled != true {
-		t.Error("Init not called")
-		return
-	}
-	if cout.dataPassed != "testdata" {
-		t.Errorf("wrong data passed: '%s'", cout.dataPassed)
-		return
-	}
-	if cout.messageOutput != "" {
-		t.Errorf("wrong message output: '%s'", cout.messageOutput)
-		return
-	}
-	if cout.levelOutput != TraceLvl {
-		t.Errorf("wrong log level: '%s'", cout.levelOutput)
-		return
-	}
-	if !cout.flushed {
-		t.Error("Flush was expected")
-		return
-	}
-	if !cout.closed {
-		t.Error("Closing was expected")
-		return
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_dispatcher.go b/vendor/github.com/cihub/seelog/dispatch_dispatcher.go
deleted file mode 100644
index e3c695586..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_dispatcher.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"io"
-)
-
-// A dispatcherInterface is used to dispatch message to all underlying receivers.
-// Dispatch logic depends on given context and log level. Any errors are reported using errorFunc.
-// Also, as underlying receivers may have a state, dispatcher has a ShuttingDown method which performs
-// an immediate cleanup of all data that is stored in the receivers
-type dispatcherInterface interface {
-	flusherInterface
-	io.Closer
-	Dispatch(message string, level LogLevel, context LogContextInterface, errorFunc func(err error))
-}
-
-type dispatcher struct {
-	formatter   *formatter
-	writers     []*formattedWriter
-	dispatchers []dispatcherInterface
-}
-
-// Creates a dispatcher which dispatches data to a list of receivers.
-// Each receiver should be either a Dispatcher or io.Writer, otherwise an error will be returned
-func createDispatcher(formatter *formatter, receivers []interface{}) (*dispatcher, error) {
-	if formatter == nil {
-		return nil, errors.New("formatter cannot be nil")
-	}
-	if receivers == nil || len(receivers) == 0 {
-		return nil, errors.New("receivers cannot be nil or empty")
-	}
-
-	disp := &dispatcher{formatter, make([]*formattedWriter, 0), make([]dispatcherInterface, 0)}
-	for _, receiver := range receivers {
-		writer, ok := receiver.(*formattedWriter)
-		if ok {
-			disp.writers = append(disp.writers, writer)
-			continue
-		}
-
-		ioWriter, ok := receiver.(io.Writer)
-		if ok {
-			writer, err := newFormattedWriter(ioWriter, disp.formatter)
-			if err != nil {
-				return nil, err
-			}
-			disp.writers = append(disp.writers, writer)
-			continue
-		}
-
-		dispInterface, ok := receiver.(dispatcherInterface)
-		if ok {
-			disp.dispatchers = append(disp.dispatchers, dispInterface)
-			continue
-		}
-
-		return nil, errors.New("method can receive either io.Writer or dispatcherInterface")
-	}
-
-	return disp, nil
-}
-
-func (disp *dispatcher) Dispatch(
-	message string,
-	level LogLevel,
-	context LogContextInterface,
-	errorFunc func(err error)) {
-
-	for _, writer := range disp.writers {
-		err := writer.Write(message, level, context)
-		if err != nil {
-			errorFunc(err)
-		}
-	}
-
-	for _, dispInterface := range disp.dispatchers {
-		dispInterface.Dispatch(message, level, context, errorFunc)
-	}
-}
-
-// Flush goes through all underlying writers which implement flusherInterface interface
-// and closes them. Recursively performs the same action for underlying dispatchers
-func (disp *dispatcher) Flush() {
-	for _, disp := range disp.Dispatchers() {
-		disp.Flush()
-	}
-
-	for _, formatWriter := range disp.Writers() {
-		flusher, ok := formatWriter.Writer().(flusherInterface)
-		if ok {
-			flusher.Flush()
-		}
-	}
-}
-
-// Close goes through all underlying writers which implement io.Closer interface
-// and closes them. Recursively performs the same action for underlying dispatchers
-// Before closing, writers are flushed to prevent loss of any buffered data, so
-// a call to Flush() func before Close() is not necessary
-func (disp *dispatcher) Close() error {
-	for _, disp := range disp.Dispatchers() {
-		disp.Flush()
-		err := disp.Close()
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, formatWriter := range disp.Writers() {
-		flusher, ok := formatWriter.Writer().(flusherInterface)
-		if ok {
-			flusher.Flush()
-		}
-
-		closer, ok := formatWriter.Writer().(io.Closer)
-		if ok {
-			err := closer.Close()
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (disp *dispatcher) Writers() []*formattedWriter {
-	return disp.writers
-}
-
-func (disp *dispatcher) Dispatchers() []dispatcherInterface {
-	return disp.dispatchers
-}
-
-func (disp *dispatcher) String() string {
-	str := "formatter: " + disp.formatter.String() + "\n"
-
-	str += "    ->Dispatchers:"
-
-	if len(disp.dispatchers) == 0 {
-		str += "none\n"
-	} else {
-		str += "\n"
-
-		for _, disp := range disp.dispatchers {
-			str += fmt.Sprintf("        ->%s", disp)
-		}
-	}
-
-	str += "    ->Writers:"
-
-	if len(disp.writers) == 0 {
-		str += "none\n"
-	} else {
-		str += "\n"
-
-		for _, writer := range disp.writers {
-			str += fmt.Sprintf("        ->%s\n", writer)
-		}
-	}
-
-	return str
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_filterdispatcher.go b/vendor/github.com/cihub/seelog/dispatch_filterdispatcher.go
deleted file mode 100644
index 60da31fe5..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_filterdispatcher.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-)
-
-// A filterDispatcher writes the given message to underlying receivers only if message log level
-// is in the allowed list.
-type filterDispatcher struct {
-	*dispatcher
-	allowList map[LogLevel]bool
-}
-
-// newFilterDispatcher creates a new filterDispatcher using a list of allowed levels.
-func newFilterDispatcher(formatter *formatter, receivers []interface{}, allowList ...LogLevel) (*filterDispatcher, error) {
-	disp, err := createDispatcher(formatter, receivers)
-	if err != nil {
-		return nil, err
-	}
-
-	allows := make(map[LogLevel]bool)
-	for _, allowLevel := range allowList {
-		allows[allowLevel] = true
-	}
-
-	return &filterDispatcher{disp, allows}, nil
-}
-
-func (filter *filterDispatcher) Dispatch(
-	message string,
-	level LogLevel,
-	context LogContextInterface,
-	errorFunc func(err error)) {
-	isAllowed, ok := filter.allowList[level]
-	if ok && isAllowed {
-		filter.dispatcher.Dispatch(message, level, context, errorFunc)
-	}
-}
-
-func (filter *filterDispatcher) String() string {
-	return fmt.Sprintf("filterDispatcher ->\n%s", filter.dispatcher)
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_filterdispatcher_test.go b/vendor/github.com/cihub/seelog/dispatch_filterdispatcher_test.go
deleted file mode 100644
index 70138b988..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_filterdispatcher_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-func TestfilterDispatcher_Pass(t *testing.T) {
-	writer, _ := newBytesVerifier(t)
-	filter, err := newFilterDispatcher(onlyMessageFormatForTest, []interface{}{writer}, TraceLvl)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	bytes := []byte("Hello")
-	writer.ExpectBytes(bytes)
-	filter.Dispatch(string(bytes), TraceLvl, context, func(err error) {})
-	writer.MustNotExpect()
-}
-
-func TestfilterDispatcher_Deny(t *testing.T) {
-	writer, _ := newBytesVerifier(t)
-	filter, err := newFilterDispatcher(defaultformatter, []interface{}{writer})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	bytes := []byte("Hello")
-	filter.Dispatch(string(bytes), TraceLvl, context, func(err error) {})
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_splitdispatcher.go b/vendor/github.com/cihub/seelog/dispatch_splitdispatcher.go
deleted file mode 100644
index 218729ca4..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_splitdispatcher.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-)
-
-// A splitDispatcher just writes the given message to underlying receivers. (Splits the message stream.)
-type splitDispatcher struct {
-	*dispatcher
-}
-
-func newSplitDispatcher(formatter *formatter, receivers []interface{}) (*splitDispatcher, error) {
-	disp, err := createDispatcher(formatter, receivers)
-	if err != nil {
-		return nil, err
-	}
-
-	return &splitDispatcher{disp}, nil
-}
-
-func (splitter *splitDispatcher) String() string {
-	return fmt.Sprintf("splitDispatcher ->\n%s", splitter.dispatcher.String())
-}
diff --git a/vendor/github.com/cihub/seelog/dispatch_splitdispatcher_test.go b/vendor/github.com/cihub/seelog/dispatch_splitdispatcher_test.go
deleted file mode 100644
index 08499a80c..000000000
--- a/vendor/github.com/cihub/seelog/dispatch_splitdispatcher_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"testing"
-)
-
-var onlyMessageFormatForTest *formatter
-
-func init() {
-	var err error
-	onlyMessageFormatForTest, err = newFormatter("%Msg")
-	if err != nil {
-		fmt.Println("Can not create only message format: " + err.Error())
-	}
-}
-
-func TestsplitDispatcher(t *testing.T) {
-	writer1, _ := newBytesVerifier(t)
-	writer2, _ := newBytesVerifier(t)
-	spliter, err := newSplitDispatcher(onlyMessageFormatForTest, []interface{}{writer1, writer2})
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	bytes := []byte("Hello")
-
-	writer1.ExpectBytes(bytes)
-	writer2.ExpectBytes(bytes)
-	spliter.Dispatch(string(bytes), TraceLvl, context, func(err error) {})
-	writer1.MustNotExpect()
-	writer2.MustNotExpect()
-}
diff --git a/vendor/github.com/cihub/seelog/doc.go b/vendor/github.com/cihub/seelog/doc.go
deleted file mode 100644
index 95c15ae99..000000000
--- a/vendor/github.com/cihub/seelog/doc.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright (c) 2014 - Cloud Instruments Co., 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:
-//
-// 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 seelog implements logging functionality with flexible dispatching, filtering, and formatting.
-
-Creation
-
-To create a logger, use one of the following constructors:
-  func LoggerFromConfigAsBytes
-  func LoggerFromConfigAsFile
-  func LoggerFromConfigAsString
-  func LoggerFromWriterWithMinLevel
-  func LoggerFromWriterWithMinLevelAndFormat
-  func LoggerFromCustomReceiver (check https://github.com/cihub/seelog/wiki/Custom-receivers)
-Example:
-  import log "github.com/cihub/seelog"
-
-  func main() {
-      logger, err := log.LoggerFromConfigAsFile("seelog.xml")
-      if err != nil {
-          panic(err)
-      }
-      defer logger.Flush()
-      ... use logger ...
-  }
-The "defer" line is important because if you are using asynchronous logger behavior, without this line you may end up losing some
-messages when you close your application because they are processed in another non-blocking goroutine. To avoid that you
-explicitly defer flushing all messages before closing.
-
-Usage
-
-Logger created using one of the LoggerFrom* funcs can be used directly by calling one of the main log funcs.
-Example:
-  import log "github.com/cihub/seelog"
-
-  func main() {
-      logger, err := log.LoggerFromConfigAsFile("seelog.xml")
-      if err != nil {
-          panic(err)
-      }
-      defer logger.Flush()
-      logger.Trace("test")
-      logger.Debugf("var = %s", "abc")
-  }
-
-Having loggers as variables is convenient if you are writing your own package with internal logging or if you have
-several loggers with different options.
-But for most standalone apps it is more convenient to use package level funcs and vars. There is a package level
-var 'Current' made for it. You can replace it with another logger using 'ReplaceLogger' and then use package level funcs:
-  import log "github.com/cihub/seelog"
-
-  func main() {
-      logger, err := log.LoggerFromConfigAsFile("seelog.xml")
-      if err != nil {
-          panic(err)
-      }
-      log.ReplaceLogger(logger)
-      defer log.Flush()
-      log.Trace("test")
-      log.Debugf("var = %s", "abc")
-  }
-Last lines
-      log.Trace("test")
-      log.Debugf("var = %s", "abc")
-do the same as
-      log.Current.Trace("test")
-      log.Current.Debugf("var = %s", "abc")
-In this example the 'Current' logger was replaced using a 'ReplaceLogger' call and became equal to 'logger' variable created from config.
-This way you are able to use package level funcs instead of passing the logger variable.
-
-Configuration
-
-Main seelog point is to configure logger via config files and not the code. So you can only specify
-formats and log rules by changing the configuration.
-The configuration is read by LoggerFrom* funcs. These funcs read xml configuration from different sources and try
-to create a logger using it.
-
-All the configuration features are covered in detail in the official wiki: https://github.com/cihub/seelog/wiki.
-There are many sections covering different aspects of seelog, but the most important for understanding configs are:
-    https://github.com/cihub/seelog/wiki/Constraints-and-exceptions
-    https://github.com/cihub/seelog/wiki/Dispatchers-and-receivers
-    https://github.com/cihub/seelog/wiki/Formatting
-    https://github.com/cihub/seelog/wiki/Logger-types
-After you understand these concepts, check the 'Reference' section on the main wiki page to get the up-to-date
-list of dispatchers, receivers, formats, and logger types.
-
-Here is an example config with all these features:
-    <seelog type="adaptive" mininterval="2000000" maxinterval="100000000" critmsgcount="500" minlevel="debug">
-        <exceptions>
-            <exception filepattern="test*" minlevel="error"/>
-        </exceptions>
-        <outputs formatid="all">
-            <file path="all.log"/>
-            <filter levels="info">
-              <console formatid="fmtinfo"/>
-            </filter>
-            <filter levels="error,critical" formatid="fmterror">
-              <console/>
-              <file path="errors.log"/>
-            </filter>
-        </outputs>
-        <formats>
-            <format id="fmtinfo" format="[%Level] [%Time] %Msg%n"/>
-            <format id="fmterror" format="[%LEVEL] [%Time] [%FuncShort @ %File.%Line] %Msg%n"/>
-            <format id="all" format="[%Level] [%Time] [@ %File.%Line] %Msg%n"/>
-            <format id="criticalemail" format="Critical error on our server!\n    %Time %Date %RelFile %Func %Msg \nSent by Seelog"/>
-        </formats>
-    </seelog>
-This config represents a logger with adaptive timeout between log messages (check logger types reference) which
-logs to console, all.log, and errors.log depending on the log level. Its output formats also depend on log level. This logger will only
-use log level 'debug' and higher (minlevel is set) for all files with names that don't start with 'test'. For files starting with 'test'
-this logger prohibits all levels below 'error'.
-
-Examples
-
-To learn seelog features faster you should check the examples package: https://github.com/cihub/seelog-examples
-It contains many example configs and usecases.
-*/
-package seelog
diff --git a/vendor/github.com/cihub/seelog/format.go b/vendor/github.com/cihub/seelog/format.go
deleted file mode 100644
index b71994efd..000000000
--- a/vendor/github.com/cihub/seelog/format.go
+++ /dev/null
@@ -1,461 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-// FormatterSymbol is a special symbol used in config files to mark special format aliases.
-const (
-	FormatterSymbol = '%'
-)
-
-const (
-	formatterParameterStart = '('
-	formatterParameterEnd   = ')'
-)
-
-// Time and date formats used for %Date and %Time aliases.
-const (
-	DateDefaultFormat = "2006-01-02"
-	TimeFormat        = "15:04:05"
-)
-
-var DefaultMsgFormat = "%Ns [%Level] %Msg%n"
-
-var (
-	defaultformatter *formatter
-	msgonlyformatter *formatter
-)
-
-func init() {
-	var err error
-	if defaultformatter, err = newFormatter(DefaultMsgFormat); err != nil {
-		reportInternalError(fmt.Errorf("error during creating defaultformatter: %s", err))
-	}
-	if msgonlyformatter, err = newFormatter("%Msg"); err != nil {
-		reportInternalError(fmt.Errorf("error during creating msgonlyformatter: %s", err))
-	}
-}
-
-// FormatterFunc represents one formatter object that starts with '%' sign in the 'format' attribute
-// of the 'format' config item. These special symbols are replaced with context values or special
-// strings when message is written to byte receiver.
-//
-// Check https://github.com/cihub/seelog/wiki/Formatting for details.
-// Full list (with descriptions) of formatters: https://github.com/cihub/seelog/wiki/Format-reference
-//
-// FormatterFunc takes raw log message, level, log context and returns a string, number (of any type) or any object
-// that can be evaluated as string.
-type FormatterFunc func(message string, level LogLevel, context LogContextInterface) interface{}
-
-// FormatterFuncCreator is a factory of FormatterFunc objects. It is used to generate parameterized
-// formatters (such as %Date or %EscM) and custom user formatters.
-type FormatterFuncCreator func(param string) FormatterFunc
-
-var formatterFuncs = map[string]FormatterFunc{
-	"Level":     formatterLevel,
-	"Lev":       formatterLev,
-	"LEVEL":     formatterLEVEL,
-	"LEV":       formatterLEV,
-	"l":         formatterl,
-	"Msg":       formatterMsg,
-	"FullPath":  formatterFullPath,
-	"File":      formatterFile,
-	"RelFile":   formatterRelFile,
-	"Func":      FormatterFunction,
-	"FuncShort": FormatterFunctionShort,
-	"Line":      formatterLine,
-	"Time":      formatterTime,
-	"UTCTime":   formatterUTCTime,
-	"Ns":        formatterNs,
-	"UTCNs":     formatterUTCNs,
-	"n":         formattern,
-	"t":         formattert,
-}
-
-var formatterFuncsParameterized = map[string]FormatterFuncCreator{
-	"Date":    createDateTimeFormatterFunc,
-	"UTCDate": createUTCDateTimeFormatterFunc,
-	"EscM":    createANSIEscapeFunc,
-}
-
-func errorAliasReserved(name string) error {
-	return fmt.Errorf("cannot use '%s' as custom formatter name. Name is reserved", name)
-}
-
-// RegisterCustomFormatter registers a new custom formatter factory with a given name. If returned error is nil,
-// then this name (prepended by '%' symbol) can be used in 'format' attributes in configuration and
-// it will be treated like the standard parameterized formatter identifiers.
-//
-// RegisterCustomFormatter needs to be called before creating a logger for it to take effect. The general recommendation
-// is to call it once in 'init' func of your application or any initializer func.
-//
-// For usage examples, check https://github.com/cihub/seelog/wiki/Custom-formatters.
-//
-// Name must only consist of letters (unicode.IsLetter).
-//
-// Name must not be one of the already registered standard formatter names
-// (https://github.com/cihub/seelog/wiki/Format-reference) and previously registered
-// custom format names. To avoid any potential name conflicts (in future releases), it is recommended
-// to start your custom formatter name with a namespace (e.g. 'MyCompanySomething') or a 'Custom' keyword.
-func RegisterCustomFormatter(name string, creator FormatterFuncCreator) error {
-	if _, ok := formatterFuncs[name]; ok {
-		return errorAliasReserved(name)
-	}
-	if _, ok := formatterFuncsParameterized[name]; ok {
-		return errorAliasReserved(name)
-	}
-	formatterFuncsParameterized[name] = creator
-	return nil
-}
-
-// formatter is used to write messages in a specific format, inserting such additional data
-// as log level, date/time, etc.
-type formatter struct {
-	fmtStringOriginal string
-	fmtString         string
-	formatterFuncs    []FormatterFunc
-}
-
-// newFormatter creates a new formatter using a format string
-func newFormatter(formatString string) (*formatter, error) {
-	fmtr := new(formatter)
-	fmtr.fmtStringOriginal = formatString
-	if err := buildFormatterFuncs(fmtr); err != nil {
-		return nil, err
-	}
-	return fmtr, nil
-}
-
-func buildFormatterFuncs(formatter *formatter) error {
-	var (
-		fsbuf  = new(bytes.Buffer)
-		fsolm1 = len(formatter.fmtStringOriginal) - 1
-	)
-	for i := 0; i <= fsolm1; i++ {
-		if char := formatter.fmtStringOriginal[i]; char != FormatterSymbol {
-			fsbuf.WriteByte(char)
-			continue
-		}
-		// Check if the index is at the end of the string.
-		if i == fsolm1 {
-			return fmt.Errorf("format error: %c cannot be last symbol", FormatterSymbol)
-		}
-		// Check if the formatter symbol is doubled and skip it as nonmatching.
-		if formatter.fmtStringOriginal[i+1] == FormatterSymbol {
-			fsbuf.WriteRune(FormatterSymbol)
-			i++
-			continue
-		}
-		function, ni, err := formatter.extractFormatterFunc(i + 1)
-		if err != nil {
-			return err
-		}
-		// Append formatting string "%v".
-		fsbuf.Write([]byte{37, 118})
-		i = ni
-		formatter.formatterFuncs = append(formatter.formatterFuncs, function)
-	}
-	formatter.fmtString = fsbuf.String()
-	return nil
-}
-
-func (formatter *formatter) extractFormatterFunc(index int) (FormatterFunc, int, error) {
-	letterSequence := formatter.extractLetterSequence(index)
-	if len(letterSequence) == 0 {
-		return nil, 0, fmt.Errorf("format error: lack of formatter after %c at %d", FormatterSymbol, index)
-	}
-
-	function, formatterLength, ok := formatter.findFormatterFunc(letterSequence)
-	if ok {
-		return function, index + formatterLength - 1, nil
-	}
-
-	function, formatterLength, ok, err := formatter.findFormatterFuncParametrized(letterSequence, index)
-	if err != nil {
-		return nil, 0, err
-	}
-	if ok {
-		return function, index + formatterLength - 1, nil
-	}
-
-	return nil, 0, errors.New("format error: unrecognized formatter at " + strconv.Itoa(index) + ": " + letterSequence)
-}
-
-func (formatter *formatter) extractLetterSequence(index int) string {
-	letters := ""
-
-	bytesToParse := []byte(formatter.fmtStringOriginal[index:])
-	runeCount := utf8.RuneCount(bytesToParse)
-	for i := 0; i < runeCount; i++ {
-		rune, runeSize := utf8.DecodeRune(bytesToParse)
-		bytesToParse = bytesToParse[runeSize:]
-
-		if unicode.IsLetter(rune) {
-			letters += string(rune)
-		} else {
-			break
-		}
-	}
-	return letters
-}
-
-func (formatter *formatter) findFormatterFunc(letters string) (FormatterFunc, int, bool) {
-	currentVerb := letters
-	for i := 0; i < len(letters); i++ {
-		function, ok := formatterFuncs[currentVerb]
-		if ok {
-			return function, len(currentVerb), ok
-		}
-		currentVerb = currentVerb[:len(currentVerb)-1]
-	}
-
-	return nil, 0, false
-}
-
-func (formatter *formatter) findFormatterFuncParametrized(letters string, lettersStartIndex int) (FormatterFunc, int, bool, error) {
-	currentVerb := letters
-	for i := 0; i < len(letters); i++ {
-		functionCreator, ok := formatterFuncsParameterized[currentVerb]
-		if ok {
-			parameter := ""
-			parameterLen := 0
-			isVerbEqualsLetters := i == 0 // if not, then letter goes after formatter, and formatter is parameterless
-			if isVerbEqualsLetters {
-				userParameter := ""
-				var err error
-				userParameter, parameterLen, ok, err = formatter.findparameter(lettersStartIndex + len(currentVerb))
-				if ok {
-					parameter = userParameter
-				} else if err != nil {
-					return nil, 0, false, err
-				}
-			}
-
-			return functionCreator(parameter), len(currentVerb) + parameterLen, true, nil
-		}
-
-		currentVerb = currentVerb[:len(currentVerb)-1]
-	}
-
-	return nil, 0, false, nil
-}
-
-func (formatter *formatter) findparameter(startIndex int) (string, int, bool, error) {
-	if len(formatter.fmtStringOriginal) == startIndex || formatter.fmtStringOriginal[startIndex] != formatterParameterStart {
-		return "", 0, false, nil
-	}
-
-	endIndex := strings.Index(formatter.fmtStringOriginal[startIndex:], string(formatterParameterEnd))
-	if endIndex == -1 {
-		return "", 0, false, fmt.Errorf("Unmatched parenthesis or invalid parameter at %d: %s",
-			startIndex, formatter.fmtStringOriginal[startIndex:])
-	}
-	endIndex += startIndex
-
-	length := endIndex - startIndex + 1
-
-	return formatter.fmtStringOriginal[startIndex+1 : endIndex], length, true, nil
-}
-
-// Format processes a message with special formatters, log level, and context. Returns formatted string
-// with all formatter identifiers changed to appropriate values.
-func (formatter *formatter) Format(message string, level LogLevel, context LogContextInterface) string {
-	if len(formatter.formatterFuncs) == 0 {
-		return formatter.fmtString
-	}
-
-	params := make([]interface{}, len(formatter.formatterFuncs))
-	for i, function := range formatter.formatterFuncs {
-		params[i] = function(message, level, context)
-	}
-
-	return fmt.Sprintf(formatter.fmtString, params...)
-}
-
-func (formatter *formatter) String() string {
-	return formatter.fmtStringOriginal
-}
-
-//=====================================================
-
-const (
-	wrongLogLevel   = "WRONG_LOGLEVEL"
-	wrongEscapeCode = "WRONG_ESCAPE"
-)
-
-var levelToString = map[LogLevel]string{
-	TraceLvl:    "Trace",
-	DebugLvl:    "Debug",
-	InfoLvl:     "Info",
-	WarnLvl:     "Warn",
-	ErrorLvl:    "Error",
-	CriticalLvl: "Critical",
-	Off:         "Off",
-}
-
-var levelToShortString = map[LogLevel]string{
-	TraceLvl:    "Trc",
-	DebugLvl:    "Dbg",
-	InfoLvl:     "Inf",
-	WarnLvl:     "Wrn",
-	ErrorLvl:    "Err",
-	CriticalLvl: "Crt",
-	Off:         "Off",
-}
-
-var levelToShortestString = map[LogLevel]string{
-	TraceLvl:    "t",
-	DebugLvl:    "d",
-	InfoLvl:     "i",
-	WarnLvl:     "w",
-	ErrorLvl:    "e",
-	CriticalLvl: "c",
-	Off:         "o",
-}
-
-func formatterLevel(message string, level LogLevel, context LogContextInterface) interface{} {
-	levelStr, ok := levelToString[level]
-	if !ok {
-		return wrongLogLevel
-	}
-	return levelStr
-}
-
-func formatterLev(message string, level LogLevel, context LogContextInterface) interface{} {
-	levelStr, ok := levelToShortString[level]
-	if !ok {
-		return wrongLogLevel
-	}
-	return levelStr
-}
-
-func formatterLEVEL(message string, level LogLevel, context LogContextInterface) interface{} {
-	return strings.ToTitle(formatterLevel(message, level, context).(string))
-}
-
-func formatterLEV(message string, level LogLevel, context LogContextInterface) interface{} {
-	return strings.ToTitle(formatterLev(message, level, context).(string))
-}
-
-func formatterl(message string, level LogLevel, context LogContextInterface) interface{} {
-	levelStr, ok := levelToShortestString[level]
-	if !ok {
-		return wrongLogLevel
-	}
-	return levelStr
-}
-
-func formatterMsg(message string, level LogLevel, context LogContextInterface) interface{} {
-	return message
-}
-
-func formatterFullPath(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.FullPath()
-}
-
-func formatterFile(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.FileName()
-}
-
-func formatterRelFile(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.ShortPath()
-}
-
-func FormatterFunction(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.Func()
-}
-
-func FormatterFunctionShort(message string, level LogLevel, context LogContextInterface) interface{} {
-	f := context.Func()
-	spl := strings.Split(f, ".")
-	return spl[len(spl)-1]
-}
-
-func formatterLine(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.Line()
-}
-
-func formatterTime(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.CallTime().Format(TimeFormat)
-}
-
-func formatterUTCTime(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.CallTime().UTC().Format(TimeFormat)
-}
-
-func formatterNs(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.CallTime().UnixNano()
-}
-
-func formatterUTCNs(message string, level LogLevel, context LogContextInterface) interface{} {
-	return context.CallTime().UTC().UnixNano()
-}
-
-func formattern(message string, level LogLevel, context LogContextInterface) interface{} {
-	return "\n"
-}
-
-func formattert(message string, level LogLevel, context LogContextInterface) interface{} {
-	return "\t"
-}
-
-func createDateTimeFormatterFunc(dateTimeFormat string) FormatterFunc {
-	format := dateTimeFormat
-	if format == "" {
-		format = DateDefaultFormat
-	}
-	return func(message string, level LogLevel, context LogContextInterface) interface{} {
-		return context.CallTime().Format(format)
-	}
-}
-
-func createUTCDateTimeFormatterFunc(dateTimeFormat string) FormatterFunc {
-	format := dateTimeFormat
-	if format == "" {
-		format = DateDefaultFormat
-	}
-	return func(message string, level LogLevel, context LogContextInterface) interface{} {
-		return context.CallTime().UTC().Format(format)
-	}
-}
-
-func createANSIEscapeFunc(escapeCodeString string) FormatterFunc {
-	return func(message string, level LogLevel, context LogContextInterface) interface{} {
-		if len(escapeCodeString) == 0 {
-			return wrongEscapeCode
-		}
-
-		return fmt.Sprintf("%c[%sm", 0x1B, escapeCodeString)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/format_test.go b/vendor/github.com/cihub/seelog/format_test.go
deleted file mode 100644
index 4402b60ef..000000000
--- a/vendor/github.com/cihub/seelog/format_test.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-)
-
-const (
-	TestFuncName = "TestFormats"
-)
-
-type formatTest struct {
-	formatString   string
-	input          string
-	inputLogLevel  LogLevel
-	expectedOutput string
-	errorExpected  bool
-}
-
-var formatTests = []formatTest{
-	{"test", "abcdef", TraceLvl, "test", false},
-	{"", "abcdef", TraceLvl, "", false},
-	{"%Level", "", TraceLvl, "Trace", false},
-	{"%Level", "", DebugLvl, "Debug", false},
-	{"%Level", "", InfoLvl, "Info", false},
-	{"%Level", "", WarnLvl, "Warn", false},
-	{"%Level", "", ErrorLvl, "Error", false},
-	{"%Level", "", CriticalLvl, "Critical", false},
-	{"[%Level]", "", TraceLvl, "[Trace]", false},
-	{"[%Level]", "abc", DebugLvl, "[Debug]", false},
-	{"%LevelLevel", "", InfoLvl, "InfoLevel", false},
-	{"[%Level][%Level]", "", WarnLvl, "[Warn][Warn]", false},
-	{"[%Level]X[%Level]", "", ErrorLvl, "[Error]X[Error]", false},
-	{"%Levelll", "", CriticalLvl, "Criticalll", false},
-	{"%Lvl", "", TraceLvl, "", true},
-	{"%%Level", "", DebugLvl, "%Level", false},
-	{"%Level%", "", InfoLvl, "", true},
-	{"%sevel", "", WarnLvl, "", true},
-	{"Level", "", ErrorLvl, "Level", false},
-	{"%LevelLevel", "", CriticalLvl, "CriticalLevel", false},
-	{"%Lev", "", TraceLvl, "Trc", false},
-	{"%Lev", "", DebugLvl, "Dbg", false},
-	{"%Lev", "", InfoLvl, "Inf", false},
-	{"%Lev", "", WarnLvl, "Wrn", false},
-	{"%Lev", "", ErrorLvl, "Err", false},
-	{"%Lev", "", CriticalLvl, "Crt", false},
-	{"[%Lev]", "", TraceLvl, "[Trc]", false},
-	{"[%Lev]", "abc", DebugLvl, "[Dbg]", false},
-	{"%LevLevel", "", InfoLvl, "InfLevel", false},
-	{"[%Level][%Lev]", "", WarnLvl, "[Warn][Wrn]", false},
-	{"[%Lev]X[%Lev]", "", ErrorLvl, "[Err]X[Err]", false},
-	{"%Levll", "", CriticalLvl, "Crtll", false},
-	{"%LEVEL", "", TraceLvl, "TRACE", false},
-	{"%LEVEL", "", DebugLvl, "DEBUG", false},
-	{"%LEVEL", "", InfoLvl, "INFO", false},
-	{"%LEVEL", "", WarnLvl, "WARN", false},
-	{"%LEVEL", "", ErrorLvl, "ERROR", false},
-	{"%LEVEL", "", CriticalLvl, "CRITICAL", false},
-	{"[%LEVEL]", "", TraceLvl, "[TRACE]", false},
-	{"[%LEVEL]", "abc", DebugLvl, "[DEBUG]", false},
-	{"%LEVELLEVEL", "", InfoLvl, "INFOLEVEL", false},
-	{"[%LEVEL][%LEVEL]", "", WarnLvl, "[WARN][WARN]", false},
-	{"[%LEVEL]X[%Level]", "", ErrorLvl, "[ERROR]X[Error]", false},
-	{"%LEVELLL", "", CriticalLvl, "CRITICALLL", false},
-	{"%LEV", "", TraceLvl, "TRC", false},
-	{"%LEV", "", DebugLvl, "DBG", false},
-	{"%LEV", "", InfoLvl, "INF", false},
-	{"%LEV", "", WarnLvl, "WRN", false},
-	{"%LEV", "", ErrorLvl, "ERR", false},
-	{"%LEV", "", CriticalLvl, "CRT", false},
-	{"[%LEV]", "", TraceLvl, "[TRC]", false},
-	{"[%LEV]", "abc", DebugLvl, "[DBG]", false},
-	{"%LEVLEVEL", "", InfoLvl, "INFLEVEL", false},
-	{"[%LEVEL][%LEV]", "", WarnLvl, "[WARN][WRN]", false},
-	{"[%LEV]X[%LEV]", "", ErrorLvl, "[ERR]X[ERR]", false},
-	{"%LEVLL", "", CriticalLvl, "CRTLL", false},
-	{"%l", "", TraceLvl, "t", false},
-	{"%l", "", DebugLvl, "d", false},
-	{"%l", "", InfoLvl, "i", false},
-	{"%l", "", WarnLvl, "w", false},
-	{"%l", "", ErrorLvl, "e", false},
-	{"%l", "", CriticalLvl, "c", false},
-	{"[%l]", "", TraceLvl, "[t]", false},
-	{"[%l]", "abc", DebugLvl, "[d]", false},
-	{"%Level%Msg", "", TraceLvl, "Trace", false},
-	{"%Level%Msg", "A", DebugLvl, "DebugA", false},
-	{"%Level%Msg", "", InfoLvl, "Info", false},
-	{"%Level%Msg", "test", WarnLvl, "Warntest", false},
-	{"%Level%Msg", " ", ErrorLvl, "Error ", false},
-	{"%Level%Msg", "", CriticalLvl, "Critical", false},
-	{"[%Level]", "", TraceLvl, "[Trace]", false},
-	{"[%Level]", "abc", DebugLvl, "[Debug]", false},
-	{"%Level%MsgLevel", "A", InfoLvl, "InfoALevel", false},
-	{"[%Level]%Msg[%Level]", "test", WarnLvl, "[Warn]test[Warn]", false},
-	{"[%Level]%MsgX[%Level]", "test", ErrorLvl, "[Error]testX[Error]", false},
-	{"%Levell%Msgl", "Test", CriticalLvl, "CriticallTestl", false},
-	{"%Lev%Msg%LEVEL%LEV%l%Msg", "Test", InfoLvl, "InfTestINFOINFiTest", false},
-	{"%n", "", CriticalLvl, "\n", false},
-	{"%t", "", CriticalLvl, "\t", false},
-}
-
-func TestFormats(t *testing.T) {
-
-	context, conErr := currentContext()
-	if conErr != nil {
-		t.Fatal("Cannot get current context:" + conErr.Error())
-		return
-	}
-
-	for _, test := range formatTests {
-
-		form, err := newFormatter(test.formatString)
-
-		if (err != nil) != test.errorExpected {
-			t.Errorf("input: %s \nInput LL: %s\n* Expected error:%t Got error: %t\n",
-				test.input, test.inputLogLevel, test.errorExpected, (err != nil))
-			if err != nil {
-				t.Logf("%s\n", err.Error())
-			}
-			continue
-		} else if err != nil {
-			continue
-		}
-
-		msg := form.Format(test.input, test.inputLogLevel, context)
-
-		if err == nil && msg != test.expectedOutput {
-			t.Errorf("format: %s \nInput: %s \nInput LL: %s\n* Expected: %s \n* Got: %s\n",
-				test.formatString, test.input, test.inputLogLevel, test.expectedOutput, msg)
-		}
-	}
-}
-
-func TestDateFormat(t *testing.T) {
-	_, err := newFormatter("%Date")
-	if err != nil {
-		t.Error("Unexpected error: " + err.Error())
-	}
-}
-
-func TestDateParameterizedFormat(t *testing.T) {
-	testFormat := "Mon Jan 02 2006 15:04:05"
-	preciseForamt := "Mon Jan 02 2006 15:04:05.000"
-
-	context, conErr := currentContext()
-	if conErr != nil {
-		t.Fatal("Cannot get current context:" + conErr.Error())
-		return
-	}
-
-	form, err := newFormatter("%Date(" + preciseForamt + ")")
-	if err != nil {
-		t.Error("Unexpected error: " + err.Error())
-	}
-
-	dateBefore := time.Now().Format(testFormat)
-	msg := form.Format("", TraceLvl, context)
-	dateAfter := time.Now().Format(testFormat)
-
-	if !strings.HasPrefix(msg, dateBefore) && !strings.HasPrefix(msg, dateAfter) {
-		t.Errorf("incorrect message: %v. Expected %v or %v", msg, dateBefore, dateAfter)
-	}
-
-	_, err = newFormatter("%Date(" + preciseForamt)
-	if err == nil {
-		t.Error("Expected error for invalid format")
-	}
-}
-
-func createTestFormatter(format string) FormatterFunc {
-	return func(message string, level LogLevel, context LogContextInterface) interface{} {
-		return "TEST " + context.Func() + " TEST"
-	}
-}
-
-func TestCustomFormatterRegistration(t *testing.T) {
-	err := RegisterCustomFormatter("Level", createTestFormatter)
-	if err == nil {
-		t.Errorf("expected an error when trying to register a custom formatter with a reserved alias")
-	}
-	err = RegisterCustomFormatter("EscM", createTestFormatter)
-	if err == nil {
-		t.Errorf("expected an error when trying to register a custom formatter with a reserved parameterized alias")
-	}
-	err = RegisterCustomFormatter("TEST", createTestFormatter)
-	if err != nil {
-		t.Fatalf("Registering custom formatter: unexpected error: %s", err)
-	}
-	err = RegisterCustomFormatter("TEST", createTestFormatter)
-	if err == nil {
-		t.Errorf("expected an error when trying to register a custom formatter with duplicate name")
-	}
-
-	context, conErr := currentContext()
-	if conErr != nil {
-		t.Fatal("Cannot get current context:" + conErr.Error())
-		return
-	}
-
-	form, err := newFormatter("%Msg %TEST 123")
-	if err != nil {
-		t.Fatalf("%s\n", err.Error())
-	}
-
-	expected := fmt.Sprintf("test TEST %sTestCustomFormatterRegistration TEST 123", commonPrefix)
-	msg := form.Format("test", DebugLvl, context)
-	if msg != expected {
-		t.Fatalf("Custom formatter: invalid output. Expected: '%s'. Got: '%s'", expected, msg)
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/internals_baseerror.go b/vendor/github.com/cihub/seelog/internals_baseerror.go
deleted file mode 100644
index c0b271d7d..000000000
--- a/vendor/github.com/cihub/seelog/internals_baseerror.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package seelog
-
-// Base struct for custom errors.
-type baseError struct {
-	message string
-}
-
-func (be baseError) Error() string {
-	return be.message
-}
diff --git a/vendor/github.com/cihub/seelog/internals_byteverifiers_test.go b/vendor/github.com/cihub/seelog/internals_byteverifiers_test.go
deleted file mode 100644
index 0ab6ebc68..000000000
--- a/vendor/github.com/cihub/seelog/internals_byteverifiers_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"strconv"
-	"testing"
-)
-
-// bytesVerifier is a byte receiver which is used for correct input testing.
-// It allows to compare expected result and actual result in context of received bytes.
-type bytesVerifier struct {
-	expectedBytes   []byte // bytes that are expected to be written in next Write call
-	waitingForInput bool   // true if verifier is waiting for a Write call
-	writtenData     []byte // real bytes that actually were received during the last Write call
-	testEnv         *testing.T
-}
-
-func newBytesVerifier(t *testing.T) (*bytesVerifier, error) {
-	if t == nil {
-		return nil, errors.New("testing environment param is nil")
-	}
-
-	verifier := new(bytesVerifier)
-	verifier.testEnv = t
-
-	return verifier, nil
-}
-
-// Write is used to check whether verifier was waiting for input and whether bytes are the same as expectedBytes.
-// After Write call, waitingForInput is set to false.
-func (verifier *bytesVerifier) Write(bytes []byte) (n int, err error) {
-	if !verifier.waitingForInput {
-		verifier.testEnv.Errorf("unexpected input: %v", string(bytes))
-		return
-	}
-
-	verifier.waitingForInput = false
-	verifier.writtenData = bytes
-
-	if verifier.expectedBytes != nil {
-		if bytes == nil {
-			verifier.testEnv.Errorf("incoming 'bytes' is nil")
-		} else {
-			if len(bytes) != len(verifier.expectedBytes) {
-				verifier.testEnv.Errorf("'Bytes' has unexpected len. Expected: %d. Got: %d. . Expected string: %q. Got: %q",
-					len(verifier.expectedBytes), len(bytes), string(verifier.expectedBytes), string(bytes))
-			} else {
-				for i := 0; i < len(bytes); i++ {
-					if verifier.expectedBytes[i] != bytes[i] {
-						verifier.testEnv.Errorf("incorrect data on position %d. Expected: %d. Got: %d. Expected string: %q. Got: %q",
-							i, verifier.expectedBytes[i], bytes[i], string(verifier.expectedBytes), string(bytes))
-						break
-					}
-				}
-			}
-		}
-	}
-
-	return len(bytes), nil
-}
-
-func (verifier *bytesVerifier) ExpectBytes(bytes []byte) {
-	verifier.waitingForInput = true
-	verifier.expectedBytes = bytes
-}
-
-func (verifier *bytesVerifier) MustNotExpect() {
-	if verifier.waitingForInput {
-		errorText := "Unexpected input: "
-
-		if verifier.expectedBytes != nil {
-			errorText += "len = " + strconv.Itoa(len(verifier.expectedBytes))
-			errorText += ". text = " + string(verifier.expectedBytes)
-		}
-
-		verifier.testEnv.Errorf(errorText)
-	}
-}
-
-func (verifier *bytesVerifier) Close() error {
-	return nil
-}
-
-// nullWriter implements io.Writer inteface and does nothing, always returning a successful write result
-type nullWriter struct {
-}
-
-func (writer *nullWriter) Write(bytes []byte) (n int, err error) {
-	return len(bytes), nil
-}
-
-func (writer *nullWriter) Close() error {
-	return nil
-}
diff --git a/vendor/github.com/cihub/seelog/internals_fsutils.go b/vendor/github.com/cihub/seelog/internals_fsutils.go
deleted file mode 100644
index 5baa6ba61..000000000
--- a/vendor/github.com/cihub/seelog/internals_fsutils.go
+++ /dev/null
@@ -1,403 +0,0 @@
-package seelog
-
-import (
-	"archive/zip"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-)
-
-// File and directory permitions.
-const (
-	defaultFilePermissions      = 0666
-	defaultDirectoryPermissions = 0767
-)
-
-const (
-	// Max number of directories can be read asynchronously.
-	maxDirNumberReadAsync = 1000
-)
-
-type cannotOpenFileError struct {
-	baseError
-}
-
-func newCannotOpenFileError(fname string) *cannotOpenFileError {
-	return &cannotOpenFileError{baseError{message: "Cannot open file: " + fname}}
-}
-
-type notDirectoryError struct {
-	baseError
-}
-
-func newNotDirectoryError(dname string) *notDirectoryError {
-	return &notDirectoryError{baseError{message: dname + " is not directory"}}
-}
-
-// fileFilter is a filtering criteria function for '*os.File'.
-// Must return 'false' to set aside the given file.
-type fileFilter func(os.FileInfo, *os.File) bool
-
-// filePathFilter is a filtering creteria function for file path.
-// Must return 'false' to set aside the given file.
-type filePathFilter func(filePath string) bool
-
-// GetSubdirNames returns a list of directories found in
-// the given one with dirPath.
-func getSubdirNames(dirPath string) ([]string, error) {
-	fi, err := os.Stat(dirPath)
-	if err != nil {
-		return nil, err
-	}
-	if !fi.IsDir() {
-		return nil, newNotDirectoryError(dirPath)
-	}
-	dd, err := os.Open(dirPath)
-	// Cannot open file.
-	if err != nil {
-		if dd != nil {
-			dd.Close()
-		}
-		return nil, err
-	}
-	defer dd.Close()
-	// TODO: Improve performance by buffering reading.
-	allEntities, err := dd.Readdir(-1)
-	if err != nil {
-		return nil, err
-	}
-	subDirs := []string{}
-	for _, entity := range allEntities {
-		if entity.IsDir() {
-			subDirs = append(subDirs, entity.Name())
-		}
-	}
-	return subDirs, nil
-}
-
-// getSubdirAbsPaths recursively visit all the subdirectories
-// starting from the given directory and returns absolute paths for them.
-func getAllSubdirAbsPaths(dirPath string) (res []string, err error) {
-	dps, err := getSubdirAbsPaths(dirPath)
-	if err != nil {
-		res = []string{}
-		return
-	}
-	res = append(res, dps...)
-	for _, dp := range dps {
-		sdps, err := getAllSubdirAbsPaths(dp)
-		if err != nil {
-			return []string{}, err
-		}
-		res = append(res, sdps...)
-	}
-	return
-}
-
-// getSubdirAbsPaths supplies absolute paths for all subdirectiries in a given directory.
-// Input: (I1) dirPath - absolute path of a directory in question.
-// Out: (O1) - slice of subdir asbolute paths; (O2) - error of the operation.
-// Remark: If error (O2) is non-nil then (O1) is nil and vice versa.
-func getSubdirAbsPaths(dirPath string) ([]string, error) {
-	sdns, err := getSubdirNames(dirPath)
-	if err != nil {
-		return nil, err
-	}
-	rsdns := []string{}
-	for _, sdn := range sdns {
-		rsdns = append(rsdns, filepath.Join(dirPath, sdn))
-	}
-	return rsdns, nil
-}
-
-// getOpenFilesInDir supplies a slice of os.File pointers to files located in the directory.
-// Remark: Ignores files for which fileFilter returns false
-func getOpenFilesInDir(dirPath string, fFilter fileFilter) ([]*os.File, error) {
-	dfi, err := os.Open(dirPath)
-	if err != nil {
-		return nil, newCannotOpenFileError("Cannot open directory " + dirPath)
-	}
-	defer dfi.Close()
-	// Size of read buffer (i.e. chunk of items read at a time).
-	rbs := 64
-	resFiles := []*os.File{}
-L:
-	for {
-		// Read directory entities by reasonable chuncks
-		// to prevent overflows on big number of files.
-		fis, e := dfi.Readdir(rbs)
-		switch e {
-		// It's OK.
-		case nil:
-		// Do nothing, just continue cycle.
-		case io.EOF:
-			break L
-		// Something went wrong.
-		default:
-			return nil, e
-		}
-		// THINK: Maybe, use async running.
-		for _, fi := range fis {
-			// NB: On Linux this could be a problem as
-			// there are lots of file types available.
-			if !fi.IsDir() {
-				f, e := os.Open(filepath.Join(dirPath, fi.Name()))
-				if e != nil {
-					if f != nil {
-						f.Close()
-					}
-					// THINK: Add nil as indicator that a problem occurred.
-					resFiles = append(resFiles, nil)
-					continue
-				}
-				// Check filter condition.
-				if fFilter != nil && !fFilter(fi, f) {
-					continue
-				}
-				resFiles = append(resFiles, f)
-			}
-		}
-	}
-	return resFiles, nil
-}
-
-func isRegular(m os.FileMode) bool {
-	return m&os.ModeType == 0
-}
-
-// getDirFilePaths return full paths of the files located in the directory.
-// Remark: Ignores files for which fileFilter returns false.
-func getDirFilePaths(dirPath string, fpFilter filePathFilter, pathIsName bool) ([]string, error) {
-	dfi, err := os.Open(dirPath)
-	if err != nil {
-		return nil, newCannotOpenFileError("Cannot open directory " + dirPath)
-	}
-	defer dfi.Close()
-
-	var absDirPath string
-	if !filepath.IsAbs(dirPath) {
-		absDirPath, err = filepath.Abs(dirPath)
-		if err != nil {
-			return nil, fmt.Errorf("cannot get absolute path of directory: %s", err.Error())
-		}
-	} else {
-		absDirPath = dirPath
-	}
-
-	// TODO: check if dirPath is really directory.
-	// Size of read buffer (i.e. chunk of items read at a time).
-	rbs := 2 << 5
-	filePaths := []string{}
-
-	var fp string
-L:
-	for {
-		// Read directory entities by reasonable chuncks
-		// to prevent overflows on big number of files.
-		fis, e := dfi.Readdir(rbs)
-		switch e {
-		// It's OK.
-		case nil:
-		// Do nothing, just continue cycle.
-		case io.EOF:
-			break L
-		// Indicate that something went wrong.
-		default:
-			return nil, e
-		}
-		// THINK: Maybe, use async running.
-		for _, fi := range fis {
-			// NB: Should work on every Windows and non-Windows OS.
-			if isRegular(fi.Mode()) {
-				if pathIsName {
-					fp = fi.Name()
-				} else {
-					// Build full path of a file.
-					fp = filepath.Join(absDirPath, fi.Name())
-				}
-				// Check filter condition.
-				if fpFilter != nil && !fpFilter(fp) {
-					continue
-				}
-				filePaths = append(filePaths, fp)
-			}
-		}
-	}
-	return filePaths, nil
-}
-
-// getOpenFilesByDirectoryAsync runs async reading directories 'dirPaths' and inserts pairs
-// in map 'filesInDirMap': Key - directory name, value - *os.File slice.
-func getOpenFilesByDirectoryAsync(
-	dirPaths []string,
-	fFilter fileFilter,
-	filesInDirMap map[string][]*os.File,
-) error {
-	n := len(dirPaths)
-	if n > maxDirNumberReadAsync {
-		return fmt.Errorf("number of input directories to be read exceeded max value %d", maxDirNumberReadAsync)
-	}
-	type filesInDirResult struct {
-		DirName string
-		Files   []*os.File
-		Error   error
-	}
-	dirFilesChan := make(chan *filesInDirResult, n)
-	var wg sync.WaitGroup
-	// Register n goroutines which are going to do work.
-	wg.Add(n)
-	for i := 0; i < n; i++ {
-		// Launch asynchronously the piece of work.
-		go func(dirPath string) {
-			fs, e := getOpenFilesInDir(dirPath, fFilter)
-			dirFilesChan <- &filesInDirResult{filepath.Base(dirPath), fs, e}
-			// Mark the current goroutine as finished (work is done).
-			wg.Done()
-		}(dirPaths[i])
-	}
-	// Wait for all goroutines to finish their work.
-	wg.Wait()
-	// Close the error channel to let for-range clause
-	// get all the buffered values without blocking and quit in the end.
-	close(dirFilesChan)
-	for fidr := range dirFilesChan {
-		if fidr.Error == nil {
-			// THINK: What will happen if the key is already present?
-			filesInDirMap[fidr.DirName] = fidr.Files
-		} else {
-			return fidr.Error
-		}
-	}
-	return nil
-}
-
-func copyFile(sf *os.File, dst string) (int64, error) {
-	df, err := os.Create(dst)
-	if err != nil {
-		return 0, err
-	}
-	defer df.Close()
-	return io.Copy(df, sf)
-}
-
-// fileExists return flag whether a given file exists
-// and operation error if an unclassified failure occurs.
-func fileExists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	return true, nil
-}
-
-// createDirectory makes directory with a given name
-// making all parent directories if necessary.
-func createDirectory(dirPath string) error {
-	var dPath string
-	var err error
-	if !filepath.IsAbs(dirPath) {
-		dPath, err = filepath.Abs(dirPath)
-		if err != nil {
-			return err
-		}
-	} else {
-		dPath = dirPath
-	}
-	exists, err := fileExists(dPath)
-	if err != nil {
-		return err
-	}
-	if exists {
-		return nil
-	}
-	return os.MkdirAll(dPath, os.ModeDir)
-}
-
-// tryRemoveFile gives a try removing the file
-// only ignoring an error when the file does not exist.
-func tryRemoveFile(filePath string) (err error) {
-	err = os.Remove(filePath)
-	if os.IsNotExist(err) {
-		err = nil
-		return
-	}
-	return
-}
-
-// Unzips a specified zip file. Returns filename->filebytes map.
-func unzip(archiveName string) (map[string][]byte, error) {
-	// Open a zip archive for reading.
-	r, err := zip.OpenReader(archiveName)
-	if err != nil {
-		return nil, err
-	}
-	defer r.Close()
-
-	// Files to be added to archive
-	// map file name to contents
-	files := make(map[string][]byte)
-
-	// Iterate through the files in the archive,
-	// printing some of their contents.
-	for _, f := range r.File {
-		rc, err := f.Open()
-		if err != nil {
-			return nil, err
-		}
-
-		bts, err := ioutil.ReadAll(rc)
-		rcErr := rc.Close()
-
-		if err != nil {
-			return nil, err
-		}
-		if rcErr != nil {
-			return nil, rcErr
-		}
-
-		files[f.Name] = bts
-	}
-
-	return files, nil
-}
-
-// Creates a zip file with the specified file names and byte contents.
-func createZip(archiveName string, files map[string][]byte) error {
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new zip archive.
-	w := zip.NewWriter(buf)
-
-	// Write files
-	for fpath, fcont := range files {
-		f, err := w.Create(fpath)
-		if err != nil {
-			return err
-		}
-		_, err = f.Write([]byte(fcont))
-		if err != nil {
-			return err
-		}
-	}
-
-	// Make sure to check the error on Close.
-	err := w.Close()
-	if err != nil {
-		return err
-	}
-
-	err = ioutil.WriteFile(archiveName, buf.Bytes(), defaultFilePermissions)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/cihub/seelog/internals_xmlnode.go b/vendor/github.com/cihub/seelog/internals_xmlnode.go
deleted file mode 100644
index 985884933..000000000
--- a/vendor/github.com/cihub/seelog/internals_xmlnode.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-)
-
-type xmlNode struct {
-	name       string
-	attributes map[string]string
-	children   []*xmlNode
-	value      string
-}
-
-func newNode() *xmlNode {
-	node := new(xmlNode)
-	node.children = make([]*xmlNode, 0)
-	node.attributes = make(map[string]string)
-	return node
-}
-
-func (node *xmlNode) String() string {
-	str := fmt.Sprintf("<%s", node.name)
-
-	for attrName, attrVal := range node.attributes {
-		str += fmt.Sprintf(" %s=\"%s\"", attrName, attrVal)
-	}
-
-	str += ">"
-	str += node.value
-
-	if len(node.children) != 0 {
-		for _, child := range node.children {
-			str += fmt.Sprintf("%s", child)
-		}
-	}
-
-	str += fmt.Sprintf("</%s>", node.name)
-
-	return str
-}
-
-func (node *xmlNode) unmarshal(startEl xml.StartElement) error {
-	node.name = startEl.Name.Local
-
-	for _, v := range startEl.Attr {
-		_, alreadyExists := node.attributes[v.Name.Local]
-		if alreadyExists {
-			return errors.New("tag '" + node.name + "' has duplicated attribute: '" + v.Name.Local + "'")
-		}
-		node.attributes[v.Name.Local] = v.Value
-	}
-
-	return nil
-}
-
-func (node *xmlNode) add(child *xmlNode) {
-	if node.children == nil {
-		node.children = make([]*xmlNode, 0)
-	}
-
-	node.children = append(node.children, child)
-}
-
-func (node *xmlNode) hasChildren() bool {
-	return node.children != nil && len(node.children) > 0
-}
-
-//=============================================
-
-func unmarshalConfig(reader io.Reader) (*xmlNode, error) {
-	xmlParser := xml.NewDecoder(reader)
-
-	config, err := unmarshalNode(xmlParser, nil)
-	if err != nil {
-		return nil, err
-	}
-	if config == nil {
-		return nil, errors.New("xml has no content")
-	}
-
-	nextConfigEntry, err := unmarshalNode(xmlParser, nil)
-	if nextConfigEntry != nil {
-		return nil, errors.New("xml contains more than one root element")
-	}
-
-	return config, nil
-}
-
-func unmarshalNode(xmlParser *xml.Decoder, curToken xml.Token) (node *xmlNode, err error) {
-	firstLoop := true
-	for {
-		var tok xml.Token
-		if firstLoop && curToken != nil {
-			tok = curToken
-			firstLoop = false
-		} else {
-			tok, err = getNextToken(xmlParser)
-			if err != nil || tok == nil {
-				return
-			}
-		}
-
-		switch tt := tok.(type) {
-		case xml.SyntaxError:
-			err = errors.New(tt.Error())
-			return
-		case xml.CharData:
-			value := strings.TrimSpace(string([]byte(tt)))
-			if node != nil {
-				node.value += value
-			}
-		case xml.StartElement:
-			if node == nil {
-				node = newNode()
-				err := node.unmarshal(tt)
-				if err != nil {
-					return nil, err
-				}
-			} else {
-				childNode, childErr := unmarshalNode(xmlParser, tok)
-				if childErr != nil {
-					return nil, childErr
-				}
-
-				if childNode != nil {
-					node.add(childNode)
-				} else {
-					return
-				}
-			}
-		case xml.EndElement:
-			return
-		}
-	}
-}
-
-func getNextToken(xmlParser *xml.Decoder) (tok xml.Token, err error) {
-	if tok, err = xmlParser.Token(); err != nil {
-		if err == io.EOF {
-			err = nil
-			return
-		}
-		return
-	}
-
-	return
-}
diff --git a/vendor/github.com/cihub/seelog/internals_xmlnode_test.go b/vendor/github.com/cihub/seelog/internals_xmlnode_test.go
deleted file mode 100644
index 3a4487ce7..000000000
--- a/vendor/github.com/cihub/seelog/internals_xmlnode_test.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"strings"
-	"testing"
-	//"fmt"
-	"reflect"
-)
-
-var testEnv *testing.T
-
-/*func TestWrapper(t *testing.T) {
-	testEnv = t
-
-	s := "<a d='a'><g m='a'></g><g h='t' j='kk'></g></a>"
-	reader := strings.NewReader(s)
-	config, err := unmarshalConfig(reader)
-	if err != nil {
-		testEnv.Error(err)
-		return
-	}
-
-	printXML(config, 0)
-}
-
-func printXML(node *xmlNode, level int) {
-	indent := strings.Repeat("\t", level)
-	fmt.Print(indent + node.name)
-	for key, value := range node.attributes {
-		fmt.Print(" " + key + "/" + value)
-	}
-	fmt.Println()
-
-	for _, child := range node.children {
-		printXML(child, level+1)
-	}
-}*/
-
-var xmlNodeTests []xmlNodeTest
-
-type xmlNodeTest struct {
-	testName      string
-	inputXML      string
-	expected      interface{}
-	errorExpected bool
-}
-
-func getXMLTests() []xmlNodeTest {
-	if xmlNodeTests == nil {
-		xmlNodeTests = make([]xmlNodeTest, 0)
-
-		testName := "Simple test"
-		testXML := `<a></a>`
-		testExpected := newNode()
-		testExpected.name = "a"
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Multiline test"
-		testXML =
-			`
-<a>
-</a>
-`
-		testExpected = newNode()
-		testExpected.name = "a"
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Multiline test #2"
-		testXML =
-			`
-
-
-<a>
-
-</a>
-
-`
-		testExpected = newNode()
-		testExpected.name = "a"
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Incorrect names"
-		testXML = `< a     ><      /a >`
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, nil, true})
-
-		testName = "Comments"
-		testXML =
-			`<!-- <abcdef/> -->
-<a> <!-- <!--12345-->
-</a>
-`
-		testExpected = newNode()
-		testExpected.name = "a"
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Multiple roots"
-		testXML = `<a></a><b></b>`
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, nil, true})
-
-		testName = "Multiple roots + incorrect xml"
-		testXML = `<a></a><b>`
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, nil, true})
-
-		testName = "Some unicode and data"
-		testXML = `<俄语>данные</俄语>`
-		testExpected = newNode()
-		testExpected.name = "俄语"
-		testExpected.value = "данные"
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Values and children"
-		testXML = `<俄语>данные<and_a_child></and_a_child></俄语>`
-		testExpected = newNode()
-		testExpected.name = "俄语"
-		testExpected.value = "данные"
-		child := newNode()
-		child.name = "and_a_child"
-		testExpected.children = append(testExpected.children, child)
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Just children"
-		testXML = `<俄语><and_a_child></and_a_child></俄语>`
-		testExpected = newNode()
-		testExpected.name = "俄语"
-		child = newNode()
-		child.name = "and_a_child"
-		testExpected.children = append(testExpected.children, child)
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-
-		testName = "Mixed test"
-		testXML = `<俄语 a="1" b="2.13" c="abc"><child abc="bca"/><child abc="def"></child></俄语>`
-		testExpected = newNode()
-		testExpected.name = "俄语"
-		testExpected.attributes["a"] = "1"
-		testExpected.attributes["b"] = "2.13"
-		testExpected.attributes["c"] = "abc"
-		child = newNode()
-		child.name = "child"
-		child.attributes["abc"] = "bca"
-		testExpected.children = append(testExpected.children, child)
-		child = newNode()
-		child.name = "child"
-		child.attributes["abc"] = "def"
-		testExpected.children = append(testExpected.children, child)
-		xmlNodeTests = append(xmlNodeTests, xmlNodeTest{testName, testXML, testExpected, false})
-	}
-
-	return xmlNodeTests
-}
-
-func TestXmlNode(t *testing.T) {
-
-	for _, test := range getXMLTests() {
-
-		reader := strings.NewReader(test.inputXML)
-		parsedXML, err := unmarshalConfig(reader)
-
-		if (err != nil) != test.errorExpected {
-			t.Errorf("\n%s:\nXML input: %s\nExpected error:%t. Got error: %t\n", test.testName,
-				test.inputXML, test.errorExpected, (err != nil))
-			if err != nil {
-				t.Logf("%s\n", err.Error())
-			}
-			continue
-		}
-
-		if err == nil && !reflect.DeepEqual(parsedXML, test.expected) {
-			t.Errorf("\n%s:\nXML input: %s\nExpected: %s. \nGot: %s\n", test.testName,
-				test.inputXML, test.expected, parsedXML)
-		}
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/log.go b/vendor/github.com/cihub/seelog/log.go
deleted file mode 100644
index 1ec688062..000000000
--- a/vendor/github.com/cihub/seelog/log.go
+++ /dev/null
@@ -1,307 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-)
-
-const (
-	staticFuncCallDepth = 3 // See 'commonLogger.log' method comments
-	loggerFuncCallDepth = 3
-)
-
-// Current is the logger used in all package level convenience funcs like 'Trace', 'Debug', 'Flush', etc.
-var Current LoggerInterface
-
-// Default logger that is created from an empty config: "<seelog/>". It is not closed by a ReplaceLogger call.
-var Default LoggerInterface
-
-// Disabled logger that doesn't produce any output in any circumstances. It is neither closed nor flushed by a ReplaceLogger call.
-var Disabled LoggerInterface
-
-var pkgOperationsMutex *sync.Mutex
-
-func init() {
-	pkgOperationsMutex = new(sync.Mutex)
-	var err error
-
-	if Default == nil {
-		Default, err = LoggerFromConfigAsBytes([]byte("<seelog />"))
-	}
-
-	if Disabled == nil {
-		Disabled, err = LoggerFromConfigAsBytes([]byte("<seelog levels=\"off\"/>"))
-	}
-
-	if err != nil {
-		panic(fmt.Sprintf("Seelog couldn't start. Error: %s", err.Error()))
-	}
-
-	Current = Default
-}
-
-func createLoggerFromConfig(config *logConfig) (LoggerInterface, error) {
-	if config.LogType == syncloggerTypeFromString {
-		return newSyncLogger(config), nil
-	} else if config.LogType == asyncLooploggerTypeFromString {
-		return newAsyncLoopLogger(config), nil
-	} else if config.LogType == asyncTimerloggerTypeFromString {
-		logData := config.LoggerData
-		if logData == nil {
-			return nil, errors.New("async timer data not set")
-		}
-
-		asyncInt, ok := logData.(asyncTimerLoggerData)
-		if !ok {
-			return nil, errors.New("invalid async timer data")
-		}
-
-		logger, err := newAsyncTimerLogger(config, time.Duration(asyncInt.AsyncInterval))
-		if !ok {
-			return nil, err
-		}
-
-		return logger, nil
-	} else if config.LogType == adaptiveLoggerTypeFromString {
-		logData := config.LoggerData
-		if logData == nil {
-			return nil, errors.New("adaptive logger parameters not set")
-		}
-
-		adaptData, ok := logData.(adaptiveLoggerData)
-		if !ok {
-			return nil, errors.New("invalid adaptive logger parameters")
-		}
-
-		logger, err := newAsyncAdaptiveLogger(
-			config,
-			time.Duration(adaptData.MinInterval),
-			time.Duration(adaptData.MaxInterval),
-			adaptData.CriticalMsgCount,
-		)
-		if err != nil {
-			return nil, err
-		}
-
-		return logger, nil
-	}
-	return nil, errors.New("invalid config log type/data")
-}
-
-// UseLogger sets the 'Current' package level logger variable to the specified value.
-// This variable is used in all Trace/Debug/... package level convenience funcs.
-//
-// Example:
-//
-// after calling
-//     seelog.UseLogger(somelogger)
-// the following:
-//     seelog.Debug("abc")
-// will be equal to
-//     somelogger.Debug("abc")
-//
-// IMPORTANT: UseLogger do NOT close the previous logger (only flushes it). So if
-// you constantly use it to replace loggers and don't close them in other code, you'll
-// end up having memory leaks.
-//
-// To safely replace loggers, use ReplaceLogger.
-func UseLogger(logger LoggerInterface) error {
-	if logger == nil {
-		return errors.New("logger can not be nil")
-	}
-
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-
-	oldLogger := Current
-	Current = logger
-
-	if oldLogger != nil {
-		oldLogger.Flush()
-	}
-
-	return nil
-}
-
-// ReplaceLogger acts as UseLogger but the logger that was previously
-// used is disposed (except Default and Disabled loggers).
-//
-// Example:
-//     import log "github.com/cihub/seelog"
-//
-//     func main() {
-//         logger, err := log.LoggerFromConfigAsFile("seelog.xml")
-//
-//         if err != nil {
-//             panic(err)
-//         }
-//
-//         log.ReplaceLogger(logger)
-//         defer log.Flush()
-//
-//         log.Trace("test")
-//         log.Debugf("var = %s", "abc")
-//     }
-func ReplaceLogger(logger LoggerInterface) error {
-	if logger == nil {
-		return errors.New("logger can not be nil")
-	}
-
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-
-	defer func() {
-		if err := recover(); err != nil {
-			reportInternalError(fmt.Errorf("recovered from panic during ReplaceLogger: %s", err))
-		}
-	}()
-
-	if Current == Default {
-		Current.Flush()
-	} else if Current != nil && !Current.Closed() && Current != Disabled {
-		Current.Flush()
-		Current.Close()
-	}
-
-	Current = logger
-
-	return nil
-}
-
-// Tracef formats message according to format specifier
-// and writes to default logger with log level = Trace.
-func Tracef(format string, params ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.traceWithCallDepth(staticFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-// Debugf formats message according to format specifier
-// and writes to default logger with log level = Debug.
-func Debugf(format string, params ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.debugWithCallDepth(staticFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-// Infof formats message according to format specifier
-// and writes to default logger with log level = Info.
-func Infof(format string, params ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.infoWithCallDepth(staticFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-// Warnf formats message according to format specifier and writes to default logger with log level = Warn
-func Warnf(format string, params ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogFormattedMessage(format, params)
-	Current.warnWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Errorf formats message according to format specifier and writes to default logger with log level = Error
-func Errorf(format string, params ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogFormattedMessage(format, params)
-	Current.errorWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Criticalf formats message according to format specifier and writes to default logger with log level = Critical
-func Criticalf(format string, params ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogFormattedMessage(format, params)
-	Current.criticalWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Trace formats message using the default formats for its operands and writes to default logger with log level = Trace
-func Trace(v ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.traceWithCallDepth(staticFuncCallDepth, newLogMessage(v))
-}
-
-// Debug formats message using the default formats for its operands and writes to default logger with log level = Debug
-func Debug(v ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.debugWithCallDepth(staticFuncCallDepth, newLogMessage(v))
-}
-
-// Info formats message using the default formats for its operands and writes to default logger with log level = Info
-func Info(v ...interface{}) {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.infoWithCallDepth(staticFuncCallDepth, newLogMessage(v))
-}
-
-// Warn formats message using the default formats for its operands and writes to default logger with log level = Warn
-func Warn(v ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogMessage(v)
-	Current.warnWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Error formats message using the default formats for its operands and writes to default logger with log level = Error
-func Error(v ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogMessage(v)
-	Current.errorWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Critical formats message using the default formats for its operands and writes to default logger with log level = Critical
-func Critical(v ...interface{}) error {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	message := newLogMessage(v)
-	Current.criticalWithCallDepth(staticFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-// Flush immediately processes all currently queued messages and all currently buffered messages.
-// It is a blocking call which returns only after the queue is empty and all the buffers are empty.
-//
-// If Flush is called for a synchronous logger (type='sync'), it only flushes buffers (e.g. '<buffered>' receivers)
-// , because there is no queue.
-//
-// Call this method when your app is going to shut down not to lose any log messages.
-func Flush() {
-	pkgOperationsMutex.Lock()
-	defer pkgOperationsMutex.Unlock()
-	Current.Flush()
-}
diff --git a/vendor/github.com/cihub/seelog/logger.go b/vendor/github.com/cihub/seelog/logger.go
deleted file mode 100644
index 480eae80f..000000000
--- a/vendor/github.com/cihub/seelog/logger.go
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"sync"
-)
-
-func reportInternalError(err error) {
-	fmt.Fprintf(os.Stderr, "seelog internal error: %s\n", err)
-}
-
-// LoggerInterface represents structs capable of logging Seelog messages
-type LoggerInterface interface {
-
-	// Tracef formats message according to format specifier
-	// and writes to log with level = Trace.
-	Tracef(format string, params ...interface{})
-
-	// Debugf formats message according to format specifier
-	// and writes to log with level = Debug.
-	Debugf(format string, params ...interface{})
-
-	// Infof formats message according to format specifier
-	// and writes to log with level = Info.
-	Infof(format string, params ...interface{})
-
-	// Warnf formats message according to format specifier
-	// and writes to log with level = Warn.
-	Warnf(format string, params ...interface{}) error
-
-	// Errorf formats message according to format specifier
-	// and writes to log with level = Error.
-	Errorf(format string, params ...interface{}) error
-
-	// Criticalf formats message according to format specifier
-	// and writes to log with level = Critical.
-	Criticalf(format string, params ...interface{}) error
-
-	// Trace formats message using the default formats for its operands
-	// and writes to log with level = Trace
-	Trace(v ...interface{})
-
-	// Debug formats message using the default formats for its operands
-	// and writes to log with level = Debug
-	Debug(v ...interface{})
-
-	// Info formats message using the default formats for its operands
-	// and writes to log with level = Info
-	Info(v ...interface{})
-
-	// Warn formats message using the default formats for its operands
-	// and writes to log with level = Warn
-	Warn(v ...interface{}) error
-
-	// Error formats message using the default formats for its operands
-	// and writes to log with level = Error
-	Error(v ...interface{}) error
-
-	// Critical formats message using the default formats for its operands
-	// and writes to log with level = Critical
-	Critical(v ...interface{}) error
-
-	traceWithCallDepth(callDepth int, message fmt.Stringer)
-	debugWithCallDepth(callDepth int, message fmt.Stringer)
-	infoWithCallDepth(callDepth int, message fmt.Stringer)
-	warnWithCallDepth(callDepth int, message fmt.Stringer)
-	errorWithCallDepth(callDepth int, message fmt.Stringer)
-	criticalWithCallDepth(callDepth int, message fmt.Stringer)
-
-	// Close flushes all the messages in the logger and closes it. It cannot be used after this operation.
-	Close()
-
-	// Flush flushes all the messages in the logger.
-	Flush()
-
-	// Closed returns true if the logger was previously closed.
-	Closed() bool
-
-	// SetAdditionalStackDepth sets the additional number of frames to skip by runtime.Caller
-	// when getting function information needed to print seelog format identifiers such as %Func or %File.
-	//
-	// This func may be used when you wrap seelog funcs and want to print caller info of you own
-	// wrappers instead of seelog func callers. In this case you should set depth = 1. If you then
-	// wrap your wrapper, you should set depth = 2, etc.
-	//
-	// NOTE: Incorrect depth value may lead to errors in runtime.Caller evaluation or incorrect
-	// function/file names in log files. Do not use it if you are not going to wrap seelog funcs.
-	// You may reset the value to default using a SetAdditionalStackDepth(0) call.
-	SetAdditionalStackDepth(depth int) error
-}
-
-// innerLoggerInterface is an internal logging interface
-type innerLoggerInterface interface {
-	innerLog(level LogLevel, context LogContextInterface, message fmt.Stringer)
-	Flush()
-}
-
-// [file path][func name][level] -> [allowed]
-type allowedContextCache map[string]map[string]map[LogLevel]bool
-
-// commonLogger contains all common data needed for logging and contains methods used to log messages.
-type commonLogger struct {
-	config        *logConfig          // Config used for logging
-	contextCache  allowedContextCache // Caches whether log is enabled for specific "full path-func name-level" sets
-	closed        bool                // 'true' when all writers are closed, all data is flushed, logger is unusable. Must be accessed while holding closedM
-	closedM       sync.RWMutex
-	m             sync.Mutex // Mutex for main operations
-	unusedLevels  []bool
-	innerLogger   innerLoggerInterface
-	addStackDepth int // Additional stack depth needed for correct seelog caller context detection
-}
-
-func newCommonLogger(config *logConfig, internalLogger innerLoggerInterface) *commonLogger {
-	cLogger := new(commonLogger)
-
-	cLogger.config = config
-	cLogger.contextCache = make(allowedContextCache)
-	cLogger.unusedLevels = make([]bool, Off)
-	cLogger.fillUnusedLevels()
-	cLogger.innerLogger = internalLogger
-
-	return cLogger
-}
-
-func (cLogger *commonLogger) SetAdditionalStackDepth(depth int) error {
-	if depth < 0 {
-		return fmt.Errorf("negative depth: %d", depth)
-	}
-	cLogger.m.Lock()
-	cLogger.addStackDepth = depth
-	cLogger.m.Unlock()
-	return nil
-}
-
-func (cLogger *commonLogger) Tracef(format string, params ...interface{}) {
-	cLogger.traceWithCallDepth(loggerFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-func (cLogger *commonLogger) Debugf(format string, params ...interface{}) {
-	cLogger.debugWithCallDepth(loggerFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-func (cLogger *commonLogger) Infof(format string, params ...interface{}) {
-	cLogger.infoWithCallDepth(loggerFuncCallDepth, newLogFormattedMessage(format, params))
-}
-
-func (cLogger *commonLogger) Warnf(format string, params ...interface{}) error {
-	message := newLogFormattedMessage(format, params)
-	cLogger.warnWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) Errorf(format string, params ...interface{}) error {
-	message := newLogFormattedMessage(format, params)
-	cLogger.errorWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) Criticalf(format string, params ...interface{}) error {
-	message := newLogFormattedMessage(format, params)
-	cLogger.criticalWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) Trace(v ...interface{}) {
-	cLogger.traceWithCallDepth(loggerFuncCallDepth, newLogMessage(v))
-}
-
-func (cLogger *commonLogger) Debug(v ...interface{}) {
-	cLogger.debugWithCallDepth(loggerFuncCallDepth, newLogMessage(v))
-}
-
-func (cLogger *commonLogger) Info(v ...interface{}) {
-	cLogger.infoWithCallDepth(loggerFuncCallDepth, newLogMessage(v))
-}
-
-func (cLogger *commonLogger) Warn(v ...interface{}) error {
-	message := newLogMessage(v)
-	cLogger.warnWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) Error(v ...interface{}) error {
-	message := newLogMessage(v)
-	cLogger.errorWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) Critical(v ...interface{}) error {
-	message := newLogMessage(v)
-	cLogger.criticalWithCallDepth(loggerFuncCallDepth, message)
-	return errors.New(message.String())
-}
-
-func (cLogger *commonLogger) traceWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(TraceLvl, message, callDepth)
-}
-
-func (cLogger *commonLogger) debugWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(DebugLvl, message, callDepth)
-}
-
-func (cLogger *commonLogger) infoWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(InfoLvl, message, callDepth)
-}
-
-func (cLogger *commonLogger) warnWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(WarnLvl, message, callDepth)
-}
-
-func (cLogger *commonLogger) errorWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(ErrorLvl, message, callDepth)
-}
-
-func (cLogger *commonLogger) criticalWithCallDepth(callDepth int, message fmt.Stringer) {
-	cLogger.log(CriticalLvl, message, callDepth)
-	cLogger.innerLogger.Flush()
-}
-
-func (cLogger *commonLogger) Closed() bool {
-	cLogger.closedM.RLock()
-	defer cLogger.closedM.RUnlock()
-	return cLogger.closed
-}
-
-func (cLogger *commonLogger) fillUnusedLevels() {
-	for i := 0; i < len(cLogger.unusedLevels); i++ {
-		cLogger.unusedLevels[i] = true
-	}
-
-	cLogger.fillUnusedLevelsByContraint(cLogger.config.Constraints)
-
-	for _, exception := range cLogger.config.Exceptions {
-		cLogger.fillUnusedLevelsByContraint(exception)
-	}
-}
-
-func (cLogger *commonLogger) fillUnusedLevelsByContraint(constraint logLevelConstraints) {
-	for i := 0; i < len(cLogger.unusedLevels); i++ {
-		if constraint.IsAllowed(LogLevel(i)) {
-			cLogger.unusedLevels[i] = false
-		}
-	}
-}
-
-// stackCallDepth is used to indicate the call depth of 'log' func.
-// This depth level is used in the runtime.Caller(...) call. See
-// common_context.go -> specifyContext, extractCallerInfo for details.
-func (cLogger *commonLogger) log(level LogLevel, message fmt.Stringer, stackCallDepth int) {
-	if cLogger.unusedLevels[level] {
-		return
-	}
-	cLogger.m.Lock()
-	defer cLogger.m.Unlock()
-
-	if cLogger.Closed() {
-		return
-	}
-	context, _ := specifyContext(stackCallDepth + cLogger.addStackDepth)
-	// Context errors are not reported because there are situations
-	// in which context errors are normal Seelog usage cases. For
-	// example in executables with stripped symbols.
-	// Error contexts are returned instead. See common_context.go.
-	/*if err != nil {
-		reportInternalError(err)
-		return
-	}*/
-	cLogger.innerLogger.innerLog(level, context, message)
-}
-
-func (cLogger *commonLogger) processLogMsg(level LogLevel, message fmt.Stringer, context LogContextInterface) {
-	defer func() {
-		if err := recover(); err != nil {
-			reportInternalError(fmt.Errorf("recovered from panic during message processing: %s", err))
-		}
-	}()
-	if cLogger.config.IsAllowed(level, context) {
-		cLogger.config.RootDispatcher.Dispatch(message.String(), level, context, reportInternalError)
-	}
-}
-
-func (cLogger *commonLogger) isAllowed(level LogLevel, context LogContextInterface) bool {
-	funcMap, ok := cLogger.contextCache[context.FullPath()]
-	if !ok {
-		funcMap = make(map[string]map[LogLevel]bool, 0)
-		cLogger.contextCache[context.FullPath()] = funcMap
-	}
-
-	levelMap, ok := funcMap[context.Func()]
-	if !ok {
-		levelMap = make(map[LogLevel]bool, 0)
-		funcMap[context.Func()] = levelMap
-	}
-
-	isAllowValue, ok := levelMap[level]
-	if !ok {
-		isAllowValue = cLogger.config.IsAllowed(level, context)
-		levelMap[level] = isAllowValue
-	}
-
-	return isAllowValue
-}
-
-type logMessage struct {
-	params []interface{}
-}
-
-type logFormattedMessage struct {
-	format string
-	params []interface{}
-}
-
-func newLogMessage(params []interface{}) fmt.Stringer {
-	message := new(logMessage)
-
-	message.params = params
-
-	return message
-}
-
-func newLogFormattedMessage(format string, params []interface{}) *logFormattedMessage {
-	message := new(logFormattedMessage)
-
-	message.params = params
-	message.format = format
-
-	return message
-}
-
-func (message *logMessage) String() string {
-	return fmt.Sprint(message.params...)
-}
-
-func (message *logFormattedMessage) String() string {
-	return fmt.Sprintf(message.format, message.params...)
-}
diff --git a/vendor/github.com/cihub/seelog/writers_bufferedwriter.go b/vendor/github.com/cihub/seelog/writers_bufferedwriter.go
deleted file mode 100644
index e35e34098..000000000
--- a/vendor/github.com/cihub/seelog/writers_bufferedwriter.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-	"time"
-)
-
-// bufferedWriter stores data in memory and flushes it every flushPeriod or when buffer is full
-type bufferedWriter struct {
-	flushPeriod time.Duration // data flushes interval (in microseconds)
-	bufferMutex *sync.Mutex   // mutex for buffer operations syncronization
-	innerWriter io.Writer     // inner writer
-	buffer      *bufio.Writer // buffered wrapper for inner writer
-	bufferSize  int           // max size of data chunk in bytes
-}
-
-// newBufferedWriter creates a new buffered writer struct.
-// bufferSize -- size of memory buffer in bytes
-// flushPeriod -- period in which data flushes from memory buffer in milliseconds. 0 - turn off this functionality
-func newBufferedWriter(innerWriter io.Writer, bufferSize int, flushPeriod time.Duration) (*bufferedWriter, error) {
-
-	if innerWriter == nil {
-		return nil, errors.New("argument is nil: innerWriter")
-	}
-	if flushPeriod < 0 {
-		return nil, fmt.Errorf("flushPeriod can not be less than 0. Got: %d", flushPeriod)
-	}
-
-	if bufferSize <= 0 {
-		return nil, fmt.Errorf("bufferSize can not be less or equal to 0. Got: %d", bufferSize)
-	}
-
-	buffer := bufio.NewWriterSize(innerWriter, bufferSize)
-
-	/*if err != nil {
-		return nil, err
-	}*/
-
-	newWriter := new(bufferedWriter)
-
-	newWriter.innerWriter = innerWriter
-	newWriter.buffer = buffer
-	newWriter.bufferSize = bufferSize
-	newWriter.flushPeriod = flushPeriod * 1e6
-	newWriter.bufferMutex = new(sync.Mutex)
-
-	if flushPeriod != 0 {
-		go newWriter.flushPeriodically()
-	}
-
-	return newWriter, nil
-}
-
-func (bufWriter *bufferedWriter) writeBigChunk(bytes []byte) (n int, err error) {
-	bufferedLen := bufWriter.buffer.Buffered()
-
-	n, err = bufWriter.flushInner()
-	if err != nil {
-		return
-	}
-
-	written, writeErr := bufWriter.innerWriter.Write(bytes)
-	return bufferedLen + written, writeErr
-}
-
-// Sends data to buffer manager. Waits until all buffers are full.
-func (bufWriter *bufferedWriter) Write(bytes []byte) (n int, err error) {
-
-	bufWriter.bufferMutex.Lock()
-	defer bufWriter.bufferMutex.Unlock()
-
-	bytesLen := len(bytes)
-
-	if bytesLen > bufWriter.bufferSize {
-		return bufWriter.writeBigChunk(bytes)
-	}
-
-	if bytesLen > bufWriter.buffer.Available() {
-		n, err = bufWriter.flushInner()
-		if err != nil {
-			return
-		}
-	}
-
-	bufWriter.buffer.Write(bytes)
-
-	return len(bytes), nil
-}
-
-func (bufWriter *bufferedWriter) Close() error {
-	closer, ok := bufWriter.innerWriter.(io.Closer)
-	if ok {
-		return closer.Close()
-	}
-
-	return nil
-}
-
-func (bufWriter *bufferedWriter) Flush() {
-
-	bufWriter.bufferMutex.Lock()
-	defer bufWriter.bufferMutex.Unlock()
-
-	bufWriter.flushInner()
-}
-
-func (bufWriter *bufferedWriter) flushInner() (n int, err error) {
-	bufferedLen := bufWriter.buffer.Buffered()
-	flushErr := bufWriter.buffer.Flush()
-
-	return bufWriter.buffer.Buffered() - bufferedLen, flushErr
-}
-
-func (bufWriter *bufferedWriter) flushBuffer() {
-	bufWriter.bufferMutex.Lock()
-	defer bufWriter.bufferMutex.Unlock()
-
-	bufWriter.buffer.Flush()
-}
-
-func (bufWriter *bufferedWriter) flushPeriodically() {
-	if bufWriter.flushPeriod > 0 {
-		ticker := time.NewTicker(bufWriter.flushPeriod)
-		for {
-			<-ticker.C
-			bufWriter.flushBuffer()
-		}
-	}
-}
-
-func (bufWriter *bufferedWriter) String() string {
-	return fmt.Sprintf("bufferedWriter size: %d, flushPeriod: %d", bufWriter.bufferSize, bufWriter.flushPeriod)
-}
diff --git a/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go b/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go
deleted file mode 100644
index 42d7f288f..000000000
--- a/vendor/github.com/cihub/seelog/writers_bufferedwriter_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-func TestChunkWriteOnFilling(t *testing.T) {
-	writer, _ := newBytesVerifier(t)
-	bufferedWriter, err := newBufferedWriter(writer, 1024, 0)
-
-	if err != nil {
-		t.Fatalf("Unexpected buffered writer creation error: %s", err.Error())
-	}
-
-	bytes := make([]byte, 1000)
-
-	bufferedWriter.Write(bytes)
-	writer.ExpectBytes(bytes)
-	bufferedWriter.Write(bytes)
-}
-
-func TestFlushByTimePeriod(t *testing.T) {
-	writer, _ := newBytesVerifier(t)
-	bufferedWriter, err := newBufferedWriter(writer, 1024, 10)
-
-	if err != nil {
-		t.Fatalf("Unexpected buffered writer creation error: %s", err.Error())
-	}
-
-	bytes := []byte("Hello")
-
-	for i := 0; i < 2; i++ {
-		writer.ExpectBytes(bytes)
-		bufferedWriter.Write(bytes)
-	}
-}
-
-func TestBigMessageMustPassMemoryBuffer(t *testing.T) {
-	writer, _ := newBytesVerifier(t)
-	bufferedWriter, err := newBufferedWriter(writer, 1024, 0)
-
-	if err != nil {
-		t.Fatalf("Unexpected buffered writer creation error: %s", err.Error())
-	}
-
-	bytes := make([]byte, 5000)
-
-	for i := 0; i < len(bytes); i++ {
-		bytes[i] = uint8(i % 255)
-	}
-
-	writer.ExpectBytes(bytes)
-	bufferedWriter.Write(bytes)
-}
diff --git a/vendor/github.com/cihub/seelog/writers_connwriter.go b/vendor/github.com/cihub/seelog/writers_connwriter.go
deleted file mode 100644
index b7b360b7e..000000000
--- a/vendor/github.com/cihub/seelog/writers_connwriter.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"net"
-)
-
-// connWriter is used to write to a stream-oriented network connection.
-type connWriter struct {
-	innerWriter    io.WriteCloser
-	reconnectOnMsg bool
-	reconnect      bool
-	net            string
-	addr           string
-	useTLS         bool
-	configTLS      *tls.Config
-}
-
-// Creates writer to the address addr on the network netName.
-// Connection will be opened on each write if reconnectOnMsg = true
-func newConnWriter(netName string, addr string, reconnectOnMsg bool) *connWriter {
-	newWriter := new(connWriter)
-
-	newWriter.net = netName
-	newWriter.addr = addr
-	newWriter.reconnectOnMsg = reconnectOnMsg
-
-	return newWriter
-}
-
-// Creates a writer that uses SSL/TLS
-func newTLSWriter(netName string, addr string, reconnectOnMsg bool, config *tls.Config) *connWriter {
-	newWriter := new(connWriter)
-
-	newWriter.net = netName
-	newWriter.addr = addr
-	newWriter.reconnectOnMsg = reconnectOnMsg
-	newWriter.useTLS = true
-	newWriter.configTLS = config
-
-	return newWriter
-}
-
-func (connWriter *connWriter) Close() error {
-	if connWriter.innerWriter == nil {
-		return nil
-	}
-
-	return connWriter.innerWriter.Close()
-}
-
-func (connWriter *connWriter) Write(bytes []byte) (n int, err error) {
-	if connWriter.neededConnectOnMsg() {
-		err = connWriter.connect()
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	if connWriter.reconnectOnMsg {
-		defer connWriter.innerWriter.Close()
-	}
-
-	n, err = connWriter.innerWriter.Write(bytes)
-	if err != nil {
-		connWriter.reconnect = true
-	}
-
-	return
-}
-
-func (connWriter *connWriter) String() string {
-	return fmt.Sprintf("Conn writer: [%s, %s, %v]", connWriter.net, connWriter.addr, connWriter.reconnectOnMsg)
-}
-
-func (connWriter *connWriter) connect() error {
-	if connWriter.innerWriter != nil {
-		connWriter.innerWriter.Close()
-		connWriter.innerWriter = nil
-	}
-
-	if connWriter.useTLS {
-		conn, err := tls.Dial(connWriter.net, connWriter.addr, connWriter.configTLS)
-		if err != nil {
-			return err
-		}
-		connWriter.innerWriter = conn
-
-		return nil
-	}
-
-	conn, err := net.Dial(connWriter.net, connWriter.addr)
-	if err != nil {
-		return err
-	}
-
-	tcpConn, ok := conn.(*net.TCPConn)
-	if ok {
-		tcpConn.SetKeepAlive(true)
-	}
-
-	connWriter.innerWriter = conn
-
-	return nil
-}
-
-func (connWriter *connWriter) neededConnectOnMsg() bool {
-	if connWriter.reconnect {
-		connWriter.reconnect = false
-		return true
-	}
-
-	if connWriter.innerWriter == nil {
-		return true
-	}
-
-	return connWriter.reconnectOnMsg
-}
diff --git a/vendor/github.com/cihub/seelog/writers_consolewriter.go b/vendor/github.com/cihub/seelog/writers_consolewriter.go
deleted file mode 100644
index f0d3b4100..000000000
--- a/vendor/github.com/cihub/seelog/writers_consolewriter.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import "fmt"
-
-// consoleWriter is used to write to console
-type consoleWriter struct {
-}
-
-// Creates a new console writer. Returns error, if the console writer couldn't be created.
-func newConsoleWriter() (writer *consoleWriter, err error) {
-	newWriter := new(consoleWriter)
-
-	return newWriter, nil
-}
-
-// Create folder and file on WriteLog/Write first call
-func (console *consoleWriter) Write(bytes []byte) (int, error) {
-	return fmt.Print(string(bytes))
-}
-
-func (console *consoleWriter) String() string {
-	return "Console writer"
-}
diff --git a/vendor/github.com/cihub/seelog/writers_filewriter.go b/vendor/github.com/cihub/seelog/writers_filewriter.go
deleted file mode 100644
index be5ec34be..000000000
--- a/vendor/github.com/cihub/seelog/writers_filewriter.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-)
-
-// fileWriter is used to write to a file.
-type fileWriter struct {
-	innerWriter io.WriteCloser
-	fileName    string
-}
-
-// Creates a new file and a corresponding writer. Returns error, if the file couldn't be created.
-func newFileWriter(fileName string) (writer *fileWriter, err error) {
-	newWriter := new(fileWriter)
-	newWriter.fileName = fileName
-
-	return newWriter, nil
-}
-
-func (fw *fileWriter) Close() error {
-	if fw.innerWriter != nil {
-		err := fw.innerWriter.Close()
-		if err != nil {
-			return err
-		}
-		fw.innerWriter = nil
-	}
-	return nil
-}
-
-// Create folder and file on WriteLog/Write first call
-func (fw *fileWriter) Write(bytes []byte) (n int, err error) {
-	if fw.innerWriter == nil {
-		if err := fw.createFile(); err != nil {
-			return 0, err
-		}
-	}
-	return fw.innerWriter.Write(bytes)
-}
-
-func (fw *fileWriter) createFile() error {
-	folder, _ := filepath.Split(fw.fileName)
-	var err error
-
-	if 0 != len(folder) {
-		err = os.MkdirAll(folder, defaultDirectoryPermissions)
-		if err != nil {
-			return err
-		}
-	}
-
-	// If exists
-	fw.innerWriter, err = os.OpenFile(fw.fileName, os.O_WRONLY|os.O_APPEND|os.O_CREATE, defaultFilePermissions)
-
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (fw *fileWriter) String() string {
-	return fmt.Sprintf("File writer: %s", fw.fileName)
-}
diff --git a/vendor/github.com/cihub/seelog/writers_filewriter_test.go b/vendor/github.com/cihub/seelog/writers_filewriter_test.go
deleted file mode 100644
index 5f73a2885..000000000
--- a/vendor/github.com/cihub/seelog/writers_filewriter_test.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-const (
-	messageLen = 10
-)
-
-var bytesFileTest = []byte(strings.Repeat("A", messageLen))
-
-func TestSimpleFileWriter(t *testing.T) {
-	t.Logf("Starting file writer tests")
-	newFileWriterTester(simplefileWriterTests, simplefileWriterGetter, t).test()
-}
-
-//===============================================================
-
-func simplefileWriterGetter(testCase *fileWriterTestCase) (io.WriteCloser, error) {
-	return newFileWriter(testCase.fileName)
-}
-
-//===============================================================
-type fileWriterTestCase struct {
-	files       []string
-	fileName    string
-	rollingType rollingType
-	fileSize    int64
-	maxRolls    int
-	datePattern string
-	writeCount  int
-	resFiles    []string
-	nameMode    rollingNameMode
-}
-
-func createSimplefileWriterTestCase(fileName string, writeCount int) *fileWriterTestCase {
-	return &fileWriterTestCase{[]string{}, fileName, rollingTypeSize, 0, 0, "", writeCount, []string{fileName}, 0}
-}
-
-var simplefileWriterTests = []*fileWriterTestCase{
-	createSimplefileWriterTestCase("log.testlog", 1),
-	createSimplefileWriterTestCase("log.testlog", 50),
-	createSimplefileWriterTestCase(filepath.Join("dir", "log.testlog"), 50),
-}
-
-//===============================================================
-
-type fileWriterTester struct {
-	testCases    []*fileWriterTestCase
-	writerGetter func(*fileWriterTestCase) (io.WriteCloser, error)
-	t            *testing.T
-}
-
-func newFileWriterTester(
-	testCases []*fileWriterTestCase,
-	writerGetter func(*fileWriterTestCase) (io.WriteCloser, error),
-	t *testing.T) *fileWriterTester {
-
-	return &fileWriterTester{testCases, writerGetter, t}
-}
-
-func isWriterTestFile(fn string) bool {
-	return strings.Contains(fn, ".testlog")
-}
-
-func cleanupWriterTest(t *testing.T) {
-	toDel, err := getDirFilePaths(".", isWriterTestFile, true)
-	if nil != err {
-		t.Fatal("Cannot list files in test directory!")
-	}
-
-	for _, p := range toDel {
-		if err = tryRemoveFile(p); nil != err {
-			t.Errorf("cannot remove file %s in test directory: %s", p, err.Error())
-		}
-	}
-
-	if err = os.RemoveAll("dir"); nil != err {
-		t.Errorf("cannot remove temp test directory: %s", err.Error())
-	}
-}
-
-func getWriterTestResultFiles() ([]string, error) {
-	var p []string
-
-	visit := func(path string, f os.FileInfo, err error) error {
-		if !f.IsDir() && isWriterTestFile(path) {
-			abs, err := filepath.Abs(path)
-			if err != nil {
-				return fmt.Errorf("filepath.Abs failed for %s", path)
-			}
-
-			p = append(p, abs)
-		}
-
-		return nil
-	}
-
-	err := filepath.Walk(".", visit)
-	if nil != err {
-		return nil, err
-	}
-
-	return p, nil
-}
-
-func (tester *fileWriterTester) testCase(testCase *fileWriterTestCase, testNum int) {
-	defer cleanupWriterTest(tester.t)
-
-	tester.t.Logf("Start test  [%v]\n", testNum)
-
-	for _, filePath := range testCase.files {
-		dir, _ := filepath.Split(filePath)
-
-		var err error
-
-		if 0 != len(dir) {
-			err = os.MkdirAll(dir, defaultDirectoryPermissions)
-			if err != nil {
-				tester.t.Error(err)
-				return
-			}
-		}
-
-		fi, err := os.Create(filePath)
-		if err != nil {
-			tester.t.Error(err)
-			return
-		}
-
-		err = fi.Close()
-		if err != nil {
-			tester.t.Error(err)
-			return
-		}
-	}
-
-	fwc, err := tester.writerGetter(testCase)
-	if err != nil {
-		tester.t.Error(err)
-		return
-	}
-	defer fwc.Close()
-
-	tester.performWrite(fwc, testCase.writeCount)
-
-	files, err := getWriterTestResultFiles()
-	if err != nil {
-		tester.t.Error(err)
-		return
-	}
-
-	tester.checkRequiredFilesExist(testCase, files)
-	tester.checkJustRequiredFilesExist(testCase, files)
-
-}
-
-func (tester *fileWriterTester) test() {
-	for i, tc := range tester.testCases {
-		cleanupWriterTest(tester.t)
-		tester.testCase(tc, i)
-	}
-}
-
-func (tester *fileWriterTester) performWrite(fileWriter io.Writer, count int) {
-	for i := 0; i < count; i++ {
-		_, err := fileWriter.Write(bytesFileTest)
-
-		if err != nil {
-			tester.t.Error(err)
-			return
-		}
-	}
-}
-
-func (tester *fileWriterTester) checkRequiredFilesExist(testCase *fileWriterTestCase, files []string) {
-	var found bool
-	for _, expected := range testCase.resFiles {
-		found = false
-		exAbs, err := filepath.Abs(expected)
-		if err != nil {
-			tester.t.Errorf("filepath.Abs failed for %s", expected)
-			continue
-		}
-
-		for _, f := range files {
-			if af, e := filepath.Abs(f); e == nil {
-				tester.t.Log(af)
-				if exAbs == af {
-					found = true
-					break
-				}
-			} else {
-				tester.t.Errorf("filepath.Abs failed for %s", f)
-			}
-		}
-
-		if !found {
-			tester.t.Errorf("expected file: %s doesn't exist. Got %v\n", exAbs, files)
-		}
-	}
-}
-
-func (tester *fileWriterTester) checkJustRequiredFilesExist(testCase *fileWriterTestCase, files []string) {
-	for _, f := range files {
-		found := false
-		for _, expected := range testCase.resFiles {
-
-			exAbs, err := filepath.Abs(expected)
-			if err != nil {
-				tester.t.Errorf("filepath.Abs failed for %s", expected)
-			} else {
-				if exAbs == f {
-					found = true
-					break
-				}
-			}
-		}
-
-		if !found {
-			tester.t.Errorf("unexpected file: %v", f)
-		}
-	}
-}
diff --git a/vendor/github.com/cihub/seelog/writers_formattedwriter.go b/vendor/github.com/cihub/seelog/writers_formattedwriter.go
deleted file mode 100644
index d28f2b8dc..000000000
--- a/vendor/github.com/cihub/seelog/writers_formattedwriter.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"errors"
-	"fmt"
-	"io"
-)
-
-type formattedWriter struct {
-	writer    io.Writer
-	formatter *formatter
-}
-
-func newFormattedWriter(writer io.Writer, formatter *formatter) (*formattedWriter, error) {
-	if formatter == nil {
-		return nil, errors.New("formatter can not be nil")
-	}
-
-	return &formattedWriter{writer, formatter}, nil
-}
-
-func (formattedWriter *formattedWriter) Write(message string, level LogLevel, context LogContextInterface) error {
-	str := formattedWriter.formatter.Format(message, level, context)
-	_, err := formattedWriter.writer.Write([]byte(str))
-	return err
-}
-
-func (formattedWriter *formattedWriter) String() string {
-	return fmt.Sprintf("writer: %s, format: %s", formattedWriter.writer, formattedWriter.formatter)
-}
-
-func (formattedWriter *formattedWriter) Writer() io.Writer {
-	return formattedWriter.writer
-}
-
-func (formattedWriter *formattedWriter) Format() *formatter {
-	return formattedWriter.formatter
-}
diff --git a/vendor/github.com/cihub/seelog/writers_formattedwriter_test.go b/vendor/github.com/cihub/seelog/writers_formattedwriter_test.go
deleted file mode 100644
index 07519cc60..000000000
--- a/vendor/github.com/cihub/seelog/writers_formattedwriter_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"testing"
-)
-
-func TestformattedWriter(t *testing.T) {
-	formatStr := "%Level %LEVEL %Msg"
-	message := "message"
-	var logLevel = LogLevel(TraceLvl)
-
-	bytesVerifier, err := newBytesVerifier(t)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	formatter, err := newFormatter(formatStr)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	writer, err := newFormattedWriter(bytesVerifier, formatter)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	context, err := currentContext()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	logMessage := formatter.Format(message, logLevel, context)
-
-	bytesVerifier.ExpectBytes([]byte(logMessage))
-	writer.Write(message, logLevel, context)
-	bytesVerifier.MustNotExpect()
-}
diff --git a/vendor/github.com/cihub/seelog/writers_rollingfilewriter.go b/vendor/github.com/cihub/seelog/writers_rollingfilewriter.go
deleted file mode 100644
index 5b321d5b0..000000000
--- a/vendor/github.com/cihub/seelog/writers_rollingfilewriter.go
+++ /dev/null
@@ -1,612 +0,0 @@
-// Copyright (c) 2013 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Common constants
-const (
-	rollingLogHistoryDelimiter = "."
-)
-
-// Types of the rolling writer: roll by date, by time, etc.
-type rollingType uint8
-
-const (
-	rollingTypeSize = iota
-	rollingTypeTime
-)
-
-// Types of the rolled file naming mode: prefix, postfix, etc.
-type rollingNameMode uint8
-
-const (
-	rollingNameModePostfix = iota
-	rollingNameModePrefix
-)
-
-var rollingNameModesStringRepresentation = map[rollingNameMode]string{
-	rollingNameModePostfix: "postfix",
-	rollingNameModePrefix:  "prefix",
-}
-
-func rollingNameModeFromString(rollingNameStr string) (rollingNameMode, bool) {
-	for tp, tpStr := range rollingNameModesStringRepresentation {
-		if tpStr == rollingNameStr {
-			return tp, true
-		}
-	}
-
-	return 0, false
-}
-
-type rollingIntervalType uint8
-
-const (
-	rollingIntervalAny = iota
-	rollingIntervalDaily
-)
-
-var rollingInvervalTypesStringRepresentation = map[rollingIntervalType]string{
-	rollingIntervalDaily: "daily",
-}
-
-func rollingIntervalTypeFromString(rollingTypeStr string) (rollingIntervalType, bool) {
-	for tp, tpStr := range rollingInvervalTypesStringRepresentation {
-		if tpStr == rollingTypeStr {
-			return tp, true
-		}
-	}
-
-	return 0, false
-}
-
-var rollingTypesStringRepresentation = map[rollingType]string{
-	rollingTypeSize: "size",
-	rollingTypeTime: "date",
-}
-
-func rollingTypeFromString(rollingTypeStr string) (rollingType, bool) {
-	for tp, tpStr := range rollingTypesStringRepresentation {
-		if tpStr == rollingTypeStr {
-			return tp, true
-		}
-	}
-
-	return 0, false
-}
-
-// Old logs archivation type.
-type rollingArchiveType uint8
-
-const (
-	rollingArchiveNone = iota
-	rollingArchiveZip
-)
-
-var rollingArchiveTypesStringRepresentation = map[rollingArchiveType]string{
-	rollingArchiveNone: "none",
-	rollingArchiveZip:  "zip",
-}
-
-func rollingArchiveTypeFromString(rollingArchiveTypeStr string) (rollingArchiveType, bool) {
-	for tp, tpStr := range rollingArchiveTypesStringRepresentation {
-		if tpStr == rollingArchiveTypeStr {
-			return tp, true
-		}
-	}
-
-	return 0, false
-}
-
-// Default names for different archivation types
-var rollingArchiveTypesDefaultNames = map[rollingArchiveType]string{
-	rollingArchiveZip: "log.zip",
-}
-
-// rollerVirtual is an interface that represents all virtual funcs that are
-// called in different rolling writer subtypes.
-type rollerVirtual interface {
-	needsToRoll() (bool, error)                         // Returns true if needs to switch to another file.
-	isFileRollNameValid(rname string) bool              // Returns true if logger roll file name (postfix/prefix/etc.) is ok.
-	sortFileRollNamesAsc(fs []string) ([]string, error) // Sorts logger roll file names in ascending order of their creation by logger.
-
-	// Creates a new froll history file using the contents of current file and special filename of the latest roll (prefix/ postfix).
-	// If lastRollName is empty (""), then it means that there is no latest roll (current is the first one)
-	getNewHistoryRollFileName(lastRollName string) string
-	getCurrentModifiedFileName(originalFileName string) string // Returns filename modified according to specific logger rules
-}
-
-// rollingFileWriter writes received messages to a file, until time interval passes
-// or file exceeds a specified limit. After that the current log file is renamed
-// and writer starts to log into a new file. You can set a limit for such renamed
-// files count, if you want, and then the rolling writer would delete older ones when
-// the files count exceed the specified limit.
-type rollingFileWriter struct {
-	fileName         string // current file name. May differ from original in date rolling loggers
-	originalFileName string // original one
-	currentDirPath   string
-	currentFile      *os.File
-	currentFileSize  int64
-	rollingType      rollingType // Rolling mode (Files roll by size/date/...)
-	archiveType      rollingArchiveType
-	archivePath      string
-	maxRolls         int
-	nameMode         rollingNameMode
-	self             rollerVirtual // Used for virtual calls
-}
-
-func newRollingFileWriter(fpath string, rtype rollingType, atype rollingArchiveType, apath string, maxr int, namemode rollingNameMode) (*rollingFileWriter, error) {
-	rw := new(rollingFileWriter)
-	rw.currentDirPath, rw.fileName = filepath.Split(fpath)
-	if len(rw.currentDirPath) == 0 {
-		rw.currentDirPath = "."
-	}
-	rw.originalFileName = rw.fileName
-
-	rw.rollingType = rtype
-	rw.archiveType = atype
-	rw.archivePath = apath
-	rw.nameMode = namemode
-	rw.maxRolls = maxr
-	return rw, nil
-}
-
-func (rw *rollingFileWriter) hasRollName(file string) bool {
-	switch rw.nameMode {
-	case rollingNameModePostfix:
-		rname := rw.originalFileName + rollingLogHistoryDelimiter
-		return strings.HasPrefix(file, rname)
-	case rollingNameModePrefix:
-		rname := rollingLogHistoryDelimiter + rw.originalFileName
-		return strings.HasSuffix(file, rname)
-	}
-	return false
-}
-
-func (rw *rollingFileWriter) createFullFileName(originalName, rollname string) string {
-	switch rw.nameMode {
-	case rollingNameModePostfix:
-		return originalName + rollingLogHistoryDelimiter + rollname
-	case rollingNameModePrefix:
-		return rollname + rollingLogHistoryDelimiter + originalName
-	}
-	return ""
-}
-
-func (rw *rollingFileWriter) getSortedLogHistory() ([]string, error) {
-	files, err := getDirFilePaths(rw.currentDirPath, nil, true)
-	if err != nil {
-		return nil, err
-	}
-	var validRollNames []string
-	for _, file := range files {
-		if file != rw.fileName && rw.hasRollName(file) {
-			rname := rw.getFileRollName(file)
-			if rw.self.isFileRollNameValid(rname) {
-				validRollNames = append(validRollNames, rname)
-			}
-		}
-	}
-	sortedTails, err := rw.self.sortFileRollNamesAsc(validRollNames)
-	if err != nil {
-		return nil, err
-	}
-	validSortedFiles := make([]string, len(sortedTails))
-	for i, v := range sortedTails {
-		validSortedFiles[i] = rw.createFullFileName(rw.originalFileName, v)
-	}
-	return validSortedFiles, nil
-}
-
-func (rw *rollingFileWriter) createFileAndFolderIfNeeded() error {
-	var err error
-
-	if len(rw.currentDirPath) != 0 {
-		err = os.MkdirAll(rw.currentDirPath, defaultDirectoryPermissions)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	rw.fileName = rw.self.getCurrentModifiedFileName(rw.originalFileName)
-	filePath := filepath.Join(rw.currentDirPath, rw.fileName)
-
-	// If exists
-	stat, err := os.Lstat(filePath)
-	if err == nil {
-		rw.currentFile, err = os.OpenFile(filePath, os.O_WRONLY|os.O_APPEND, defaultFilePermissions)
-
-		stat, err = os.Lstat(filePath)
-		if err != nil {
-			return err
-		}
-
-		rw.currentFileSize = stat.Size()
-	} else {
-		rw.currentFile, err = os.Create(filePath)
-		rw.currentFileSize = 0
-	}
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (rw *rollingFileWriter) deleteOldRolls(history []string) error {
-	if rw.maxRolls <= 0 {
-		return nil
-	}
-
-	rollsToDelete := len(history) - rw.maxRolls
-	if rollsToDelete <= 0 {
-		return nil
-	}
-
-	switch rw.archiveType {
-	case rollingArchiveZip:
-		var files map[string][]byte
-
-		// If archive exists
-		_, err := os.Lstat(rw.archivePath)
-		if nil == err {
-			// Extract files and content from it
-			files, err = unzip(rw.archivePath)
-			if err != nil {
-				return err
-			}
-
-			// Remove the original file
-			err = tryRemoveFile(rw.archivePath)
-			if err != nil {
-				return err
-			}
-		} else {
-			files = make(map[string][]byte)
-		}
-
-		// Add files to the existing files map, filled above
-		for i := 0; i < rollsToDelete; i++ {
-			rollPath := filepath.Join(rw.currentDirPath, history[i])
-			bts, err := ioutil.ReadFile(rollPath)
-			if err != nil {
-				return err
-			}
-
-			files[rollPath] = bts
-		}
-
-		// Put the final file set to zip file.
-		if err = createZip(rw.archivePath, files); err != nil {
-			return err
-		}
-	}
-	var err error
-	// In all cases (archive files or not) the files should be deleted.
-	for i := 0; i < rollsToDelete; i++ {
-		// Try best to delete files without breaking the loop.
-		if err = tryRemoveFile(filepath.Join(rw.currentDirPath, history[i])); err != nil {
-			reportInternalError(err)
-		}
-	}
-
-	return nil
-}
-
-func (rw *rollingFileWriter) getFileRollName(fileName string) string {
-	switch rw.nameMode {
-	case rollingNameModePostfix:
-		return fileName[len(rw.originalFileName+rollingLogHistoryDelimiter):]
-	case rollingNameModePrefix:
-		return fileName[:len(fileName)-len(rw.originalFileName+rollingLogHistoryDelimiter)]
-	}
-	return ""
-}
-
-func (rw *rollingFileWriter) Write(bytes []byte) (n int, err error) {
-	if rw.currentFile == nil {
-		err := rw.createFileAndFolderIfNeeded()
-		if err != nil {
-			return 0, err
-		}
-	}
-	// needs to roll if:
-	//   * file roller max file size exceeded OR
-	//   * time roller interval passed
-	nr, err := rw.self.needsToRoll()
-	if err != nil {
-		return 0, err
-	}
-	if nr {
-		// First, close current file.
-		err = rw.currentFile.Close()
-		if err != nil {
-			return 0, err
-		}
-		// Current history of all previous log files.
-		// For file roller it may be like this:
-		//     * ...
-		//     * file.log.4
-		//     * file.log.5
-		//     * file.log.6
-		//
-		// For date roller it may look like this:
-		//     * ...
-		//     * file.log.11.Aug.13
-		//     * file.log.15.Aug.13
-		//     * file.log.16.Aug.13
-		// Sorted log history does NOT include current file.
-		history, err := rw.getSortedLogHistory()
-		if err != nil {
-			return 0, err
-		}
-		// Renames current file to create a new roll history entry
-		// For file roller it may be like this:
-		//     * ...
-		//     * file.log.4
-		//     * file.log.5
-		//     * file.log.6
-		//     n file.log.7  <---- RENAMED (from file.log)
-		// Time rollers that doesn't modify file names (e.g. 'date' roller) skip this logic.
-		var newHistoryName string
-		var newRollMarkerName string
-		if len(history) > 0 {
-			// Create new rname name using last history file name
-			newRollMarkerName = rw.self.getNewHistoryRollFileName(rw.getFileRollName(history[len(history)-1]))
-		} else {
-			// Create first rname name
-			newRollMarkerName = rw.self.getNewHistoryRollFileName("")
-		}
-		if len(newRollMarkerName) != 0 {
-			newHistoryName = rw.createFullFileName(rw.fileName, newRollMarkerName)
-		} else {
-			newHistoryName = rw.fileName
-		}
-		if newHistoryName != rw.fileName {
-			err = os.Rename(filepath.Join(rw.currentDirPath, rw.fileName), filepath.Join(rw.currentDirPath, newHistoryName))
-			if err != nil {
-				return 0, err
-			}
-		}
-		// Finally, add the newly added history file to the history archive
-		// and, if after that the archive exceeds the allowed max limit, older rolls
-		// must the removed/archived.
-		history = append(history, newHistoryName)
-		if len(history) > rw.maxRolls {
-			err = rw.deleteOldRolls(history)
-			if err != nil {
-				return 0, err
-			}
-		}
-
-		err = rw.createFileAndFolderIfNeeded()
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	rw.currentFileSize += int64(len(bytes))
-	return rw.currentFile.Write(bytes)
-}
-
-func (rw *rollingFileWriter) Close() error {
-	if rw.currentFile != nil {
-		e := rw.currentFile.Close()
-		if e != nil {
-			return e
-		}
-		rw.currentFile = nil
-	}
-	return nil
-}
-
-// =============================================================================================
-//      Different types of rolling writers
-// =============================================================================================
-
-// --------------------------------------------------
-//      Rolling writer by SIZE
-// --------------------------------------------------
-
-// rollingFileWriterSize performs roll when file exceeds a specified limit.
-type rollingFileWriterSize struct {
-	*rollingFileWriter
-	maxFileSize int64
-}
-
-func newRollingFileWriterSize(fpath string, atype rollingArchiveType, apath string, maxSize int64, maxRolls int, namemode rollingNameMode) (*rollingFileWriterSize, error) {
-	rw, err := newRollingFileWriter(fpath, rollingTypeSize, atype, apath, maxRolls, namemode)
-	if err != nil {
-		return nil, err
-	}
-	rws := &rollingFileWriterSize{rw, maxSize}
-	rws.self = rws
-	return rws, nil
-}
-
-func (rws *rollingFileWriterSize) needsToRoll() (bool, error) {
-	return rws.currentFileSize >= rws.maxFileSize, nil
-}
-
-func (rws *rollingFileWriterSize) isFileRollNameValid(rname string) bool {
-	if len(rname) == 0 {
-		return false
-	}
-	_, err := strconv.Atoi(rname)
-	return err == nil
-}
-
-type rollSizeFileTailsSlice []string
-
-func (p rollSizeFileTailsSlice) Len() int { return len(p) }
-func (p rollSizeFileTailsSlice) Less(i, j int) bool {
-	v1, _ := strconv.Atoi(p[i])
-	v2, _ := strconv.Atoi(p[j])
-	return v1 < v2
-}
-func (p rollSizeFileTailsSlice) Swap(i, j int) { p[i], p[j] = p[j], p[i] }
-
-func (rws *rollingFileWriterSize) sortFileRollNamesAsc(fs []string) ([]string, error) {
-	ss := rollSizeFileTailsSlice(fs)
-	sort.Sort(ss)
-	return ss, nil
-}
-
-func (rws *rollingFileWriterSize) getNewHistoryRollFileName(lastRollName string) string {
-	v := 0
-	if len(lastRollName) != 0 {
-		v, _ = strconv.Atoi(lastRollName)
-	}
-	return fmt.Sprintf("%d", v+1)
-}
-
-func (rws *rollingFileWriterSize) getCurrentModifiedFileName(originalFileName string) string {
-	return originalFileName
-}
-
-func (rws *rollingFileWriterSize) String() string {
-	return fmt.Sprintf("Rolling file writer (By SIZE): filename: %s, archive: %s, archivefile: %s, maxFileSize: %v, maxRolls: %v",
-		rws.fileName,
-		rollingArchiveTypesStringRepresentation[rws.archiveType],
-		rws.archivePath,
-		rws.maxFileSize,
-		rws.maxRolls)
-}
-
-// --------------------------------------------------
-//      Rolling writer by TIME
-// --------------------------------------------------
-
-// rollingFileWriterTime performs roll when a specified time interval has passed.
-type rollingFileWriterTime struct {
-	*rollingFileWriter
-	timePattern         string
-	interval            rollingIntervalType
-	currentTimeFileName string
-}
-
-func newRollingFileWriterTime(fpath string, atype rollingArchiveType, apath string, maxr int,
-	timePattern string, interval rollingIntervalType, namemode rollingNameMode) (*rollingFileWriterTime, error) {
-
-	rw, err := newRollingFileWriter(fpath, rollingTypeTime, atype, apath, maxr, namemode)
-	if err != nil {
-		return nil, err
-	}
-	rws := &rollingFileWriterTime{rw, timePattern, interval, ""}
-	rws.self = rws
-	return rws, nil
-}
-
-func (rwt *rollingFileWriterTime) needsToRoll() (bool, error) {
-	switch rwt.nameMode {
-	case rollingNameModePostfix:
-		if rwt.originalFileName+rollingLogHistoryDelimiter+time.Now().Format(rwt.timePattern) == rwt.fileName {
-			return false, nil
-		}
-	case rollingNameModePrefix:
-		if time.Now().Format(rwt.timePattern)+rollingLogHistoryDelimiter+rwt.originalFileName == rwt.fileName {
-			return false, nil
-		}
-	}
-	if rwt.interval == rollingIntervalAny {
-		return true, nil
-	}
-
-	tprev, err := time.ParseInLocation(rwt.timePattern, rwt.getFileRollName(rwt.fileName), time.Local)
-	if err != nil {
-		return false, err
-	}
-
-	diff := time.Now().Sub(tprev)
-	switch rwt.interval {
-	case rollingIntervalDaily:
-		return diff >= 24*time.Hour, nil
-	}
-	return false, fmt.Errorf("unknown interval type: %d", rwt.interval)
-}
-
-func (rwt *rollingFileWriterTime) isFileRollNameValid(rname string) bool {
-	if len(rname) == 0 {
-		return false
-	}
-	_, err := time.ParseInLocation(rwt.timePattern, rname, time.Local)
-	return err == nil
-}
-
-type rollTimeFileTailsSlice struct {
-	data    []string
-	pattern string
-}
-
-func (p rollTimeFileTailsSlice) Len() int { return len(p.data) }
-
-func (p rollTimeFileTailsSlice) Less(i, j int) bool {
-	t1, _ := time.ParseInLocation(p.pattern, p.data[i], time.Local)
-	t2, _ := time.ParseInLocation(p.pattern, p.data[j], time.Local)
-	return t1.Before(t2)
-}
-
-func (p rollTimeFileTailsSlice) Swap(i, j int) { p.data[i], p.data[j] = p.data[j], p.data[i] }
-
-func (rwt *rollingFileWriterTime) sortFileRollNamesAsc(fs []string) ([]string, error) {
-	ss := rollTimeFileTailsSlice{data: fs, pattern: rwt.timePattern}
-	sort.Sort(ss)
-	return ss.data, nil
-}
-
-func (rwt *rollingFileWriterTime) getNewHistoryRollFileName(lastRollName string) string {
-	return ""
-}
-
-func (rwt *rollingFileWriterTime) getCurrentModifiedFileName(originalFileName string) string {
-	switch rwt.nameMode {
-	case rollingNameModePostfix:
-		return originalFileName + rollingLogHistoryDelimiter + time.Now().Format(rwt.timePattern)
-	case rollingNameModePrefix:
-		return time.Now().Format(rwt.timePattern) + rollingLogHistoryDelimiter + originalFileName
-	}
-	return ""
-}
-
-func (rwt *rollingFileWriterTime) String() string {
-	return fmt.Sprintf("Rolling file writer (By TIME): filename: %s, archive: %s, archivefile: %s, maxInterval: %v, pattern: %s, maxRolls: %v",
-		rwt.fileName,
-		rollingArchiveTypesStringRepresentation[rwt.archiveType],
-		rwt.archivePath,
-		rwt.interval,
-		rwt.timePattern,
-		rwt.maxRolls)
-}
diff --git a/vendor/github.com/cihub/seelog/writers_rollingfilewriter_test.go b/vendor/github.com/cihub/seelog/writers_rollingfilewriter_test.go
deleted file mode 100644
index 338c3a410..000000000
--- a/vendor/github.com/cihub/seelog/writers_rollingfilewriter_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"fmt"
-	"io"
-	"testing"
-)
-
-// fileWriterTestCase is declared in writers_filewriter_test.go
-
-func createRollingSizeFileWriterTestCase(
-	files []string,
-	fileName string,
-	fileSize int64,
-	maxRolls int,
-	writeCount int,
-	resFiles []string,
-	nameMode rollingNameMode) *fileWriterTestCase {
-
-	return &fileWriterTestCase{files, fileName, rollingTypeSize, fileSize, maxRolls, "", writeCount, resFiles, nameMode}
-}
-
-func createRollingDatefileWriterTestCase(
-	files []string,
-	fileName string,
-	datePattern string,
-	writeCount int,
-	resFiles []string,
-	nameMode rollingNameMode) *fileWriterTestCase {
-
-	return &fileWriterTestCase{files, fileName, rollingTypeTime, 0, 0, datePattern, writeCount, resFiles, nameMode}
-}
-
-func TestRollingFileWriter(t *testing.T) {
-	t.Logf("Starting rolling file writer tests")
-	newFileWriterTester(rollingfileWriterTests, rollingFileWriterGetter, t).test()
-}
-
-//===============================================================
-
-func rollingFileWriterGetter(testCase *fileWriterTestCase) (io.WriteCloser, error) {
-	if testCase.rollingType == rollingTypeSize {
-		return newRollingFileWriterSize(testCase.fileName, rollingArchiveNone, "", testCase.fileSize, testCase.maxRolls, testCase.nameMode)
-	} else if testCase.rollingType == rollingTypeTime {
-		return newRollingFileWriterTime(testCase.fileName, rollingArchiveNone, "", -1, testCase.datePattern, rollingIntervalDaily, testCase.nameMode)
-	}
-
-	return nil, fmt.Errorf("incorrect rollingType")
-}
-
-//===============================================================
-var rollingfileWriterTests = []*fileWriterTestCase{
-	createRollingSizeFileWriterTestCase([]string{}, "log.testlog", 10, 10, 1, []string{"log.testlog"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, "log.testlog", 10, 10, 2, []string{"log.testlog", "log.testlog.1"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{"1.log.testlog"}, "log.testlog", 10, 10, 2, []string{"log.testlog", "1.log.testlog", "2.log.testlog"}, rollingNameModePrefix),
-	createRollingSizeFileWriterTestCase([]string{"log.testlog.1"}, "log.testlog", 10, 1, 2, []string{"log.testlog", "log.testlog.2"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, "log.testlog", 10, 1, 2, []string{"log.testlog", "log.testlog.1"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{"log.testlog.9"}, "log.testlog", 10, 1, 2, []string{"log.testlog", "log.testlog.10"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{"log.testlog.a", "log.testlog.1b"}, "log.testlog", 10, 1, 2, []string{"log.testlog", "log.testlog.1", "log.testlog.a", "log.testlog.1b"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `dir/log.testlog`, 10, 10, 1, []string{`dir/log.testlog`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `dir/log.testlog`, 10, 10, 2, []string{`dir/log.testlog`, `dir/1.log.testlog`}, rollingNameModePrefix),
-	createRollingSizeFileWriterTestCase([]string{`dir/dir/log.testlog.1`}, `dir/dir/log.testlog`, 10, 10, 2, []string{`dir/dir/log.testlog`, `dir/dir/log.testlog.1`, `dir/dir/log.testlog.2`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{`dir/dir/dir/log.testlog.1`}, `dir/dir/dir/log.testlog`, 10, 1, 2, []string{`dir/dir/dir/log.testlog`, `dir/dir/dir/log.testlog.2`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `./log.testlog`, 10, 1, 2, []string{`log.testlog`, `log.testlog.1`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{`././././log.testlog.9`}, `log.testlog`, 10, 1, 2, []string{`log.testlog`, `log.testlog.10`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{"dir/dir/log.testlog.a", "dir/dir/log.testlog.1b"}, "dir/dir/log.testlog", 10, 1, 2, []string{"dir/dir/log.testlog", "dir/dir/log.testlog.1", "dir/dir/log.testlog.a", "dir/dir/log.testlog.1b"}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `././dir/log.testlog`, 10, 10, 1, []string{`dir/log.testlog`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `././dir/log.testlog`, 10, 10, 2, []string{`dir/log.testlog`, `dir/log.testlog.1`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{`././dir/dir/log.testlog.1`}, `dir/dir/log.testlog`, 10, 10, 2, []string{`dir/dir/log.testlog`, `dir/dir/log.testlog.1`, `dir/dir/log.testlog.2`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{`././dir/dir/dir/log.testlog.1`}, `dir/dir/dir/log.testlog`, 10, 1, 2, []string{`dir/dir/dir/log.testlog`, `dir/dir/dir/log.testlog.2`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{}, `././log.testlog`, 10, 1, 2, []string{`log.testlog`, `log.testlog.1`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{`././././log.testlog.9`}, `log.testlog`, 10, 1, 2, []string{`log.testlog`, `log.testlog.10`}, rollingNameModePostfix),
-	createRollingSizeFileWriterTestCase([]string{"././dir/dir/log.testlog.a", "././dir/dir/log.testlog.1b"}, "dir/dir/log.testlog", 10, 1, 2, []string{"dir/dir/log.testlog", "dir/dir/log.testlog.1", "dir/dir/log.testlog.a", "dir/dir/log.testlog.1b"}, rollingNameModePostfix),
-	// ====================
-}
diff --git a/vendor/github.com/cihub/seelog/writers_smtpwriter.go b/vendor/github.com/cihub/seelog/writers_smtpwriter.go
deleted file mode 100644
index d9de60795..000000000
--- a/vendor/github.com/cihub/seelog/writers_smtpwriter.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright (c) 2012 - Cloud Instruments Co., 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:
-//
-// 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 seelog
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/smtp"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	// Default subject phrase for sending emails.
-	DefaultSubjectPhrase = "Diagnostic message from server: "
-
-	// Message subject pattern composed according to RFC 5321.
-	rfc5321SubjectPattern = "From: %s <%s>\nSubject: %s\n\n"
-)
-
-// smtpWriter is used to send emails via given SMTP-server.
-type smtpWriter struct {
-	auth               smtp.Auth
-	hostName           string
-	hostPort           string
-	hostNameWithPort   string
-	senderAddress      string
-	senderName         string
-	recipientAddresses []string
-	caCertDirPaths     []string
-	mailHeaders        []string
-	subject            string
-}
-
-// newSMTPWriter returns a new SMTP-writer.
-func newSMTPWriter(sa, sn string, ras []string, hn, hp, un, pwd string, cacdps []string, subj string, headers []string) *smtpWriter {
-	return &smtpWriter{
-		auth:               smtp.PlainAuth("", un, pwd, hn),
-		hostName:           hn,
-		hostPort:           hp,
-		hostNameWithPort:   fmt.Sprintf("%s:%s", hn, hp),
-		senderAddress:      sa,
-		senderName:         sn,
-		recipientAddresses: ras,
-		caCertDirPaths:     cacdps,
-		subject:            subj,
-		mailHeaders:        headers,
-	}
-}
-
-func prepareMessage(senderAddr, senderName, subject string, body []byte, headers []string) []byte {
-	headerLines := fmt.Sprintf(rfc5321SubjectPattern, senderName, senderAddr, subject)
-	// Build header lines if configured.
-	if headers != nil && len(headers) > 0 {
-		headerLines += strings.Join(headers, "\n")
-		headerLines += "\n"
-	}
-	return append([]byte(headerLines), body...)
-}
-
-// getTLSConfig gets paths of PEM files with certificates,
-// host server name and tries to create an appropriate TLS.Config.
-func getTLSConfig(pemFileDirPaths []string, hostName string) (config *tls.Config, err error) {
-	if pemFileDirPaths == nil || len(pemFileDirPaths) == 0 {
-		err = errors.New("invalid PEM file paths")
-		return
-	}
-	pemEncodedContent := []byte{}
-	var (
-		e     error
-		bytes []byte
-	)
-	// Create a file-filter-by-extension, set aside non-pem files.
-	pemFilePathFilter := func(fp string) bool {
-		if filepath.Ext(fp) == ".pem" {
-			return true
-		}
-		return false
-	}
-	for _, pemFileDirPath := range pemFileDirPaths {
-		pemFilePaths, err := getDirFilePaths(pemFileDirPath, pemFilePathFilter, false)
-		if err != nil {
-			return nil, err
-		}
-
-		// Put together all the PEM files to decode them as a whole byte slice.
-		for _, pfp := range pemFilePaths {
-			if bytes, e = ioutil.ReadFile(pfp); e == nil {
-				pemEncodedContent = append(pemEncodedContent, bytes...)
-			} else {
-				return nil, fmt.Errorf("cannot read file: %s: %s", pfp, e.Error())
-			}
-		}
-	}
-	config = &tls.Config{RootCAs: x509.NewCertPool(), ServerName: hostName}
-	isAppended := config.RootCAs.AppendCertsFromPEM(pemEncodedContent)
-	if !isAppended {
-		// Extract this into a separate error.
-		err = errors.New("invalid PEM content")
-		return
-	}
-	return
-}
-
-// SendMail accepts TLS configuration, connects to the server at addr,
-// switches to TLS if possible, authenticates with mechanism a if possible,
-// and then sends an email from address from, to addresses to, with message msg.
-func sendMailWithTLSConfig(config *tls.Config, addr string, a smtp.Auth, from string, to []string, msg []byte) error {
-	c, err := smtp.Dial(addr)
-	if err != nil {
-		return err
-	}
-	// Check if the server supports STARTTLS extension.
-	if ok, _ := c.Extension("STARTTLS"); ok {
-		if err = c.StartTLS(config); err != nil {
-			return err
-		}
-	}
-	// Check if the server supports AUTH extension and use given smtp.Auth.
-	if a != nil {
-		if isSupported, _ := c.Extension("AUTH"); isSupported {
-			if err = c.Auth(a); err != nil {
-				return err
-			}
-		}
-	}
-	// Portion of code from the official smtp.SendMail function,
-	// see http://golang.org/src/pkg/net/smtp/smtp.go.
-	if err = c.Mail(from); err != nil {
-		return err
-	}
-	for _, addr := range to {
-		if err = c.Rcpt(addr); err != nil {
-			return err
-		}
-	}
-	w, err := c.Data()
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(msg)
-	if err != nil {
-		return err
-	}
-	err = w.Close()
-	if err != nil {
-		return err
-	}
-	return c.Quit()
-}
-
-// Write pushes a text message properly composed according to RFC 5321
-// to a post server, which sends it to the recipients.
-func (smtpw *smtpWriter) Write(data []byte) (int, error) {
-	var err error
-
-	if smtpw.caCertDirPaths == nil {
-		err = smtp.SendMail(
-			smtpw.hostNameWithPort,
-			smtpw.auth,
-			smtpw.senderAddress,
-			smtpw.recipientAddresses,
-			prepareMessage(smtpw.senderAddress, smtpw.senderName, smtpw.subject, data, smtpw.mailHeaders),
-		)
-	} else {
-		config, e := getTLSConfig(smtpw.caCertDirPaths, smtpw.hostName)
-		if e != nil {
-			return 0, e
-		}
-		err = sendMailWithTLSConfig(
-			config,
-			smtpw.hostNameWithPort,
-			smtpw.auth,
-			smtpw.senderAddress,
-			smtpw.recipientAddresses,
-			prepareMessage(smtpw.senderAddress, smtpw.senderName, smtpw.subject, data, smtpw.mailHeaders),
-		)
-	}
-	if err != nil {
-		return 0, err
-	}
-	return len(data), nil
-}
-
-// Close closes down SMTP-connection.
-func (smtpw *smtpWriter) Close() error {
-	// Do nothing as Write method opens and closes connection automatically.
-	return nil
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/add_child.go b/vendor/github.com/coreos/go-etcd/etcd/add_child.go
deleted file mode 100644
index 7122be049..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/add_child.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package etcd
-
-// Add a new directory with a random etcd-generated key under the given path.
-func (c *Client) AddChildDir(key string, ttl uint64) (*Response, error) {
-	raw, err := c.post(key, "", ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// Add a new file with a random etcd-generated key under the given path.
-func (c *Client) AddChild(key string, value string, ttl uint64) (*Response, error) {
-	raw, err := c.post(key, value, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/add_child_test.go b/vendor/github.com/coreos/go-etcd/etcd/add_child_test.go
deleted file mode 100644
index 26223ff1c..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/add_child_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package etcd
-
-import "testing"
-
-func TestAddChild(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("fooDir", true)
-		c.Delete("nonexistentDir", true)
-	}()
-
-	c.CreateDir("fooDir", 5)
-
-	_, err := c.AddChild("fooDir", "v0", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = c.AddChild("fooDir", "v1", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.Get("fooDir", true, false)
-	// The child with v0 should proceed the child with v1 because it's added
-	// earlier, so it should have a lower key.
-	if !(len(resp.Node.Nodes) == 2 && (resp.Node.Nodes[0].Value == "v0" && resp.Node.Nodes[1].Value == "v1")) {
-		t.Fatalf("AddChild 1 failed.  There should be two chlidren whose values are v0 and v1, respectively."+
-			"  The response was: %#v", resp)
-	}
-
-	// Creating a child under a nonexistent directory should succeed.
-	// The directory should be created.
-	resp, err = c.AddChild("nonexistentDir", "foo", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddChildDir(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("fooDir", true)
-		c.Delete("nonexistentDir", true)
-	}()
-
-	c.CreateDir("fooDir", 5)
-
-	_, err := c.AddChildDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = c.AddChildDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resp, err := c.Get("fooDir", true, false)
-	// The child with v0 should proceed the child with v1 because it's added
-	// earlier, so it should have a lower key.
-	if !(len(resp.Node.Nodes) == 2 && (len(resp.Node.Nodes[0].Nodes) == 0 && len(resp.Node.Nodes[1].Nodes) == 0)) {
-		t.Fatalf("AddChildDir 1 failed.  There should be two chlidren whose values are v0 and v1, respectively."+
-			"  The response was: %#v", resp)
-	}
-
-	// Creating a child under a nonexistent directory should succeed.
-	// The directory should be created.
-	resp, err = c.AddChildDir("nonexistentDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/client.go b/vendor/github.com/coreos/go-etcd/etcd/client.go
deleted file mode 100644
index 7abcf11a2..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/client.go
+++ /dev/null
@@ -1,429 +0,0 @@
-package etcd
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"errors"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"time"
-)
-
-// See SetConsistency for how to use these constants.
-const (
-	// Using strings rather than iota because the consistency level
-	// could be persisted to disk, so it'd be better to use
-	// human-readable values.
-	STRONG_CONSISTENCY = "STRONG"
-	WEAK_CONSISTENCY   = "WEAK"
-)
-
-const (
-	defaultBufferSize = 10
-)
-
-type Config struct {
-	CertFile    string        `json:"certFile"`
-	KeyFile     string        `json:"keyFile"`
-	CaCertFile  []string      `json:"caCertFiles"`
-	Timeout     time.Duration `json:"timeout"`
-	Consistency string        `json: "consistency"`
-}
-
-type Client struct {
-	config      Config   `json:"config"`
-	cluster     *Cluster `json:"cluster"`
-	httpClient  *http.Client
-	persistence io.Writer
-	cURLch      chan string
-	// CheckRetry can be used to control the policy for failed requests
-	// and modify the cluster if needed.
-	// The client calls it before sending requests again, and
-	// stops retrying if CheckRetry returns some error. The cases that
-	// this function needs to handle include no response and unexpected
-	// http status code of response.
-	// If CheckRetry is nil, client will call the default one
-	// `DefaultCheckRetry`.
-	// Argument cluster is the etcd.Cluster object that these requests have been made on.
-	// Argument reqs is all of the http.Requests that have been made so far.
-	// Argument resps is all of the http.Responses from these requests.
-	// Argument err is the reason of the failure.
-	CheckRetry func(cluster *Cluster, reqs []http.Request,
-		resps []http.Response, err error) error
-}
-
-// NewClient create a basic client that is configured to be used
-// with the given machine list.
-func NewClient(machines []string) *Client {
-	config := Config{
-		// default timeout is one second
-		Timeout: time.Second,
-		// default consistency level is STRONG
-		Consistency: STRONG_CONSISTENCY,
-	}
-
-	client := &Client{
-		cluster: NewCluster(machines),
-		config:  config,
-	}
-
-	client.initHTTPClient()
-	client.saveConfig()
-
-	return client
-}
-
-// NewTLSClient create a basic client with TLS configuration
-func NewTLSClient(machines []string, cert, key, caCert string) (*Client, error) {
-	// overwrite the default machine to use https
-	if len(machines) == 0 {
-		machines = []string{"https://127.0.0.1:4001"}
-	}
-
-	config := Config{
-		// default timeout is one second
-		Timeout: time.Second,
-		// default consistency level is STRONG
-		Consistency: STRONG_CONSISTENCY,
-		CertFile:    cert,
-		KeyFile:     key,
-		CaCertFile:  make([]string, 0),
-	}
-
-	client := &Client{
-		cluster: NewCluster(machines),
-		config:  config,
-	}
-
-	err := client.initHTTPSClient(cert, key)
-	if err != nil {
-		return nil, err
-	}
-
-	err = client.AddRootCA(caCert)
-
-	client.saveConfig()
-
-	return client, nil
-}
-
-// NewClientFromFile creates a client from a given file path.
-// The given file is expected to use the JSON format.
-func NewClientFromFile(fpath string) (*Client, error) {
-	fi, err := os.Open(fpath)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err := fi.Close(); err != nil {
-			panic(err)
-		}
-	}()
-
-	return NewClientFromReader(fi)
-}
-
-// NewClientFromReader creates a Client configured from a given reader.
-// The configuration is expected to use the JSON format.
-func NewClientFromReader(reader io.Reader) (*Client, error) {
-	c := new(Client)
-
-	b, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(b, c)
-	if err != nil {
-		return nil, err
-	}
-	if c.config.CertFile == "" {
-		c.initHTTPClient()
-	} else {
-		err = c.initHTTPSClient(c.config.CertFile, c.config.KeyFile)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	for _, caCert := range c.config.CaCertFile {
-		if err := c.AddRootCA(caCert); err != nil {
-			return nil, err
-		}
-	}
-
-	return c, nil
-}
-
-// Override the Client's HTTP Transport object
-func (c *Client) SetTransport(tr *http.Transport) {
-	c.httpClient.Transport = tr
-}
-
-// initHTTPClient initializes a HTTP client for etcd client
-func (c *Client) initHTTPClient() {
-	tr := &http.Transport{
-		Dial: dialTimeout,
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-		},
-	}
-	c.httpClient = &http.Client{Transport: tr}
-}
-
-// initHTTPClient initializes a HTTPS client for etcd client
-func (c *Client) initHTTPSClient(cert, key string) error {
-	if cert == "" || key == "" {
-		return errors.New("Require both cert and key path")
-	}
-
-	tlsCert, err := tls.LoadX509KeyPair(cert, key)
-	if err != nil {
-		return err
-	}
-
-	tlsConfig := &tls.Config{
-		Certificates:       []tls.Certificate{tlsCert},
-		InsecureSkipVerify: true,
-	}
-
-	tr := &http.Transport{
-		TLSClientConfig: tlsConfig,
-		Dial:            dialTimeout,
-	}
-
-	c.httpClient = &http.Client{Transport: tr}
-	return nil
-}
-
-// SetPersistence sets a writer to which the config will be
-// written every time it's changed.
-func (c *Client) SetPersistence(writer io.Writer) {
-	c.persistence = writer
-}
-
-// SetConsistency changes the consistency level of the client.
-//
-// When consistency is set to STRONG_CONSISTENCY, all requests,
-// including GET, are sent to the leader.  This means that, assuming
-// the absence of leader failures, GET requests are guaranteed to see
-// the changes made by previous requests.
-//
-// When consistency is set to WEAK_CONSISTENCY, other requests
-// are still sent to the leader, but GET requests are sent to a
-// random server from the server pool.  This reduces the read
-// load on the leader, but it's not guaranteed that the GET requests
-// will see changes made by previous requests (they might have not
-// yet been committed on non-leader servers).
-func (c *Client) SetConsistency(consistency string) error {
-	if !(consistency == STRONG_CONSISTENCY || consistency == WEAK_CONSISTENCY) {
-		return errors.New("The argument must be either STRONG_CONSISTENCY or WEAK_CONSISTENCY.")
-	}
-	c.config.Consistency = consistency
-	return nil
-}
-
-// AddRootCA adds a root CA cert for the etcd client
-func (c *Client) AddRootCA(caCert string) error {
-	if c.httpClient == nil {
-		return errors.New("Client has not been initialized yet!")
-	}
-
-	certBytes, err := ioutil.ReadFile(caCert)
-	if err != nil {
-		return err
-	}
-
-	tr, ok := c.httpClient.Transport.(*http.Transport)
-
-	if !ok {
-		panic("AddRootCA(): Transport type assert should not fail")
-	}
-
-	if tr.TLSClientConfig.RootCAs == nil {
-		caCertPool := x509.NewCertPool()
-		ok = caCertPool.AppendCertsFromPEM(certBytes)
-		if ok {
-			tr.TLSClientConfig.RootCAs = caCertPool
-		}
-		tr.TLSClientConfig.InsecureSkipVerify = false
-	} else {
-		ok = tr.TLSClientConfig.RootCAs.AppendCertsFromPEM(certBytes)
-	}
-
-	if !ok {
-		err = errors.New("Unable to load caCert")
-	}
-
-	c.config.CaCertFile = append(c.config.CaCertFile, caCert)
-	c.saveConfig()
-
-	return err
-}
-
-// SetCluster updates cluster information using the given machine list.
-func (c *Client) SetCluster(machines []string) bool {
-	success := c.internalSyncCluster(machines)
-	return success
-}
-
-func (c *Client) GetCluster() []string {
-	return c.cluster.Machines
-}
-
-// SyncCluster updates the cluster information using the internal machine list.
-func (c *Client) SyncCluster() bool {
-	return c.internalSyncCluster(c.cluster.Machines)
-}
-
-// internalSyncCluster syncs cluster information using the given machine list.
-func (c *Client) internalSyncCluster(machines []string) bool {
-	for _, machine := range machines {
-		httpPath := c.createHttpPath(machine, path.Join(version, "machines"))
-		resp, err := c.httpClient.Get(httpPath)
-		if err != nil {
-			// try another machine in the cluster
-			continue
-		} else {
-			b, err := ioutil.ReadAll(resp.Body)
-			resp.Body.Close()
-			if err != nil {
-				// try another machine in the cluster
-				continue
-			}
-
-			// update Machines List
-			c.cluster.updateFromStr(string(b))
-
-			// update leader
-			// the first one in the machine list is the leader
-			c.cluster.switchLeader(0)
-
-			logger.Debug("sync.machines ", c.cluster.Machines)
-			c.saveConfig()
-			return true
-		}
-	}
-	return false
-}
-
-// createHttpPath creates a complete HTTP URL.
-// serverName should contain both the host name and a port number, if any.
-func (c *Client) createHttpPath(serverName string, _path string) string {
-	u, err := url.Parse(serverName)
-	if err != nil {
-		panic(err)
-	}
-
-	u.Path = path.Join(u.Path, _path)
-
-	if u.Scheme == "" {
-		u.Scheme = "http"
-	}
-	return u.String()
-}
-
-// Dial with timeout.
-func dialTimeout(network, addr string) (net.Conn, error) {
-	tcpAddr, err := net.ResolveTCPAddr(network, addr)
-	if err != nil {
-		return nil, err
-	}
-
-	tcpConn, err := net.DialTCP(network, nil, tcpAddr)
-	if err != nil {
-		return nil, err
-	}
-
-	// Keep TCP alive to check whether or not the remote machine is down
-	if err = tcpConn.SetKeepAlive(true); err != nil {
-		return nil, err
-	}
-
-	if err = tcpConn.SetKeepAlivePeriod(time.Second); err != nil {
-		return nil, err
-	}
-
-	return tcpConn, nil
-}
-
-func (c *Client) OpenCURL() {
-	c.cURLch = make(chan string, defaultBufferSize)
-}
-
-func (c *Client) CloseCURL() {
-	c.cURLch = nil
-}
-
-func (c *Client) sendCURL(command string) {
-	go func() {
-		select {
-		case c.cURLch <- command:
-		default:
-		}
-	}()
-}
-
-func (c *Client) RecvCURL() string {
-	return <-c.cURLch
-}
-
-// saveConfig saves the current config using c.persistence.
-func (c *Client) saveConfig() error {
-	if c.persistence != nil {
-		b, err := json.Marshal(c)
-		if err != nil {
-			return err
-		}
-
-		_, err = c.persistence.Write(b)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// MarshalJSON implements the Marshaller interface
-// as defined by the standard JSON package.
-func (c *Client) MarshalJSON() ([]byte, error) {
-	b, err := json.Marshal(struct {
-		Config  Config   `json:"config"`
-		Cluster *Cluster `json:"cluster"`
-	}{
-		Config:  c.config,
-		Cluster: c.cluster,
-	})
-
-	if err != nil {
-		return nil, err
-	}
-
-	return b, nil
-}
-
-// UnmarshalJSON implements the Unmarshaller interface
-// as defined by the standard JSON package.
-func (c *Client) UnmarshalJSON(b []byte) error {
-	temp := struct {
-		Config  Config   `json: "config"`
-		Cluster *Cluster `json: "cluster"`
-	}{}
-	err := json.Unmarshal(b, &temp)
-	if err != nil {
-		return err
-	}
-
-	c.cluster = temp.Cluster
-	c.config = temp.Config
-	return nil
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/client_test.go b/vendor/github.com/coreos/go-etcd/etcd/client_test.go
deleted file mode 100644
index c245e4798..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/client_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package etcd
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"testing"
-)
-
-// To pass this test, we need to create a cluster of 3 machines
-// The server should be listening on 127.0.0.1:4001, 4002, 4003
-func TestSync(t *testing.T) {
-	fmt.Println("Make sure there are three nodes at 0.0.0.0:4001-4003")
-
-	// Explicit trailing slash to ensure this doesn't reproduce:
-	// https://github.com/coreos/go-etcd/issues/82
-	c := NewClient([]string{"http://127.0.0.1:4001/"})
-
-	success := c.SyncCluster()
-	if !success {
-		t.Fatal("cannot sync machines")
-	}
-
-	for _, m := range c.GetCluster() {
-		u, err := url.Parse(m)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if u.Scheme != "http" {
-			t.Fatal("scheme must be http")
-		}
-
-		host, _, err := net.SplitHostPort(u.Host)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if host != "127.0.0.1" {
-			t.Fatal("Host must be 127.0.0.1")
-		}
-	}
-
-	badMachines := []string{"abc", "edef"}
-
-	success = c.SetCluster(badMachines)
-
-	if success {
-		t.Fatal("should not sync on bad machines")
-	}
-
-	goodMachines := []string{"127.0.0.1:4002"}
-
-	success = c.SetCluster(goodMachines)
-
-	if !success {
-		t.Fatal("cannot sync machines")
-	} else {
-		fmt.Println(c.cluster.Machines)
-	}
-
-}
-
-func TestPersistence(t *testing.T) {
-	c := NewClient(nil)
-	c.SyncCluster()
-
-	fo, err := os.Create("config.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := fo.Close(); err != nil {
-			panic(err)
-		}
-	}()
-
-	c.SetPersistence(fo)
-	err = c.saveConfig()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c2, err := NewClientFromFile("config.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify that the two clients have the same config
-	b1, _ := json.Marshal(c)
-	b2, _ := json.Marshal(c2)
-
-	if string(b1) != string(b2) {
-		t.Fatalf("The two configs should be equal!")
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/cluster.go b/vendor/github.com/coreos/go-etcd/etcd/cluster.go
deleted file mode 100644
index aaa20546e..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/cluster.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package etcd
-
-import (
-	"net/url"
-	"strings"
-)
-
-type Cluster struct {
-	Leader   string   `json:"leader"`
-	Machines []string `json:"machines"`
-}
-
-func NewCluster(machines []string) *Cluster {
-	// if an empty slice was sent in then just assume HTTP 4001 on localhost
-	if len(machines) == 0 {
-		machines = []string{"http://127.0.0.1:4001"}
-	}
-
-	// default leader and machines
-	return &Cluster{
-		Leader:   machines[0],
-		Machines: machines,
-	}
-}
-
-// switchLeader switch the current leader to machines[num]
-func (cl *Cluster) switchLeader(num int) {
-	logger.Debugf("switch.leader[from %v to %v]",
-		cl.Leader, cl.Machines[num])
-
-	cl.Leader = cl.Machines[num]
-}
-
-func (cl *Cluster) updateFromStr(machines string) {
-	cl.Machines = strings.Split(machines, ", ")
-}
-
-func (cl *Cluster) updateLeader(leader string) {
-	logger.Debugf("update.leader[%s,%s]", cl.Leader, leader)
-	cl.Leader = leader
-}
-
-func (cl *Cluster) updateLeaderFromURL(u *url.URL) {
-	var leader string
-	if u.Scheme == "" {
-		leader = "http://" + u.Host
-	} else {
-		leader = u.Scheme + "://" + u.Host
-	}
-	cl.updateLeader(leader)
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete.go
deleted file mode 100644
index 11131bb76..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package etcd
-
-import "fmt"
-
-func (c *Client) CompareAndDelete(key string, prevValue string, prevIndex uint64) (*Response, error) {
-	raw, err := c.RawCompareAndDelete(key, prevValue, prevIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-func (c *Client) RawCompareAndDelete(key string, prevValue string, prevIndex uint64) (*RawResponse, error) {
-	if prevValue == "" && prevIndex == 0 {
-		return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
-	}
-
-	options := Options{}
-	if prevValue != "" {
-		options["prevValue"] = prevValue
-	}
-	if prevIndex != 0 {
-		options["prevIndex"] = prevIndex
-	}
-
-	raw, err := c.delete(key, options)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw, err
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
deleted file mode 100644
index 223e50f29..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/compare_and_delete_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package etcd
-
-import (
-	"testing"
-)
-
-func TestCompareAndDelete(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	c.Set("foo", "bar", 5)
-
-	// This should succeed an correct prevValue
-	resp, err := c.CompareAndDelete("foo", "bar", 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-		t.Fatalf("CompareAndDelete 1 prevNode failed: %#v", resp)
-	}
-
-	resp, _ = c.Set("foo", "bar", 5)
-	// This should fail because it gives an incorrect prevValue
-	_, err = c.CompareAndDelete("foo", "xxx", 0)
-	if err == nil {
-		t.Fatalf("CompareAndDelete 2 should have failed.  The response is: %#v", resp)
-	}
-
-	// This should succeed because it gives an correct prevIndex
-	resp, err = c.CompareAndDelete("foo", "", resp.Node.ModifiedIndex)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-		t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
-	}
-
-	c.Set("foo", "bar", 5)
-	// This should fail because it gives an incorrect prevIndex
-	resp, err = c.CompareAndDelete("foo", "", 29817514)
-	if err == nil {
-		t.Fatalf("CompareAndDelete 4 should have failed.  The response is: %#v", resp)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap.go
deleted file mode 100644
index bb4f90643..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package etcd
-
-import "fmt"
-
-func (c *Client) CompareAndSwap(key string, value string, ttl uint64,
-	prevValue string, prevIndex uint64) (*Response, error) {
-	raw, err := c.RawCompareAndSwap(key, value, ttl, prevValue, prevIndex)
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-func (c *Client) RawCompareAndSwap(key string, value string, ttl uint64,
-	prevValue string, prevIndex uint64) (*RawResponse, error) {
-	if prevValue == "" && prevIndex == 0 {
-		return nil, fmt.Errorf("You must give either prevValue or prevIndex.")
-	}
-
-	options := Options{}
-	if prevValue != "" {
-		options["prevValue"] = prevValue
-	}
-	if prevIndex != 0 {
-		options["prevIndex"] = prevIndex
-	}
-
-	raw, err := c.put(key, value, ttl, options)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw, err
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go b/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
deleted file mode 100644
index 14a1b00f5..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/compare_and_swap_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package etcd
-
-import (
-	"testing"
-)
-
-func TestCompareAndSwap(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	c.Set("foo", "bar", 5)
-
-	// This should succeed
-	resp, err := c.CompareAndSwap("foo", "bar2", 5, "bar", 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-		t.Fatalf("CompareAndSwap 1 failed: %#v", resp)
-	}
-
-	if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-		t.Fatalf("CompareAndSwap 1 prevNode failed: %#v", resp)
-	}
-
-	// This should fail because it gives an incorrect prevValue
-	resp, err = c.CompareAndSwap("foo", "bar3", 5, "xxx", 0)
-	if err == nil {
-		t.Fatalf("CompareAndSwap 2 should have failed.  The response is: %#v", resp)
-	}
-
-	resp, err = c.Set("foo", "bar", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// This should succeed
-	resp, err = c.CompareAndSwap("foo", "bar2", 5, "", resp.Node.ModifiedIndex)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Value == "bar2" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-		t.Fatalf("CompareAndSwap 3 failed: %#v", resp)
-	}
-
-	if !(resp.PrevNode.Value == "bar" && resp.PrevNode.Key == "/foo" && resp.PrevNode.TTL == 5) {
-		t.Fatalf("CompareAndSwap 3 prevNode failed: %#v", resp)
-	}
-
-	// This should fail because it gives an incorrect prevIndex
-	resp, err = c.CompareAndSwap("foo", "bar3", 5, "", 29817514)
-	if err == nil {
-		t.Fatalf("CompareAndSwap 4 should have failed.  The response is: %#v", resp)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/config.json b/vendor/github.com/coreos/go-etcd/etcd/config.json
deleted file mode 100644
index 4d090a535..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/config.json
+++ /dev/null
@@ -1 +0,0 @@
-{"config":{"certFile":"","keyFile":"","scheme":"http","timeout":1000000000,"Consistency":"STRONG"},"cluster":{"leader":"http://127.0.0.1:4001","machines":["http://127.0.0.1:4001"]}}
\ No newline at end of file
diff --git a/vendor/github.com/coreos/go-etcd/etcd/debug.go b/vendor/github.com/coreos/go-etcd/etcd/debug.go
deleted file mode 100644
index d170547eb..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/debug.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package etcd
-
-import (
-	"io/ioutil"
-	"log"
-	"strings"
-)
-
-var logger *etcdLogger
-
-func SetLogger(l *log.Logger) {
-	logger = &etcdLogger{l}
-}
-
-func GetLogger() *log.Logger {
-	return logger.log
-}
-
-type etcdLogger struct {
-	log *log.Logger
-}
-
-func (p *etcdLogger) Debug(args ...interface{}) {
-	args[0] = "DEBUG: " + args[0].(string)
-	p.log.Println(args)
-}
-
-func (p *etcdLogger) Debugf(fmt string, args ...interface{}) {
-	args[0] = "DEBUG: " + args[0].(string)
-	// Append newline if necessary
-	if !strings.HasSuffix(fmt, "\n") {
-		fmt = fmt + "\n"
-	}
-	p.log.Printf(fmt, args)
-}
-
-func (p *etcdLogger) Warning(args ...interface{}) {
-	args[0] = "WARNING: " + args[0].(string)
-	p.log.Println(args)
-}
-
-func (p *etcdLogger) Warningf(fmt string, args ...interface{}) {
-	// Append newline if necessary
-	if !strings.HasSuffix(fmt, "\n") {
-		fmt = fmt + "\n"
-	}
-	args[0] = "WARNING: " + args[0].(string)
-	p.log.Printf(fmt, args)
-}
-
-func init() {
-	// Default logger uses the go default log.
-	SetLogger(log.New(ioutil.Discard, "go-etcd", log.LstdFlags))
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/delete.go b/vendor/github.com/coreos/go-etcd/etcd/delete.go
deleted file mode 100644
index b37accd7d..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/delete.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package etcd
-
-// Delete deletes the given key.
-//
-// When recursive set to false, if the key points to a
-// directory the method will fail.
-//
-// When recursive set to true, if the key points to a file,
-// the file will be deleted; if the key points to a directory,
-// then everything under the directory (including all child directories)
-// will be deleted.
-func (c *Client) Delete(key string, recursive bool) (*Response, error) {
-	raw, err := c.RawDelete(key, recursive, false)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// DeleteDir deletes an empty directory or a key value pair
-func (c *Client) DeleteDir(key string) (*Response, error) {
-	raw, err := c.RawDelete(key, false, true)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-func (c *Client) RawDelete(key string, recursive bool, dir bool) (*RawResponse, error) {
-	ops := Options{
-		"recursive": recursive,
-		"dir":       dir,
-	}
-
-	return c.delete(key, ops)
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/delete_test.go b/vendor/github.com/coreos/go-etcd/etcd/delete_test.go
deleted file mode 100644
index 590497155..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/delete_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package etcd
-
-import (
-	"testing"
-)
-
-func TestDelete(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	c.Set("foo", "bar", 5)
-	resp, err := c.Delete("foo", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Node.Value == "") {
-		t.Fatalf("Delete failed with %s", resp.Node.Value)
-	}
-
-	if !(resp.PrevNode.Value == "bar") {
-		t.Fatalf("Delete PrevNode failed with %s", resp.Node.Value)
-	}
-
-	resp, err = c.Delete("foo", false)
-	if err == nil {
-		t.Fatalf("Delete should have failed because the key foo did not exist.  "+
-			"The response was: %v", resp)
-	}
-}
-
-func TestDeleteAll(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-		c.Delete("fooDir", true)
-	}()
-
-	c.SetDir("foo", 5)
-	// test delete an empty dir
-	resp, err := c.DeleteDir("foo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Node.Value == "") {
-		t.Fatalf("DeleteAll 1 failed: %#v", resp)
-	}
-
-	if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
-		t.Fatalf("DeleteAll 1 PrevNode failed: %#v", resp)
-	}
-
-	c.CreateDir("fooDir", 5)
-	c.Set("fooDir/foo", "bar", 5)
-	_, err = c.DeleteDir("fooDir")
-	if err == nil {
-		t.Fatal("should not able to delete a non-empty dir with deletedir")
-	}
-
-	resp, err = c.Delete("fooDir", true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Node.Value == "") {
-		t.Fatalf("DeleteAll 2 failed: %#v", resp)
-	}
-
-	if !(resp.PrevNode.Dir == true && resp.PrevNode.Value == "") {
-		t.Fatalf("DeleteAll 2 PrevNode failed: %#v", resp)
-	}
-
-	resp, err = c.Delete("foo", true)
-	if err == nil {
-		t.Fatalf("DeleteAll should have failed because the key foo did not exist.  "+
-			"The response was: %v", resp)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/error.go b/vendor/github.com/coreos/go-etcd/etcd/error.go
deleted file mode 100644
index 7e6928724..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/error.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package etcd
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-const (
-	ErrCodeEtcdNotReachable = 501
-)
-
-var (
-	errorMap = map[int]string{
-		ErrCodeEtcdNotReachable: "All the given peers are not reachable",
-	}
-)
-
-type EtcdError struct {
-	ErrorCode int    `json:"errorCode"`
-	Message   string `json:"message"`
-	Cause     string `json:"cause,omitempty"`
-	Index     uint64 `json:"index"`
-}
-
-func (e EtcdError) Error() string {
-	return fmt.Sprintf("%v: %v (%v) [%v]", e.ErrorCode, e.Message, e.Cause, e.Index)
-}
-
-func newError(errorCode int, cause string, index uint64) *EtcdError {
-	return &EtcdError{
-		ErrorCode: errorCode,
-		Message:   errorMap[errorCode],
-		Cause:     cause,
-		Index:     index,
-	}
-}
-
-func handleError(b []byte) error {
-	etcdErr := new(EtcdError)
-
-	err := json.Unmarshal(b, etcdErr)
-	if err != nil {
-		logger.Warningf("cannot unmarshal etcd error: %v", err)
-		return err
-	}
-
-	return etcdErr
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/get.go b/vendor/github.com/coreos/go-etcd/etcd/get.go
deleted file mode 100644
index 976bf07fd..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/get.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package etcd
-
-// Get gets the file or directory associated with the given key.
-// If the key points to a directory, files and directories under
-// it will be returned in sorted or unsorted order, depending on
-// the sort flag.
-// If recursive is set to false, contents under child directories
-// will not be returned.
-// If recursive is set to true, all the contents will be returned.
-func (c *Client) Get(key string, sort, recursive bool) (*Response, error) {
-	raw, err := c.RawGet(key, sort, recursive)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-func (c *Client) RawGet(key string, sort, recursive bool) (*RawResponse, error) {
-	ops := Options{
-		"recursive": recursive,
-		"sorted":    sort,
-	}
-
-	return c.get(key, ops)
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/get_test.go b/vendor/github.com/coreos/go-etcd/etcd/get_test.go
deleted file mode 100644
index eccae1894..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/get_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package etcd
-
-import (
-	"reflect"
-	"testing"
-)
-
-// cleanNode scrubs Expiration, ModifiedIndex and CreatedIndex of a node.
-func cleanNode(n *Node) {
-	n.Expiration = nil
-	n.ModifiedIndex = 0
-	n.CreatedIndex = 0
-}
-
-// cleanResult scrubs a result object two levels deep of Expiration,
-// ModifiedIndex and CreatedIndex.
-func cleanResult(result *Response) {
-	//  TODO(philips): make this recursive.
-	cleanNode(result.Node)
-	for i, _ := range result.Node.Nodes {
-		cleanNode(&result.Node.Nodes[i])
-		for j, _ := range result.Node.Nodes[i].Nodes {
-			cleanNode(&result.Node.Nodes[i].Nodes[j])
-		}
-	}
-}
-
-func TestGet(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	c.Set("foo", "bar", 5)
-
-	result, err := c.Get("foo", false, false)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if result.Node.Key != "/foo" || result.Node.Value != "bar" {
-		t.Fatalf("Get failed with %s %s %v", result.Node.Key, result.Node.Value, result.Node.TTL)
-	}
-
-	result, err = c.Get("goo", false, false)
-	if err == nil {
-		t.Fatalf("should not be able to get non-exist key")
-	}
-}
-
-func TestGetAll(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("fooDir", true)
-	}()
-
-	c.CreateDir("fooDir", 5)
-	c.Set("fooDir/k0", "v0", 5)
-	c.Set("fooDir/k1", "v1", 5)
-
-	// Return kv-pairs in sorted order
-	result, err := c.Get("fooDir", true, false)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := Nodes{
-		Node{
-			Key:   "/fooDir/k0",
-			Value: "v0",
-			TTL:   5,
-		},
-		Node{
-			Key:   "/fooDir/k1",
-			Value: "v1",
-			TTL:   5,
-		},
-	}
-
-	cleanResult(result)
-
-	if !reflect.DeepEqual(result.Node.Nodes, expected) {
-		t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
-	}
-
-	// Test the `recursive` option
-	c.CreateDir("fooDir/childDir", 5)
-	c.Set("fooDir/childDir/k2", "v2", 5)
-
-	// Return kv-pairs in sorted order
-	result, err = c.Get("fooDir", true, true)
-
-	cleanResult(result)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected = Nodes{
-		Node{
-			Key: "/fooDir/childDir",
-			Dir: true,
-			Nodes: Nodes{
-				Node{
-					Key:   "/fooDir/childDir/k2",
-					Value: "v2",
-					TTL:   5,
-				},
-			},
-			TTL: 5,
-		},
-		Node{
-			Key:   "/fooDir/k0",
-			Value: "v0",
-			TTL:   5,
-		},
-		Node{
-			Key:   "/fooDir/k1",
-			Value: "v1",
-			TTL:   5,
-		},
-	}
-
-	cleanResult(result)
-
-	if !reflect.DeepEqual(result.Node.Nodes, expected) {
-		t.Fatalf("(actual) %v != (expected) %v", result.Node.Nodes, expected)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/options.go b/vendor/github.com/coreos/go-etcd/etcd/options.go
deleted file mode 100644
index 701c9b35b..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/options.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package etcd
-
-import (
-	"fmt"
-	"net/url"
-	"reflect"
-)
-
-type Options map[string]interface{}
-
-// An internally-used data structure that represents a mapping
-// between valid options and their kinds
-type validOptions map[string]reflect.Kind
-
-// Valid options for GET, PUT, POST, DELETE
-// Using CAPITALIZED_UNDERSCORE to emphasize that these
-// values are meant to be used as constants.
-var (
-	VALID_GET_OPTIONS = validOptions{
-		"recursive":  reflect.Bool,
-		"consistent": reflect.Bool,
-		"sorted":     reflect.Bool,
-		"wait":       reflect.Bool,
-		"waitIndex":  reflect.Uint64,
-	}
-
-	VALID_PUT_OPTIONS = validOptions{
-		"prevValue": reflect.String,
-		"prevIndex": reflect.Uint64,
-		"prevExist": reflect.Bool,
-		"dir":       reflect.Bool,
-	}
-
-	VALID_POST_OPTIONS = validOptions{}
-
-	VALID_DELETE_OPTIONS = validOptions{
-		"recursive": reflect.Bool,
-		"dir":       reflect.Bool,
-		"prevValue": reflect.String,
-		"prevIndex": reflect.Uint64,
-	}
-)
-
-// Convert options to a string of HTML parameters
-func (ops Options) toParameters(validOps validOptions) (string, error) {
-	p := "?"
-	values := url.Values{}
-
-	if ops == nil {
-		return "", nil
-	}
-
-	for k, v := range ops {
-		// Check if the given option is valid (that it exists)
-		kind := validOps[k]
-		if kind == reflect.Invalid {
-			return "", fmt.Errorf("Invalid option: %v", k)
-		}
-
-		// Check if the given option is of the valid type
-		t := reflect.TypeOf(v)
-		if kind != t.Kind() {
-			return "", fmt.Errorf("Option %s should be of %v kind, not of %v kind.",
-				k, kind, t.Kind())
-		}
-
-		values.Set(k, fmt.Sprintf("%v", v))
-	}
-
-	p += values.Encode()
-	return p, nil
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/requests.go b/vendor/github.com/coreos/go-etcd/etcd/requests.go
deleted file mode 100644
index ab71925d3..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/requests.go
+++ /dev/null
@@ -1,361 +0,0 @@
-package etcd
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"net/url"
-	"path"
-	"strings"
-	"sync"
-	"time"
-)
-
-// Errors introduced by handling requests
-var (
-	ErrRequestCancelled = errors.New("sending request is cancelled")
-)
-
-type RawRequest struct {
-	Method       string
-	RelativePath string
-	Values       url.Values
-	Cancel       <-chan bool
-}
-
-// NewRawRequest returns a new RawRequest
-func NewRawRequest(method, relativePath string, values url.Values, cancel <-chan bool) *RawRequest {
-	return &RawRequest{
-		Method:       method,
-		RelativePath: relativePath,
-		Values:       values,
-		Cancel:       cancel,
-	}
-}
-
-// getCancelable issues a cancelable GET request
-func (c *Client) getCancelable(key string, options Options,
-	cancel <-chan bool) (*RawResponse, error) {
-	logger.Debugf("get %s [%s]", key, c.cluster.Leader)
-	p := keyToPath(key)
-
-	// If consistency level is set to STRONG, append
-	// the `consistent` query string.
-	if c.config.Consistency == STRONG_CONSISTENCY {
-		options["consistent"] = true
-	}
-
-	str, err := options.toParameters(VALID_GET_OPTIONS)
-	if err != nil {
-		return nil, err
-	}
-	p += str
-
-	req := NewRawRequest("GET", p, nil, cancel)
-	resp, err := c.SendRequest(req)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}
-
-// get issues a GET request
-func (c *Client) get(key string, options Options) (*RawResponse, error) {
-	return c.getCancelable(key, options, nil)
-}
-
-// put issues a PUT request
-func (c *Client) put(key string, value string, ttl uint64,
-	options Options) (*RawResponse, error) {
-
-	logger.Debugf("put %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
-	p := keyToPath(key)
-
-	str, err := options.toParameters(VALID_PUT_OPTIONS)
-	if err != nil {
-		return nil, err
-	}
-	p += str
-
-	req := NewRawRequest("PUT", p, buildValues(value, ttl), nil)
-	resp, err := c.SendRequest(req)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}
-
-// post issues a POST request
-func (c *Client) post(key string, value string, ttl uint64) (*RawResponse, error) {
-	logger.Debugf("post %s, %s, ttl: %d, [%s]", key, value, ttl, c.cluster.Leader)
-	p := keyToPath(key)
-
-	req := NewRawRequest("POST", p, buildValues(value, ttl), nil)
-	resp, err := c.SendRequest(req)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}
-
-// delete issues a DELETE request
-func (c *Client) delete(key string, options Options) (*RawResponse, error) {
-	logger.Debugf("delete %s [%s]", key, c.cluster.Leader)
-	p := keyToPath(key)
-
-	str, err := options.toParameters(VALID_DELETE_OPTIONS)
-	if err != nil {
-		return nil, err
-	}
-	p += str
-
-	req := NewRawRequest("DELETE", p, nil, nil)
-	resp, err := c.SendRequest(req)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return resp, nil
-}
-
-// SendRequest sends a HTTP request and returns a Response as defined by etcd
-func (c *Client) SendRequest(rr *RawRequest) (*RawResponse, error) {
-
-	var req *http.Request
-	var resp *http.Response
-	var httpPath string
-	var err error
-	var respBody []byte
-
-	reqs := make([]http.Request, 0)
-	resps := make([]http.Response, 0)
-
-	checkRetry := c.CheckRetry
-	if checkRetry == nil {
-		checkRetry = DefaultCheckRetry
-	}
-
-	cancelled := make(chan bool, 1)
-	reqLock := new(sync.Mutex)
-
-	if rr.Cancel != nil {
-		cancelRoutine := make(chan bool)
-		defer close(cancelRoutine)
-
-		go func() {
-			select {
-			case <-rr.Cancel:
-				cancelled <-true
-				logger.Debug("send.request is cancelled")
-			case <-cancelRoutine:
-				return
-			}
-
-			// Repeat canceling request until this thread is stopped
-			// because we have no idea about whether it succeeds.
-			for {
-				reqLock.Lock()
-				c.httpClient.Transport.(*http.Transport).CancelRequest(req)
-				reqLock.Unlock()
-
-				select {
-				case <-time.After(100 * time.Millisecond):
-				case <-cancelRoutine:
-					return
-				}
-			}
-		}()
-	}
-
-	// if we connect to a follower, we will retry until we find a leader
-	for attempt := 0; ; attempt++ {
-		select {
-		case <-cancelled:
-			return nil, ErrRequestCancelled
-		default:
-		}
-
-		logger.Debug("begin attempt", attempt, "for", rr.RelativePath)
-
-		if rr.Method == "GET" && c.config.Consistency == WEAK_CONSISTENCY {
-			// If it's a GET and consistency level is set to WEAK,
-			// then use a random machine.
-			httpPath = c.getHttpPath(true, rr.RelativePath)
-		} else {
-			// Else use the leader.
-			httpPath = c.getHttpPath(false, rr.RelativePath)
-		}
-
-		// Return a cURL command if curlChan is set
-		if c.cURLch != nil {
-			command := fmt.Sprintf("curl -X %s %s", rr.Method, httpPath)
-			for key, value := range rr.Values {
-				command += fmt.Sprintf(" -d %s=%s", key, value[0])
-			}
-			c.sendCURL(command)
-		}
-
-		logger.Debug("send.request.to ", httpPath, " | method ", rr.Method)
-
-		reqLock.Lock()
-		if rr.Values == nil {
-			req, _ = http.NewRequest(rr.Method, httpPath, nil)
-		} else {
-			req, _ = http.NewRequest(rr.Method, httpPath,
-				strings.NewReader(rr.Values.Encode()))
-
-			req.Header.Set("Content-Type",
-				"application/x-www-form-urlencoded; param=value")
-		}
-		reqLock.Unlock()
-
-		resp, err = c.httpClient.Do(req)
-		// If the request was cancelled, return ErrRequestCancelled directly
-		select {
-		case <-cancelled:
-			return nil, ErrRequestCancelled
-		default:
-		}
-
-		reqs = append(reqs, *req)
-
-		// network error, change a machine!
-		if err != nil {
-			logger.Debug("network error:", err.Error())
-			resps = append(resps, http.Response{})
-			if checkErr := checkRetry(c.cluster, reqs, resps, err); checkErr != nil {
-				return nil, checkErr
-			}
-
-			c.cluster.switchLeader(attempt % len(c.cluster.Machines))
-			continue
-		}
-
-		// if there is no error, it should receive response
-		resps = append(resps, *resp)
-		defer resp.Body.Close()
-		logger.Debug("recv.response.from", httpPath)
-
-		if validHttpStatusCode[resp.StatusCode] {
-			// try to read byte code and break the loop
-			respBody, err = ioutil.ReadAll(resp.Body)
-			if err == nil {
-				logger.Debug("recv.success.", httpPath)
-				break
-			}
-		}
-
-		// if resp is TemporaryRedirect, set the new leader and retry
-		if resp.StatusCode == http.StatusTemporaryRedirect {
-			u, err := resp.Location()
-
-			if err != nil {
-				logger.Warning(err)
-			} else {
-				// Update cluster leader based on redirect location
-				// because it should point to the leader address
-				c.cluster.updateLeaderFromURL(u)
-				logger.Debug("recv.response.relocate", u.String())
-			}
-			continue
-		}
-
-		if checkErr := checkRetry(c.cluster, reqs, resps,
-			errors.New("Unexpected HTTP status code")); checkErr != nil {
-			return nil, checkErr
-		}
-	}
-
-	r := &RawResponse{
-		StatusCode: resp.StatusCode,
-		Body:       respBody,
-		Header:     resp.Header,
-	}
-
-	return r, nil
-}
-
-// DefaultCheckRetry checks retry cases
-// If it has retried 2 * machine number, stop to retry it anymore
-// If resp is nil, sleep for 200ms
-// If status code is InternalServerError, sleep for 200ms.
-func DefaultCheckRetry(cluster *Cluster, reqs []http.Request,
-	resps []http.Response, err error) error {
-
-	if len(reqs) >= 2*len(cluster.Machines) {
-		return newError(ErrCodeEtcdNotReachable,
-			"Tried to connect to each peer twice and failed", 0)
-	}
-
-	resp := &resps[len(resps)-1]
-
-	if resp == nil {
-		time.Sleep(time.Millisecond * 200)
-		return nil
-	}
-
-	code := resp.StatusCode
-	if code == http.StatusInternalServerError {
-		time.Sleep(time.Millisecond * 200)
-
-	}
-
-	logger.Warning("bad response status code", code)
-	return nil
-}
-
-func (c *Client) getHttpPath(random bool, s ...string) string {
-	var machine string
-	if random {
-		machine = c.cluster.Machines[rand.Intn(len(c.cluster.Machines))]
-	} else {
-		machine = c.cluster.Leader
-	}
-
-	fullPath := machine + "/" + version
-	for _, seg := range s {
-		fullPath = fullPath + "/" + seg
-	}
-
-	return fullPath
-}
-
-// buildValues builds a url.Values map according to the given value and ttl
-func buildValues(value string, ttl uint64) url.Values {
-	v := url.Values{}
-
-	if value != "" {
-		v.Set("value", value)
-	}
-
-	if ttl > 0 {
-		v.Set("ttl", fmt.Sprintf("%v", ttl))
-	}
-
-	return v
-}
-
-// convert key string to http path exclude version
-// for example: key[foo] -> path[keys/foo]
-// key[/] -> path[keys/]
-func keyToPath(key string) string {
-	p := path.Join("keys", key)
-
-	// corner case: if key is "/" or "//" ect
-	// path join will clear the tailing "/"
-	// we need to add it back
-	if p == "keys" {
-		p = "keys/"
-	}
-
-	return p
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/response.go b/vendor/github.com/coreos/go-etcd/etcd/response.go
deleted file mode 100644
index fbd7da43a..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/response.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package etcd
-
-import (
-	"encoding/json"
-	"net/http"
-	"strconv"
-	"time"
-)
-
-const (
-	rawResponse = iota
-	normalResponse
-)
-
-type responseType int
-
-type RawResponse struct {
-	StatusCode int
-	Body       []byte
-	Header     http.Header
-}
-
-var (
-	validHttpStatusCode = map[int]bool{
-		http.StatusCreated:            true,
-		http.StatusOK:                 true,
-		http.StatusBadRequest:         true,
-		http.StatusNotFound:           true,
-		http.StatusPreconditionFailed: true,
-		http.StatusForbidden:          true,
-	}
-)
-
-// Unmarshal parses RawResponse and stores the result in Response
-func (rr *RawResponse) Unmarshal() (*Response, error) {
-	if rr.StatusCode != http.StatusOK && rr.StatusCode != http.StatusCreated {
-		return nil, handleError(rr.Body)
-	}
-
-	resp := new(Response)
-
-	err := json.Unmarshal(rr.Body, resp)
-
-	if err != nil {
-		return nil, err
-	}
-
-	// attach index and term to response
-	resp.EtcdIndex, _ = strconv.ParseUint(rr.Header.Get("X-Etcd-Index"), 10, 64)
-	resp.RaftIndex, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Index"), 10, 64)
-	resp.RaftTerm, _ = strconv.ParseUint(rr.Header.Get("X-Raft-Term"), 10, 64)
-
-	return resp, nil
-}
-
-type Response struct {
-	Action    string `json:"action"`
-	Node      *Node  `json:"node"`
-	PrevNode  *Node  `json:"prevNode,omitempty"`
-	EtcdIndex uint64 `json:"etcdIndex"`
-	RaftIndex uint64 `json:"raftIndex"`
-	RaftTerm  uint64 `json:"raftTerm"`
-}
-
-type Node struct {
-	Key           string     `json:"key, omitempty"`
-	Value         string     `json:"value,omitempty"`
-	Dir           bool       `json:"dir,omitempty"`
-	Expiration    *time.Time `json:"expiration,omitempty"`
-	TTL           int64      `json:"ttl,omitempty"`
-	Nodes         Nodes      `json:"nodes,omitempty"`
-	ModifiedIndex uint64     `json:"modifiedIndex,omitempty"`
-	CreatedIndex  uint64     `json:"createdIndex,omitempty"`
-}
-
-type Nodes []Node
-
-// interfaces for sorting
-func (ns Nodes) Len() int {
-	return len(ns)
-}
-
-func (ns Nodes) Less(i, j int) bool {
-	return ns[i].Key < ns[j].Key
-}
-
-func (ns Nodes) Swap(i, j int) {
-	ns[i], ns[j] = ns[j], ns[i]
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go b/vendor/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
deleted file mode 100644
index 756e31781..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/set_curl_chan_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package etcd
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestSetCurlChan(t *testing.T) {
-	c := NewClient(nil)
-	c.OpenCURL()
-
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	_, err := c.Set("foo", "bar", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := fmt.Sprintf("curl -X PUT %s/v2/keys/foo -d value=bar -d ttl=5",
-		c.cluster.Leader)
-	actual := c.RecvCURL()
-	if expected != actual {
-		t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
-			actual, expected)
-	}
-
-	c.SetConsistency(STRONG_CONSISTENCY)
-	_, err = c.Get("foo", false, false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected = fmt.Sprintf("curl -X GET %s/v2/keys/foo?consistent=true&recursive=false&sorted=false",
-		c.cluster.Leader)
-	actual = c.RecvCURL()
-	if expected != actual {
-		t.Fatalf(`Command "%s" is not equal to expected value "%s"`,
-			actual, expected)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/set_update_create.go b/vendor/github.com/coreos/go-etcd/etcd/set_update_create.go
deleted file mode 100644
index cb0d56747..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/set_update_create.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package etcd
-
-// Set sets the given key to the given value.
-// It will create a new key value pair or replace the old one.
-// It will not replace a existing directory.
-func (c *Client) Set(key string, value string, ttl uint64) (*Response, error) {
-	raw, err := c.RawSet(key, value, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// Set sets the given key to a directory.
-// It will create a new directory or replace the old key value pair by a directory.
-// It will not replace a existing directory.
-func (c *Client) SetDir(key string, ttl uint64) (*Response, error) {
-	raw, err := c.RawSetDir(key, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// CreateDir creates a directory. It succeeds only if
-// the given key does not yet exist.
-func (c *Client) CreateDir(key string, ttl uint64) (*Response, error) {
-	raw, err := c.RawCreateDir(key, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// UpdateDir updates the given directory. It succeeds only if the
-// given key already exists.
-func (c *Client) UpdateDir(key string, ttl uint64) (*Response, error) {
-	raw, err := c.RawUpdateDir(key, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// Create creates a file with the given value under the given key.  It succeeds
-// only if the given key does not yet exist.
-func (c *Client) Create(key string, value string, ttl uint64) (*Response, error) {
-	raw, err := c.RawCreate(key, value, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// CreateInOrder creates a file with a key that's guaranteed to be higher than other
-// keys in the given directory. It is useful for creating queues.
-func (c *Client) CreateInOrder(dir string, value string, ttl uint64) (*Response, error) {
-	raw, err := c.RawCreateInOrder(dir, value, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-// Update updates the given key to the given value.  It succeeds only if the
-// given key already exists.
-func (c *Client) Update(key string, value string, ttl uint64) (*Response, error) {
-	raw, err := c.RawUpdate(key, value, ttl)
-
-	if err != nil {
-		return nil, err
-	}
-
-	return raw.Unmarshal()
-}
-
-func (c *Client) RawUpdateDir(key string, ttl uint64) (*RawResponse, error) {
-	ops := Options{
-		"prevExist": true,
-		"dir":       true,
-	}
-
-	return c.put(key, "", ttl, ops)
-}
-
-func (c *Client) RawCreateDir(key string, ttl uint64) (*RawResponse, error) {
-	ops := Options{
-		"prevExist": false,
-		"dir":       true,
-	}
-
-	return c.put(key, "", ttl, ops)
-}
-
-func (c *Client) RawSet(key string, value string, ttl uint64) (*RawResponse, error) {
-	return c.put(key, value, ttl, nil)
-}
-
-func (c *Client) RawSetDir(key string, ttl uint64) (*RawResponse, error) {
-	ops := Options{
-		"dir": true,
-	}
-
-	return c.put(key, "", ttl, ops)
-}
-
-func (c *Client) RawUpdate(key string, value string, ttl uint64) (*RawResponse, error) {
-	ops := Options{
-		"prevExist": true,
-	}
-
-	return c.put(key, value, ttl, ops)
-}
-
-func (c *Client) RawCreate(key string, value string, ttl uint64) (*RawResponse, error) {
-	ops := Options{
-		"prevExist": false,
-	}
-
-	return c.put(key, value, ttl, ops)
-}
-
-func (c *Client) RawCreateInOrder(dir string, value string, ttl uint64) (*RawResponse, error) {
-	return c.post(dir, value, ttl)
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/set_update_create_test.go b/vendor/github.com/coreos/go-etcd/etcd/set_update_create_test.go
deleted file mode 100644
index ced0f06e7..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/set_update_create_test.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package etcd
-
-import (
-	"testing"
-)
-
-func TestSet(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-	}()
-
-	resp, err := c.Set("foo", "bar", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp.Node.Key != "/foo" || resp.Node.Value != "bar" || resp.Node.TTL != 5 {
-		t.Fatalf("Set 1 failed: %#v", resp)
-	}
-	if resp.PrevNode != nil {
-		t.Fatalf("Set 1 PrevNode failed: %#v", resp)
-	}
-
-	resp, err = c.Set("foo", "bar2", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/foo" && resp.Node.Value == "bar2" && resp.Node.TTL == 5) {
-		t.Fatalf("Set 2 failed: %#v", resp)
-	}
-	if resp.PrevNode.Key != "/foo" || resp.PrevNode.Value != "bar" || resp.Node.TTL != 5 {
-		t.Fatalf("Set 2 PrevNode failed: %#v", resp)
-	}
-}
-
-func TestUpdate(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-		c.Delete("nonexistent", true)
-	}()
-
-	resp, err := c.Set("foo", "bar", 5)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// This should succeed.
-	resp, err = c.Update("foo", "wakawaka", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "update" && resp.Node.Key == "/foo" && resp.Node.TTL == 5) {
-		t.Fatalf("Update 1 failed: %#v", resp)
-	}
-	if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.Node.TTL == 5) {
-		t.Fatalf("Update 1 prevValue failed: %#v", resp)
-	}
-
-	// This should fail because the key does not exist.
-	resp, err = c.Update("nonexistent", "whatever", 5)
-	if err == nil {
-		t.Fatalf("The key %v did not exist, so the update should have failed."+
-			"The response was: %#v", resp.Node.Key, resp)
-	}
-}
-
-func TestCreate(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("newKey", true)
-	}()
-
-	newKey := "/newKey"
-	newValue := "/newValue"
-
-	// This should succeed
-	resp, err := c.Create(newKey, newValue, 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "create" && resp.Node.Key == newKey &&
-		resp.Node.Value == newValue && resp.Node.TTL == 5) {
-		t.Fatalf("Create 1 failed: %#v", resp)
-	}
-	if resp.PrevNode != nil {
-		t.Fatalf("Create 1 PrevNode failed: %#v", resp)
-	}
-
-	// This should fail, because the key is already there
-	resp, err = c.Create(newKey, newValue, 5)
-	if err == nil {
-		t.Fatalf("The key %v did exist, so the creation should have failed."+
-			"The response was: %#v", resp.Node.Key, resp)
-	}
-}
-
-func TestCreateInOrder(t *testing.T) {
-	c := NewClient(nil)
-	dir := "/queue"
-	defer func() {
-		c.DeleteDir(dir)
-	}()
-
-	var firstKey, secondKey string
-
-	resp, err := c.CreateInOrder(dir, "1", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "create" && resp.Node.Value == "1" && resp.Node.TTL == 5) {
-		t.Fatalf("Create 1 failed: %#v", resp)
-	}
-
-	firstKey = resp.Node.Key
-
-	resp, err = c.CreateInOrder(dir, "2", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "create" && resp.Node.Value == "2" && resp.Node.TTL == 5) {
-		t.Fatalf("Create 2 failed: %#v", resp)
-	}
-
-	secondKey = resp.Node.Key
-
-	if firstKey >= secondKey {
-		t.Fatalf("Expected first key to be greater than second key, but %s is not greater than %s",
-			firstKey, secondKey)
-	}
-}
-
-func TestSetDir(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("foo", true)
-		c.Delete("fooDir", true)
-	}()
-
-	resp, err := c.CreateDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/fooDir" && resp.Node.Value == "" && resp.Node.TTL == 5) {
-		t.Fatalf("SetDir 1 failed: %#v", resp)
-	}
-	if resp.PrevNode != nil {
-		t.Fatalf("SetDir 1 PrevNode failed: %#v", resp)
-	}
-
-	// This should fail because /fooDir already points to a directory
-	resp, err = c.CreateDir("/fooDir", 5)
-	if err == nil {
-		t.Fatalf("fooDir already points to a directory, so SetDir should have failed."+
-			"The response was: %#v", resp)
-	}
-
-	_, err = c.Set("foo", "bar", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// This should succeed
-	// It should replace the key
-	resp, err = c.SetDir("foo", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/foo" && resp.Node.Value == "" && resp.Node.TTL == 5) {
-		t.Fatalf("SetDir 2 failed: %#v", resp)
-	}
-	if !(resp.PrevNode.Key == "/foo" && resp.PrevNode.Value == "bar" && resp.PrevNode.TTL == 5) {
-		t.Fatalf("SetDir 2 failed: %#v", resp)
-	}
-}
-
-func TestUpdateDir(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("fooDir", true)
-	}()
-
-	resp, err := c.CreateDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// This should succeed.
-	resp, err = c.UpdateDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "update" && resp.Node.Key == "/fooDir" &&
-		resp.Node.Value == "" && resp.Node.TTL == 5) {
-		t.Fatalf("UpdateDir 1 failed: %#v", resp)
-	}
-	if !(resp.PrevNode.Key == "/fooDir" && resp.PrevNode.Dir == true && resp.PrevNode.TTL == 5) {
-		t.Fatalf("UpdateDir 1 PrevNode failed: %#v", resp)
-	}
-
-	// This should fail because the key does not exist.
-	resp, err = c.UpdateDir("nonexistentDir", 5)
-	if err == nil {
-		t.Fatalf("The key %v did not exist, so the update should have failed."+
-			"The response was: %#v", resp.Node.Key, resp)
-	}
-}
-
-func TestCreateDir(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("fooDir", true)
-	}()
-
-	// This should succeed
-	resp, err := c.CreateDir("fooDir", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !(resp.Action == "create" && resp.Node.Key == "/fooDir" &&
-		resp.Node.Value == "" && resp.Node.TTL == 5) {
-		t.Fatalf("CreateDir 1 failed: %#v", resp)
-	}
-	if resp.PrevNode != nil {
-		t.Fatalf("CreateDir 1 PrevNode failed: %#v", resp)
-	}
-
-	// This should fail, because the key is already there
-	resp, err = c.CreateDir("fooDir", 5)
-	if err == nil {
-		t.Fatalf("The key %v did exist, so the creation should have failed."+
-			"The response was: %#v", resp.Node.Key, resp)
-	}
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/version.go b/vendor/github.com/coreos/go-etcd/etcd/version.go
deleted file mode 100644
index b3d05df70..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/version.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package etcd
-
-const version = "v2"
diff --git a/vendor/github.com/coreos/go-etcd/etcd/watch.go b/vendor/github.com/coreos/go-etcd/etcd/watch.go
deleted file mode 100644
index 46da9ce2b..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/watch.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package etcd
-
-import (
-	"errors"
-)
-
-// Errors introduced by the Watch command.
-var (
-	ErrWatchStoppedByUser = errors.New("Watch stopped by the user via stop channel")
-)
-
-// If recursive is set to true the watch returns the first change under the given
-// prefix since the given index.
-//
-// If recursive is set to false the watch returns the first change to the given key
-// since the given index.
-//
-// To watch for the latest change, set waitIndex = 0.
-//
-// If a receiver channel is given, it will be a long-term watch. Watch will block at the
-//channel. After someone receives the channel, it will go on to watch that
-// prefix.  If a stop channel is given, the client can close long-term watch using
-// the stop channel.
-func (c *Client) Watch(prefix string, waitIndex uint64, recursive bool,
-	receiver chan *Response, stop chan bool) (*Response, error) {
-	logger.Debugf("watch %s [%s]", prefix, c.cluster.Leader)
-	if receiver == nil {
-		raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
-
-		if err != nil {
-			return nil, err
-		}
-
-		return raw.Unmarshal()
-	}
-	defer close(receiver)
-
-	for {
-		raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
-
-		if err != nil {
-			return nil, err
-		}
-
-		resp, err := raw.Unmarshal()
-
-		if err != nil {
-			return nil, err
-		}
-
-		waitIndex = resp.Node.ModifiedIndex + 1
-		receiver <- resp
-	}
-
-	return nil, nil
-}
-
-func (c *Client) RawWatch(prefix string, waitIndex uint64, recursive bool,
-	receiver chan *RawResponse, stop chan bool) (*RawResponse, error) {
-
-	logger.Debugf("rawWatch %s [%s]", prefix, c.cluster.Leader)
-	if receiver == nil {
-		return c.watchOnce(prefix, waitIndex, recursive, stop)
-	}
-
-	for {
-		raw, err := c.watchOnce(prefix, waitIndex, recursive, stop)
-
-		if err != nil {
-			return nil, err
-		}
-
-		resp, err := raw.Unmarshal()
-
-		if err != nil {
-			return nil, err
-		}
-
-		waitIndex = resp.Node.ModifiedIndex + 1
-		receiver <- raw
-	}
-
-	return nil, nil
-}
-
-// helper func
-// return when there is change under the given prefix
-func (c *Client) watchOnce(key string, waitIndex uint64, recursive bool, stop chan bool) (*RawResponse, error) {
-
-	options := Options{
-		"wait": true,
-	}
-	if waitIndex > 0 {
-		options["waitIndex"] = waitIndex
-	}
-	if recursive {
-		options["recursive"] = true
-	}
-
-	resp, err := c.getCancelable(key, options, stop)
-
-	if err == ErrRequestCancelled {
-		return nil, ErrWatchStoppedByUser
-	}
-
-	return resp, err
-}
diff --git a/vendor/github.com/coreos/go-etcd/etcd/watch_test.go b/vendor/github.com/coreos/go-etcd/etcd/watch_test.go
deleted file mode 100644
index 43e1dfeb8..000000000
--- a/vendor/github.com/coreos/go-etcd/etcd/watch_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package etcd
-
-import (
-	"fmt"
-	"runtime"
-	"testing"
-	"time"
-)
-
-func TestWatch(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("watch_foo", true)
-	}()
-
-	go setHelper("watch_foo", "bar", c)
-
-	resp, err := c.Watch("watch_foo", 0, false, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
-		t.Fatalf("Watch 1 failed: %#v", resp)
-	}
-
-	go setHelper("watch_foo", "bar", c)
-
-	resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, false, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/watch_foo" && resp.Node.Value == "bar") {
-		t.Fatalf("Watch 2 failed: %#v", resp)
-	}
-
-	routineNum := runtime.NumGoroutine()
-
-	ch := make(chan *Response, 10)
-	stop := make(chan bool, 1)
-
-	go setLoop("watch_foo", "bar", c)
-
-	go receiver(ch, stop)
-
-	_, err = c.Watch("watch_foo", 0, false, ch, stop)
-	if err != ErrWatchStoppedByUser {
-		t.Fatalf("Watch returned a non-user stop error")
-	}
-
-	if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
-		t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
-	}
-}
-
-func TestWatchAll(t *testing.T) {
-	c := NewClient(nil)
-	defer func() {
-		c.Delete("watch_foo", true)
-	}()
-
-	go setHelper("watch_foo/foo", "bar", c)
-
-	resp, err := c.Watch("watch_foo", 0, true, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
-		t.Fatalf("WatchAll 1 failed: %#v", resp)
-	}
-
-	go setHelper("watch_foo/foo", "bar", c)
-
-	resp, err = c.Watch("watch_foo", resp.Node.ModifiedIndex+1, true, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !(resp.Node.Key == "/watch_foo/foo" && resp.Node.Value == "bar") {
-		t.Fatalf("WatchAll 2 failed: %#v", resp)
-	}
-
-	ch := make(chan *Response, 10)
-	stop := make(chan bool, 1)
-
-	routineNum := runtime.NumGoroutine()
-
-	go setLoop("watch_foo/foo", "bar", c)
-
-	go receiver(ch, stop)
-
-	_, err = c.Watch("watch_foo", 0, true, ch, stop)
-	if err != ErrWatchStoppedByUser {
-		t.Fatalf("Watch returned a non-user stop error")
-	}
-
-	if newRoutineNum := runtime.NumGoroutine(); newRoutineNum != routineNum {
-		t.Fatalf("Routine numbers differ after watch stop: %v, %v", routineNum, newRoutineNum)
-	}
-}
-
-func setHelper(key, value string, c *Client) {
-	time.Sleep(time.Second)
-	c.Set(key, value, 100)
-}
-
-func setLoop(key, value string, c *Client) {
-	time.Sleep(time.Second)
-	for i := 0; i < 10; i++ {
-		newValue := fmt.Sprintf("%s_%v", value, i)
-		c.Set(key, newValue, 100)
-		time.Sleep(time.Second / 10)
-	}
-}
-
-func receiver(c chan *Response, stop chan bool) {
-	for i := 0; i < 10; i++ {
-		<-c
-	}
-	stop <- true
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/common_test.go b/vendor/github.com/davecgh/go-spew/spew/common_test.go
deleted file mode 100644
index c27f798f2..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/common_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"fmt"
-	"github.com/davecgh/go-spew/spew"
-	"reflect"
-	"testing"
-)
-
-// custom type to test Stinger interface on non-pointer receiver.
-type stringer string
-
-// String implements the Stringer interface for testing invocation of custom
-// stringers on types with non-pointer receivers.
-func (s stringer) String() string {
-	return "stringer " + string(s)
-}
-
-// custom type to test Stinger interface on pointer receiver.
-type pstringer string
-
-// String implements the Stringer interface for testing invocation of custom
-// stringers on types with only pointer receivers.
-func (s *pstringer) String() string {
-	return "stringer " + string(*s)
-}
-
-// xref1 and xref2 are cross referencing structs for testing circular reference
-// detection.
-type xref1 struct {
-	ps2 *xref2
-}
-type xref2 struct {
-	ps1 *xref1
-}
-
-// indirCir1, indirCir2, and indirCir3 are used to generate an indirect circular
-// reference for testing detection.
-type indirCir1 struct {
-	ps2 *indirCir2
-}
-type indirCir2 struct {
-	ps3 *indirCir3
-}
-type indirCir3 struct {
-	ps1 *indirCir1
-}
-
-// embed is used to test embedded structures.
-type embed struct {
-	a string
-}
-
-// embedwrap is used to test embedded structures.
-type embedwrap struct {
-	*embed
-	e *embed
-}
-
-// panicer is used to intentionally cause a panic for testing spew properly
-// handles them
-type panicer int
-
-func (p panicer) String() string {
-	panic("test panic")
-}
-
-// customError is used to test custom error interface invocation.
-type customError int
-
-func (e customError) Error() string {
-	return fmt.Sprintf("error: %d", int(e))
-}
-
-// stringizeWants converts a slice of wanted test output into a format suitable
-// for a test error message.
-func stringizeWants(wants []string) string {
-	s := ""
-	for i, want := range wants {
-		if i > 0 {
-			s += fmt.Sprintf("want%d: %s", i+1, want)
-		} else {
-			s += "want: " + want
-		}
-	}
-	return s
-}
-
-// testFailed returns whether or not a test failed by checking if the result
-// of the test is in the slice of wanted strings.
-func testFailed(result string, wants []string) bool {
-	for _, want := range wants {
-		if result == want {
-			return false
-		}
-	}
-	return true
-}
-
-// TestSortValues ensures the sort functionality for relect.Value based sorting
-// works as intended.
-func TestSortValues(t *testing.T) {
-	v := reflect.ValueOf
-
-	a := v("a")
-	b := v("b")
-	c := v("c")
-	embedA := v(embed{"a"})
-	embedB := v(embed{"b"})
-	embedC := v(embed{"c"})
-	tests := []struct {
-		input    []reflect.Value
-		expected []reflect.Value
-	}{
-		// No values.
-		{
-			[]reflect.Value{},
-			[]reflect.Value{},
-		},
-		// Bools.
-		{
-			[]reflect.Value{v(false), v(true), v(false)},
-			[]reflect.Value{v(false), v(false), v(true)},
-		},
-		// Ints.
-		{
-			[]reflect.Value{v(2), v(1), v(3)},
-			[]reflect.Value{v(1), v(2), v(3)},
-		},
-		// Uints.
-		{
-			[]reflect.Value{v(uint8(2)), v(uint8(1)), v(uint8(3))},
-			[]reflect.Value{v(uint8(1)), v(uint8(2)), v(uint8(3))},
-		},
-		// Floats.
-		{
-			[]reflect.Value{v(2.0), v(1.0), v(3.0)},
-			[]reflect.Value{v(1.0), v(2.0), v(3.0)},
-		},
-		// Strings.
-		{
-			[]reflect.Value{b, a, c},
-			[]reflect.Value{a, b, c},
-		},
-		// Uintptrs.
-		{
-			[]reflect.Value{v(uintptr(2)), v(uintptr(1)), v(uintptr(3))},
-			[]reflect.Value{v(uintptr(1)), v(uintptr(2)), v(uintptr(3))},
-		},
-		// Invalid.
-		{
-			[]reflect.Value{embedB, embedA, embedC},
-			[]reflect.Value{embedB, embedA, embedC},
-		},
-	}
-	for _, test := range tests {
-		spew.SortValues(test.input)
-		if !reflect.DeepEqual(test.input, test.expected) {
-			t.Errorf("Sort mismatch:\n %v != %v", test.input, test.expected)
-		}
-	}
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/dump_test.go b/vendor/github.com/davecgh/go-spew/spew/dump_test.go
deleted file mode 100644
index 84de70712..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/dump_test.go
+++ /dev/null
@@ -1,912 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-Test Summary:
-NOTE: For each test, a nil pointer, a single pointer and double pointer to the
-base test element are also tested to ensure proper indirection across all types.
-
-- Max int8, int16, int32, int64, int
-- Max uint8, uint16, uint32, uint64, uint
-- Boolean true and false
-- Standard complex64 and complex128
-- Array containing standard ints
-- Array containing type with custom formatter on pointer receiver only
-- Array containing interfaces
-- Array containing bytes
-- Slice containing standard float32 values
-- Slice containing type with custom formatter on pointer receiver only
-- Slice containing interfaces
-- Slice containing bytes
-- Nil slice
-- Standard string
-- Nil interface
-- Sub-interface
-- Map with string keys and int vals
-- Map with custom formatter type on pointer receiver only keys and vals
-- Map with interface keys and values
-- Map with nil interface value
-- Struct with primitives
-- Struct that contains another struct
-- Struct that contains custom type with Stringer pointer interface via both
-  exported and unexported fields
-- Struct that contains embedded struct and field to same struct
-- Uintptr to 0 (null pointer)
-- Uintptr address of real variable
-- Unsafe.Pointer to 0 (null pointer)
-- Unsafe.Pointer to address of real variable
-- Nil channel
-- Standard int channel
-- Function with no params and no returns
-- Function with param and no returns
-- Function with multiple params and multiple returns
-- Struct that is circular through self referencing
-- Structs that are circular through cross referencing
-- Structs that are indirectly circular
-- Type that panics in its Stringer interface
-*/
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/davecgh/go-spew/spew"
-	"testing"
-	"unsafe"
-)
-
-// dumpTest is used to describe a test to be perfomed against the Dump method.
-type dumpTest struct {
-	in    interface{}
-	wants []string
-}
-
-// dumpTests houses all of the tests to be performed against the Dump method.
-var dumpTests = make([]dumpTest, 0)
-
-// addDumpTest is a helper method to append the passed input and desired result
-// to dumpTests
-func addDumpTest(in interface{}, wants ...string) {
-	test := dumpTest{in, wants}
-	dumpTests = append(dumpTests, test)
-}
-
-func addIntDumpTests() {
-	// Max int8.
-	v := int8(127)
-	nv := (*int8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int8"
-	vs := "127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Max int16.
-	v2 := int16(32767)
-	nv2 := (*int16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "int16"
-	v2s := "32767"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Max int32.
-	v3 := int32(2147483647)
-	nv3 := (*int32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "int32"
-	v3s := "2147483647"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Max int64.
-	v4 := int64(9223372036854775807)
-	nv4 := (*int64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "int64"
-	v4s := "9223372036854775807"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Max int.
-	v5 := int(2147483647)
-	nv5 := (*int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "int"
-	v5s := "2147483647"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addUintDumpTests() {
-	// Max uint8.
-	v := uint8(255)
-	nv := (*uint8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uint8"
-	vs := "255"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Max uint16.
-	v2 := uint16(65535)
-	nv2 := (*uint16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Max uint32.
-	v3 := uint32(4294967295)
-	nv3 := (*uint32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "uint32"
-	v3s := "4294967295"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Max uint64.
-	v4 := uint64(18446744073709551615)
-	nv4 := (*uint64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "uint64"
-	v4s := "18446744073709551615"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Max uint.
-	v5 := uint(4294967295)
-	nv5 := (*uint)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "uint"
-	v5s := "4294967295"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addBoolDumpTests() {
-	// Boolean true.
-	v := bool(true)
-	nv := (*bool)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "bool"
-	vs := "true"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Boolean false.
-	v2 := bool(false)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "bool"
-	v2s := "false"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addFloatDumpTests() {
-	// Standard float32.
-	v := float32(3.1415)
-	nv := (*float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "3.1415"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Standard float64.
-	v2 := float64(3.1415926)
-	nv2 := (*float64)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "float64"
-	v2s := "3.1415926"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addComplexDumpTests() {
-	// Standard complex64.
-	v := complex(float32(6), -2)
-	nv := (*complex64)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "complex64"
-	vs := "(6-2i)"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Standard complex128.
-	v2 := complex(float64(-6), 2)
-	nv2 := (*complex128)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "complex128"
-	v2s := "(-6+2i)"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addArrayDumpTests() {
-	// Array containing standard ints.
-	v := [3]int{1, 2, 3}
-	nv := (*[3]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int"
-	vs := "{\n (" + vt + ") 1,\n (" + vt + ") 2,\n (" + vt + ") 3\n}"
-	addDumpTest(v, "([3]"+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*[3]"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**[3]"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*[3]"+vt+")(<nil>)\n")
-
-	// Array containing type with custom formatter on pointer receiver only.
-	v2 := [3]pstringer{"1", "2", "3"}
-	nv2 := (*[3]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.pstringer"
-	v2s := "{\n (" + v2t + ") stringer 1,\n (" + v2t + ") stringer 2,\n (" +
-		v2t + ") stringer 3\n}"
-	addDumpTest(v2, "([3]"+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*[3]"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**[3]"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*[3]"+v2t+")(<nil>)\n")
-
-	// Array containing interfaces.
-	v3 := [3]interface{}{"one", int(2), uint(3)}
-	nv3 := (*[3]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[3]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3s := "{\n (" + v3t2 + ") \"one\",\n (" + v3t3 + ") 2,\n (" + v3t4 +
-		") 3\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Array containing bytes.
-	v4 := [34]byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-	nv4 := (*[34]byte)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[34]uint8"
-	v4s := "{\n 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20" +
-		"  |............... |\n" +
-		" 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30" +
-		"  |!\"#$%&'()*+,-./0|\n" +
-		" 00000020  31 32                                           " +
-		"  |12|\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-}
-
-func addSliceDumpTests() {
-	// Slice containing standard float32 values.
-	v := []float32{3.14, 6.28, 12.56}
-	nv := (*[]float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "{\n (" + vt + ") 3.14,\n (" + vt + ") 6.28,\n (" + vt + ") 12.56\n}"
-	addDumpTest(v, "([]"+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*[]"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**[]"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*[]"+vt+")(<nil>)\n")
-
-	// Slice containing type with custom formatter on pointer receiver only.
-	v2 := []pstringer{"1", "2", "3"}
-	nv2 := (*[]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.pstringer"
-	v2s := "{\n (" + v2t + ") stringer 1,\n (" + v2t + ") stringer 2,\n (" +
-		v2t + ") stringer 3\n}"
-	addDumpTest(v2, "([]"+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*[]"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**[]"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*[]"+v2t+")(<nil>)\n")
-
-	// Slice containing interfaces.
-	v3 := []interface{}{"one", int(2), uint(3), nil}
-	nv3 := (*[]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3t5 := "interface {}"
-	v3s := "{\n (" + v3t2 + ") \"one\",\n (" + v3t3 + ") 2,\n (" + v3t4 +
-		") 3,\n (" + v3t5 + ") <nil>\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Slice containing bytes.
-	v4 := []byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-	nv4 := (*[]byte)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[]uint8"
-	v4s := "{\n 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20" +
-		"  |............... |\n" +
-		" 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30" +
-		"  |!\"#$%&'()*+,-./0|\n" +
-		" 00000020  31 32                                           " +
-		"  |12|\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Nil slice.
-	v5 := []int(nil)
-	nv5 := (*[]int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "[]int"
-	v5s := "<nil>"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addStringDumpTests() {
-	// Standard string.
-	v := "test"
-	nv := (*string)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "string"
-	vs := "\"test\""
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addInterfaceDumpTests() {
-	// Nil interface.
-	var v interface{}
-	nv := (*interface{})(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "interface {}"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Sub-interface.
-	v2 := interface{}(uint16(65535))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addMapDumpTests() {
-	// Map with string keys and int vals.
-	v := map[string]int{"one": 1, "two": 2}
-	nv := (*map[string]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "map[string]int"
-	vt1 := "string"
-	vt2 := "int"
-	vs := "{\n (" + vt1 + ") \"one\": (" + vt2 + ") 1,\n (" + vt1 +
-		") \"two\": (" + vt2 + ") 2\n}"
-	vs2 := "{\n (" + vt1 + ") \"two\": (" + vt2 + ") 2,\n (" + vt1 +
-		") \"one\": (" + vt2 + ") 1\n}"
-	addDumpTest(v, "("+vt+") "+vs+"\n", "("+vt+") "+vs2+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n",
-		"(*"+vt+")("+vAddr+")("+vs2+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n",
-		"(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs2+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Map with custom formatter type on pointer receiver only keys and vals.
-	v2 := map[pstringer]pstringer{"one": "1"}
-	nv2 := (*map[pstringer]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "map[spew_test.pstringer]spew_test.pstringer"
-	v2t1 := "spew_test.pstringer"
-	v2t2 := "spew_test.pstringer"
-	v2s := "{\n (" + v2t1 + ") stringer one: (" + v2t2 + ") stringer 1\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Map with interface keys and values.
-	v3 := map[interface{}]interface{}{"one": 1}
-	nv3 := (*map[interface{}]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "map[interface {}]interface {}"
-	v3t1 := "string"
-	v3t2 := "int"
-	v3s := "{\n (" + v3t1 + ") \"one\": (" + v3t2 + ") 1\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Map with nil interface value.
-	v4 := map[string]interface{}{"nil": nil}
-	nv4 := (*map[string]interface{})(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "map[string]interface {}"
-	v4t1 := "string"
-	v4t2 := "interface {}"
-	v4s := "{\n (" + v4t1 + ") \"nil\": (" + v4t2 + ") <nil>\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-}
-
-func addStructDumpTests() {
-	// Struct with primitives.
-	type s1 struct {
-		a int8
-		b uint8
-	}
-	v := s1{127, 255}
-	nv := (*s1)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.s1"
-	vt2 := "int8"
-	vt3 := "uint8"
-	vs := "{\n a: (" + vt2 + ") 127,\n b: (" + vt3 + ") 255\n}"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Struct that contains another struct.
-	type s2 struct {
-		s1 s1
-		b  bool
-	}
-	v2 := s2{s1{127, 255}, true}
-	nv2 := (*s2)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.s2"
-	v2t2 := "spew_test.s1"
-	v2t3 := "int8"
-	v2t4 := "uint8"
-	v2t5 := "bool"
-	v2s := "{\n s1: (" + v2t2 + ") {\n  a: (" + v2t3 + ") 127,\n  b: (" +
-		v2t4 + ") 255\n },\n b: (" + v2t5 + ") true\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Struct that contains custom type with Stringer pointer interface via both
-	// exported and unexported fields.
-	type s3 struct {
-		s pstringer
-		S pstringer
-	}
-	v3 := s3{"test", "test2"}
-	nv3 := (*s3)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.s3"
-	v3t2 := "spew_test.pstringer"
-	v3s := "{\n s: (" + v3t2 + ") stringer test,\n S: (" + v3t2 +
-		") stringer test2\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Struct that contains embedded struct and field to same struct.
-	e := embed{"embedstr"}
-	v4 := embedwrap{embed: &e, e: &e}
-	nv4 := (*embedwrap)(nil)
-	pv4 := &v4
-	eAddr := fmt.Sprintf("%p", &e)
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "spew_test.embedwrap"
-	v4t2 := "spew_test.embed"
-	v4t3 := "string"
-	v4s := "{\n embed: (*" + v4t2 + ")(" + eAddr + ")({\n  a: (" + v4t3 +
-		") \"embedstr\"\n }),\n e: (*" + v4t2 + ")(" + eAddr + ")({\n" +
-		"  a: (" + v4t3 + ") \"embedstr\"\n })\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-}
-
-func addUintptrDumpTests() {
-	// Null pointer.
-	v := uintptr(0)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uintptr"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-
-	// Address of real variable.
-	i := 1
-	v2 := uintptr(unsafe.Pointer(&i))
-	nv2 := (*uintptr)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uintptr"
-	v2s := fmt.Sprintf("%p", &i)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addUnsafePointerDumpTests() {
-	// Null pointer.
-	v := unsafe.Pointer(uintptr(0))
-	nv := (*unsafe.Pointer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "unsafe.Pointer"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Address of real variable.
-	i := 1
-	v2 := unsafe.Pointer(&i)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "unsafe.Pointer"
-	v2s := fmt.Sprintf("%p", &i)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addChanDumpTests() {
-	// Nil channel.
-	var v chan int
-	pv := &v
-	nv := (*chan int)(nil)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "chan int"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Real channel.
-	v2 := make(chan int)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "chan int"
-	v2s := fmt.Sprintf("%p", v2)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addFuncDumpTests() {
-	// Function with no params and no returns.
-	v := addIntDumpTests
-	nv := (*func())(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "func()"
-	vs := fmt.Sprintf("%p", v)
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Function with param and no returns.
-	v2 := TestDump
-	nv2 := (*func(*testing.T))(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "func(*testing.T)"
-	v2s := fmt.Sprintf("%p", v2)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Function with multiple params and multiple returns.
-	var v3 = func(i int, s string) (b bool, err error) {
-		return true, nil
-	}
-	nv3 := (*func(int, string) (bool, error))(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "func(int, string) (bool, error)"
-	v3s := fmt.Sprintf("%p", v3)
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-}
-
-func addCircularDumpTests() {
-	// Struct that is circular through self referencing.
-	type circular struct {
-		c *circular
-	}
-	v := circular{nil}
-	v.c = &v
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.circular"
-	vs := "{\n c: (*" + vt + ")(" + vAddr + ")({\n  c: (*" + vt + ")(" +
-		vAddr + ")(<already shown>)\n })\n}"
-	vs2 := "{\n c: (*" + vt + ")(" + vAddr + ")(<already shown>)\n}"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs2+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs2+")\n")
-
-	// Structs that are circular through cross referencing.
-	v2 := xref1{nil}
-	ts2 := xref2{&v2}
-	v2.ps2 = &ts2
-	pv2 := &v2
-	ts2Addr := fmt.Sprintf("%p", &ts2)
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.xref1"
-	v2t2 := "spew_test.xref2"
-	v2s := "{\n ps2: (*" + v2t2 + ")(" + ts2Addr + ")({\n  ps1: (*" + v2t +
-		")(" + v2Addr + ")({\n   ps2: (*" + v2t2 + ")(" + ts2Addr +
-		")(<already shown>)\n  })\n })\n}"
-	v2s2 := "{\n ps2: (*" + v2t2 + ")(" + ts2Addr + ")({\n  ps1: (*" + v2t +
-		")(" + v2Addr + ")(<already shown>)\n })\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s2+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s2+")\n")
-
-	// Structs that are indirectly circular.
-	v3 := indirCir1{nil}
-	tic2 := indirCir2{nil}
-	tic3 := indirCir3{&v3}
-	tic2.ps3 = &tic3
-	v3.ps2 = &tic2
-	pv3 := &v3
-	tic2Addr := fmt.Sprintf("%p", &tic2)
-	tic3Addr := fmt.Sprintf("%p", &tic3)
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.indirCir1"
-	v3t2 := "spew_test.indirCir2"
-	v3t3 := "spew_test.indirCir3"
-	v3s := "{\n ps2: (*" + v3t2 + ")(" + tic2Addr + ")({\n  ps3: (*" + v3t3 +
-		")(" + tic3Addr + ")({\n   ps1: (*" + v3t + ")(" + v3Addr +
-		")({\n    ps2: (*" + v3t2 + ")(" + tic2Addr +
-		")(<already shown>)\n   })\n  })\n })\n}"
-	v3s2 := "{\n ps2: (*" + v3t2 + ")(" + tic2Addr + ")({\n  ps3: (*" + v3t3 +
-		")(" + tic3Addr + ")({\n   ps1: (*" + v3t + ")(" + v3Addr +
-		")(<already shown>)\n  })\n })\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s2+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s2+")\n")
-}
-
-func addPanicDumpTests() {
-	// Type that panics in its Stringer interface.
-	v := panicer(127)
-	nv := (*panicer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.panicer"
-	vs := "(PANIC=test panic)127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addErrorDumpTests() {
-	// Type that has a custom Error interface.
-	v := customError(127)
-	nv := (*customError)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.customError"
-	vs := "error: 127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-// TestDump executes all of the tests described by dumpTests.
-func TestDump(t *testing.T) {
-	// Setup tests.
-	addIntDumpTests()
-	addUintDumpTests()
-	addBoolDumpTests()
-	addFloatDumpTests()
-	addComplexDumpTests()
-	addArrayDumpTests()
-	addSliceDumpTests()
-	addStringDumpTests()
-	addInterfaceDumpTests()
-	addMapDumpTests()
-	addStructDumpTests()
-	addUintptrDumpTests()
-	addUnsafePointerDumpTests()
-	addChanDumpTests()
-	addFuncDumpTests()
-	addCircularDumpTests()
-	addPanicDumpTests()
-	addErrorDumpTests()
-	addCgoDumpTests()
-
-	t.Logf("Running %d tests", len(dumpTests))
-	for i, test := range dumpTests {
-		buf := new(bytes.Buffer)
-		spew.Fdump(buf, test.in)
-		s := buf.String()
-		if testFailed(s, test.wants) {
-			t.Errorf("Dump #%d\n got: %s %s", i, s, stringizeWants(test.wants))
-			continue
-		}
-	}
-}
-
-func TestDumpSortedKeys(t *testing.T) {
-	cfg := spew.ConfigState{SortKeys: true}
-	s := cfg.Sdump(map[int]string{1: "1", 3: "3", 2: "2"})
-	expected := `(map[int]string) {
-(int) 1: (string) "1",
-(int) 2: (string) "2",
-(int) 3: (string) "3"
-}
-`
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go b/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go
deleted file mode 100644
index 30e7f7c8a..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2013 Dave Collins <dave@davec.name>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when both cgo is supported and "-tags testcgo" is added to the go test
-// command line.  This means the cgo tests are only added (and hence run) when
-// specifially requested.  This configuration is used because spew itself
-// does not require cgo to run even though it does handle certain cgo types
-// specially.  Rather than forcing all clients to require cgo and an external
-// C compiler just to run the tests, this scheme makes them optional.
-// +build cgo,testcgo
-
-package spew_test
-
-import (
-	"fmt"
-	"github.com/davecgh/go-spew/spew/testdata"
-)
-
-func addCgoDumpTests() {
-	// C char pointer.
-	v := testdata.GetCgoCharPointer()
-	nv := testdata.GetCgoNullCharPointer()
-	pv := &v
-	vcAddr := fmt.Sprintf("%p", v)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "*testdata._Ctype_char"
-	vs := "116"
-	addDumpTest(v, "("+vt+")("+vcAddr+")("+vs+")\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+"->"+vcAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+"->"+vcAddr+")("+vs+")\n")
-	addDumpTest(nv, "("+vt+")(<nil>)\n")
-
-	// C char array.
-	v2 := testdata.GetCgoCharArray()
-	v2t := "[6]testdata._Ctype_char"
-	v2s := "{\n 00000000  74 65 73 74 32 00                               " +
-		"  |test2.|\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-
-	// C unsigned char array.
-	v3 := testdata.GetCgoUnsignedCharArray()
-	v3t := "[6]testdata._Ctype_unsignedchar"
-	v3s := "{\n 00000000  74 65 73 74 33 00                               " +
-		"  |test3.|\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-
-	// C signed char array.
-	v4 := testdata.GetCgoSignedCharArray()
-	v4t := "[6]testdata._Ctype_schar"
-	v4t2 := "testdata._Ctype_schar"
-	v4s := "{\n (" + v4t2 + ") 116,\n (" + v4t2 + ") 101,\n (" + v4t2 +
-		") 115,\n (" + v4t2 + ") 116,\n (" + v4t2 + ") 52,\n (" + v4t2 +
-		") 0\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-
-	// C uint8_t array.
-	v5 := testdata.GetCgoUint8tArray()
-	v5t := "[6]testdata._Ctype_uint8_t"
-	v5s := "{\n 00000000  74 65 73 74 35 00                               " +
-		"  |test5.|\n}"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-
-	// C typedefed unsigned char array.
-	v6 := testdata.GetCgoTypdefedUnsignedCharArray()
-	v6t := "[6]testdata._Ctype_custom_uchar_t"
-	v6s := "{\n 00000000  74 65 73 74 36 00                               " +
-		"  |test6.|\n}"
-	addDumpTest(v6, "("+v6t+") "+v6s+"\n")
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go b/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go
deleted file mode 100644
index 52a0971fb..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2013 Dave Collins <dave@davec.name>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when either cgo is not supported or "-tags testcgo" is not added to the go
-// test command line.  This file intentionally does not setup any cgo tests in
-// this scenario.
-// +build !cgo !testcgo
-
-package spew_test
-
-func addCgoDumpTests() {
-	// Don't add any tests for cgo since this file is only compiled when
-	// there should not be any cgo tests.
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/example_test.go b/vendor/github.com/davecgh/go-spew/spew/example_test.go
deleted file mode 100644
index b1ec8a2d0..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/example_test.go
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"fmt"
-	"github.com/davecgh/go-spew/spew"
-)
-
-type Flag int
-
-const (
-	flagOne Flag = iota
-	flagTwo
-)
-
-var flagStrings = map[Flag]string{
-	flagOne: "flagOne",
-	flagTwo: "flagTwo",
-}
-
-func (f Flag) String() string {
-	if s, ok := flagStrings[f]; ok {
-		return s
-	}
-	return fmt.Sprintf("Unknown flag (%d)", int(f))
-}
-
-type Bar struct {
-	flag Flag
-	data uintptr
-}
-
-type Foo struct {
-	unexportedField Bar
-	ExportedField   map[interface{}]interface{}
-}
-
-// This example demonstrates how to use Dump to dump variables to stdout.
-func ExampleDump() {
-	// The following package level declarations are assumed for this example:
-	/*
-		type Flag int
-
-		const (
-			flagOne Flag = iota
-			flagTwo
-		)
-
-		var flagStrings = map[Flag]string{
-			flagOne: "flagOne",
-			flagTwo: "flagTwo",
-		}
-
-		func (f Flag) String() string {
-			if s, ok := flagStrings[f]; ok {
-				return s
-			}
-			return fmt.Sprintf("Unknown flag (%d)", int(f))
-		}
-
-		type Bar struct {
-			flag Flag
-			data uintptr
-		}
-
-		type Foo struct {
-			unexportedField Bar
-			ExportedField   map[interface{}]interface{}
-		}
-	*/
-
-	// Setup some sample data structures for the example.
-	bar := Bar{Flag(flagTwo), uintptr(0)}
-	s1 := Foo{bar, map[interface{}]interface{}{"one": true}}
-	f := Flag(5)
-	b := []byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-
-	// Dump!
-	spew.Dump(s1, f, b)
-
-	// Output:
-	// (spew_test.Foo) {
-	//  unexportedField: (spew_test.Bar) {
-	//   flag: (spew_test.Flag) flagTwo,
-	//   data: (uintptr) <nil>
-	//  },
-	//  ExportedField: (map[interface {}]interface {}) {
-	//   (string) "one": (bool) true
-	//  }
-	// }
-	// (spew_test.Flag) Unknown flag (5)
-	// ([]uint8) {
-	//  00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20  |............... |
-	//  00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30  |!"#$%&'()*+,-./0|
-	//  00000020  31 32                                             |12|
-	// }
-	//
-}
-
-// This example demonstrates how to use Printf to display a variable with a
-// format string and inline formatting.
-func ExamplePrintf() {
-	// Create a double pointer to a uint 8.
-	ui8 := uint8(5)
-	pui8 := &ui8
-	ppui8 := &pui8
-
-	// Create a circular data type.
-	type circular struct {
-		ui8 uint8
-		c   *circular
-	}
-	c := circular{ui8: 1}
-	c.c = &c
-
-	// Print!
-	spew.Printf("ppui8: %v\n", ppui8)
-	spew.Printf("circular: %v\n", c)
-
-	// Output:
-	// ppui8: <**>5
-	// circular: {1 <*>{1 <*><shown>}}
-}
-
-// This example demonstrates how to use a ConfigState.
-func ExampleConfigState() {
-	// Modify the indent level of the ConfigState only.  The global
-	// configuration is not modified.
-	scs := spew.ConfigState{Indent: "\t"}
-
-	// Output using the ConfigState instance.
-	v := map[string]int{"one": 1}
-	scs.Printf("v: %v\n", v)
-	scs.Dump(v)
-
-	// Output:
-	// v: map[one:1]
-	// (map[string]int) {
-	// 	(string) "one": (int) 1
-	// }
-}
-
-// This example demonstrates how to use ConfigState.Dump to dump variables to
-// stdout
-func ExampleConfigState_Dump() {
-	// See the top-level Dump example for details on the types used in this
-	// example.
-
-	// Create two ConfigState instances with different indentation.
-	scs := spew.ConfigState{Indent: "\t"}
-	scs2 := spew.ConfigState{Indent: " "}
-
-	// Setup some sample data structures for the example.
-	bar := Bar{Flag(flagTwo), uintptr(0)}
-	s1 := Foo{bar, map[interface{}]interface{}{"one": true}}
-
-	// Dump using the ConfigState instances.
-	scs.Dump(s1)
-	scs2.Dump(s1)
-
-	// Output:
-	// (spew_test.Foo) {
-	// 	unexportedField: (spew_test.Bar) {
-	// 		flag: (spew_test.Flag) flagTwo,
-	// 		data: (uintptr) <nil>
-	// 	},
-	// 	ExportedField: (map[interface {}]interface {}) {
-	//		(string) "one": (bool) true
-	// 	}
-	// }
-	// (spew_test.Foo) {
-	//  unexportedField: (spew_test.Bar) {
-	//   flag: (spew_test.Flag) flagTwo,
-	//   data: (uintptr) <nil>
-	//  },
-	//  ExportedField: (map[interface {}]interface {}) {
-	//   (string) "one": (bool) true
-	//  }
-	// }
-	//
-}
-
-// This example demonstrates how to use ConfigState.Printf to display a variable
-// with a format string and inline formatting.
-func ExampleConfigState_Printf() {
-	// See the top-level Dump example for details on the types used in this
-	// example.
-
-	// Create two ConfigState instances and modify the method handling of the
-	// first ConfigState only.
-	scs := spew.NewDefaultConfig()
-	scs2 := spew.NewDefaultConfig()
-	scs.DisableMethods = true
-
-	// Alternatively
-	// scs := spew.ConfigState{Indent: " ", DisableMethods: true}
-	// scs2 := spew.ConfigState{Indent: " "}
-
-	// This is of type Flag which implements a Stringer and has raw value 1.
-	f := flagTwo
-
-	// Dump using the ConfigState instances.
-	scs.Printf("f: %v\n", f)
-	scs2.Printf("f: %v\n", f)
-
-	// Output:
-	// f: 1
-	// f: flagTwo
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/format_test.go b/vendor/github.com/davecgh/go-spew/spew/format_test.go
deleted file mode 100644
index 80c5ef929..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/format_test.go
+++ /dev/null
@@ -1,1483 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-Test Summary:
-NOTE: For each test, a nil pointer, a single pointer and double pointer to the
-base test element are also tested to ensure proper indirection across all types.
-
-- Max int8, int16, int32, int64, int
-- Max uint8, uint16, uint32, uint64, uint
-- Boolean true and false
-- Standard complex64 and complex128
-- Array containing standard ints
-- Array containing type with custom formatter on pointer receiver only
-- Array containing interfaces
-- Slice containing standard float32 values
-- Slice containing type with custom formatter on pointer receiver only
-- Slice containing interfaces
-- Nil slice
-- Standard string
-- Nil interface
-- Sub-interface
-- Map with string keys and int vals
-- Map with custom formatter type on pointer receiver only keys and vals
-- Map with interface keys and values
-- Map with nil interface value
-- Struct with primitives
-- Struct that contains another struct
-- Struct that contains custom type with Stringer pointer interface via both
-  exported and unexported fields
-- Struct that contains embedded struct and field to same struct
-- Uintptr to 0 (null pointer)
-- Uintptr address of real variable
-- Unsafe.Pointer to 0 (null pointer)
-- Unsafe.Pointer to address of real variable
-- Nil channel
-- Standard int channel
-- Function with no params and no returns
-- Function with param and no returns
-- Function with multiple params and multiple returns
-- Struct that is circular through self referencing
-- Structs that are circular through cross referencing
-- Structs that are indirectly circular
-- Type that panics in its Stringer interface
-- Type that has a custom Error interface
-- %x passthrough with uint
-- %#x passthrough with uint
-- %f passthrough with precision
-- %f passthrough with width and precision
-- %d passthrough with width
-- %q passthrough with string
-*/
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/davecgh/go-spew/spew"
-	"testing"
-	"unsafe"
-)
-
-// formatterTest is used to describe a test to be perfomed against NewFormatter.
-type formatterTest struct {
-	format string
-	in     interface{}
-	wants  []string
-}
-
-// formatterTests houses all of the tests to be performed against NewFormatter.
-var formatterTests = make([]formatterTest, 0)
-
-// addFormatterTest is a helper method to append the passed input and desired
-// result to formatterTests.
-func addFormatterTest(format string, in interface{}, wants ...string) {
-	test := formatterTest{format, in, wants}
-	formatterTests = append(formatterTests, test)
-}
-
-func addIntFormatterTests() {
-	// Max int8.
-	v := int8(127)
-	nv := (*int8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int8"
-	vs := "127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Max int16.
-	v2 := int16(32767)
-	nv2 := (*int16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "int16"
-	v2s := "32767"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Max int32.
-	v3 := int32(2147483647)
-	nv3 := (*int32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "int32"
-	v3s := "2147483647"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Max int64.
-	v4 := int64(9223372036854775807)
-	nv4 := (*int64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "int64"
-	v4s := "9223372036854775807"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-
-	// Max int.
-	v5 := int(2147483647)
-	nv5 := (*int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "int"
-	v5s := "2147483647"
-	addFormatterTest("%v", v5, v5s)
-	addFormatterTest("%v", pv5, "<*>"+v5s)
-	addFormatterTest("%v", &pv5, "<**>"+v5s)
-	addFormatterTest("%v", nv5, "<nil>")
-	addFormatterTest("%+v", v5, v5s)
-	addFormatterTest("%+v", pv5, "<*>("+v5Addr+")"+v5s)
-	addFormatterTest("%+v", &pv5, "<**>("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%+v", nv5, "<nil>")
-	addFormatterTest("%#v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#v", pv5, "(*"+v5t+")"+v5s)
-	addFormatterTest("%#v", &pv5, "(**"+v5t+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-	addFormatterTest("%#+v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#+v", pv5, "(*"+v5t+")("+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", &pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", nv5, "(*"+v5t+")"+"<nil>")
-}
-
-func addUintFormatterTests() {
-	// Max uint8.
-	v := uint8(255)
-	nv := (*uint8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uint8"
-	vs := "255"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Max uint16.
-	v2 := uint16(65535)
-	nv2 := (*uint16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Max uint32.
-	v3 := uint32(4294967295)
-	nv3 := (*uint32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "uint32"
-	v3s := "4294967295"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Max uint64.
-	v4 := uint64(18446744073709551615)
-	nv4 := (*uint64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "uint64"
-	v4s := "18446744073709551615"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-
-	// Max uint.
-	v5 := uint(4294967295)
-	nv5 := (*uint)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "uint"
-	v5s := "4294967295"
-	addFormatterTest("%v", v5, v5s)
-	addFormatterTest("%v", pv5, "<*>"+v5s)
-	addFormatterTest("%v", &pv5, "<**>"+v5s)
-	addFormatterTest("%v", nv5, "<nil>")
-	addFormatterTest("%+v", v5, v5s)
-	addFormatterTest("%+v", pv5, "<*>("+v5Addr+")"+v5s)
-	addFormatterTest("%+v", &pv5, "<**>("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%+v", nv5, "<nil>")
-	addFormatterTest("%#v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#v", pv5, "(*"+v5t+")"+v5s)
-	addFormatterTest("%#v", &pv5, "(**"+v5t+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-	addFormatterTest("%#+v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#+v", pv5, "(*"+v5t+")("+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", &pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-}
-
-func addBoolFormatterTests() {
-	// Boolean true.
-	v := bool(true)
-	nv := (*bool)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "bool"
-	vs := "true"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Boolean false.
-	v2 := bool(false)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "bool"
-	v2s := "false"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addFloatFormatterTests() {
-	// Standard float32.
-	v := float32(3.1415)
-	nv := (*float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "3.1415"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Standard float64.
-	v2 := float64(3.1415926)
-	nv2 := (*float64)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "float64"
-	v2s := "3.1415926"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-}
-
-func addComplexFormatterTests() {
-	// Standard complex64.
-	v := complex(float32(6), -2)
-	nv := (*complex64)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "complex64"
-	vs := "(6-2i)"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Standard complex128.
-	v2 := complex(float64(-6), 2)
-	nv2 := (*complex128)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "complex128"
-	v2s := "(-6+2i)"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-}
-
-func addArrayFormatterTests() {
-	// Array containing standard ints.
-	v := [3]int{1, 2, 3}
-	nv := (*[3]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "[3]int"
-	vs := "[1 2 3]"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Array containing type with custom formatter on pointer receiver only.
-	v2 := [3]pstringer{"1", "2", "3"}
-	nv2 := (*[3]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "[3]spew_test.pstringer"
-	v2s := "[stringer 1 stringer 2 stringer 3]"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Array containing interfaces.
-	v3 := [3]interface{}{"one", int(2), uint(3)}
-	nv3 := (*[3]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[3]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3s := "[one 2 3]"
-	v3s2 := "[(" + v3t2 + ")one (" + v3t3 + ")2 (" + v3t4 + ")3]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-}
-
-func addSliceFormatterTests() {
-	// Slice containing standard float32 values.
-	v := []float32{3.14, 6.28, 12.56}
-	nv := (*[]float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "[]float32"
-	vs := "[3.14 6.28 12.56]"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Slice containing type with custom formatter on pointer receiver only.
-	v2 := []pstringer{"1", "2", "3"}
-	nv2 := (*[]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "[]spew_test.pstringer"
-	v2s := "[stringer 1 stringer 2 stringer 3]"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Slice containing interfaces.
-	v3 := []interface{}{"one", int(2), uint(3), nil}
-	nv3 := (*[]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3t5 := "interface {}"
-	v3s := "[one 2 3 <nil>]"
-	v3s2 := "[(" + v3t2 + ")one (" + v3t3 + ")2 (" + v3t4 + ")3 (" + v3t5 +
-		")<nil>]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Nil slice.
-	var v4 []int
-	nv4 := (*[]int)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[]int"
-	v4s := "<nil>"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addStringFormatterTests() {
-	// Standard string.
-	v := "test"
-	nv := (*string)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "string"
-	vs := "test"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addInterfaceFormatterTests() {
-	// Nil interface.
-	var v interface{}
-	nv := (*interface{})(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "interface {}"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Sub-interface.
-	v2 := interface{}(uint16(65535))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addMapFormatterTests() {
-	// Map with string keys and int vals.
-	v := map[string]int{"one": 1, "two": 2}
-	nv := (*map[string]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "map[string]int"
-	vs := "map[one:1 two:2]"
-	vs2 := "map[two:2 one:1]"
-	addFormatterTest("%v", v, vs, vs2)
-	addFormatterTest("%v", pv, "<*>"+vs, "<*>"+vs2)
-	addFormatterTest("%v", &pv, "<**>"+vs, "<**>"+vs2)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs, vs2)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs, "<*>("+vAddr+")"+vs2)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs,
-		"<**>("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs, "("+vt+")"+vs2)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs, "(*"+vt+")"+vs2)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs, "(**"+vt+")"+vs2)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs, "("+vt+")"+vs2)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs,
-		"(*"+vt+")("+vAddr+")"+vs2)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs,
-		"(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Map with custom formatter type on pointer receiver only keys and vals.
-	v2 := map[pstringer]pstringer{"one": "1"}
-	nv2 := (*map[pstringer]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "map[spew_test.pstringer]spew_test.pstringer"
-	v2s := "map[stringer one:stringer 1]"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Map with interface keys and values.
-	v3 := map[interface{}]interface{}{"one": 1}
-	nv3 := (*map[interface{}]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "map[interface {}]interface {}"
-	v3t1 := "string"
-	v3t2 := "int"
-	v3s := "map[one:1]"
-	v3s2 := "map[(" + v3t1 + ")one:(" + v3t2 + ")1]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Map with nil interface value
-	v4 := map[string]interface{}{"nil": nil}
-	nv4 := (*map[string]interface{})(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "map[string]interface {}"
-	v4t1 := "interface {}"
-	v4s := "map[nil:<nil>]"
-	v4s2 := "map[nil:(" + v4t1 + ")<nil>]"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s2)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s2)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s2)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s2)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s2)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s2)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addStructFormatterTests() {
-	// Struct with primitives.
-	type s1 struct {
-		a int8
-		b uint8
-	}
-	v := s1{127, 255}
-	nv := (*s1)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.s1"
-	vt2 := "int8"
-	vt3 := "uint8"
-	vs := "{127 255}"
-	vs2 := "{a:127 b:255}"
-	vs3 := "{a:(" + vt2 + ")127 b:(" + vt3 + ")255}"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs2)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs2)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs3)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs3)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs3)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs3)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs3)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs3)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Struct that contains another struct.
-	type s2 struct {
-		s1 s1
-		b  bool
-	}
-	v2 := s2{s1{127, 255}, true}
-	nv2 := (*s2)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.s2"
-	v2t2 := "spew_test.s1"
-	v2t3 := "int8"
-	v2t4 := "uint8"
-	v2t5 := "bool"
-	v2s := "{{127 255} true}"
-	v2s2 := "{s1:{a:127 b:255} b:true}"
-	v2s3 := "{s1:(" + v2t2 + "){a:(" + v2t3 + ")127 b:(" + v2t4 + ")255} b:(" +
-		v2t5 + ")true}"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s2)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s2)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s2)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s3)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s3)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s3)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s3)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s3)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s3)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Struct that contains custom type with Stringer pointer interface via both
-	// exported and unexported fields.
-	type s3 struct {
-		s pstringer
-		S pstringer
-	}
-	v3 := s3{"test", "test2"}
-	nv3 := (*s3)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.s3"
-	v3t2 := "spew_test.pstringer"
-	v3s := "{stringer test stringer test2}"
-	v3s2 := "{s:stringer test S:stringer test2}"
-	v3s3 := "{s:(" + v3t2 + ")stringer test S:(" + v3t2 + ")stringer test2}"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s2)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s2)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s3)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s3)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s3)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s3)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s3)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s3)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Struct that contains embedded struct and field to same struct.
-	e := embed{"embedstr"}
-	v4 := embedwrap{embed: &e, e: &e}
-	nv4 := (*embedwrap)(nil)
-	pv4 := &v4
-	eAddr := fmt.Sprintf("%p", &e)
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "spew_test.embedwrap"
-	v4t2 := "spew_test.embed"
-	v4t3 := "string"
-	v4s := "{<*>{embedstr} <*>{embedstr}}"
-	v4s2 := "{embed:<*>(" + eAddr + "){a:embedstr} e:<*>(" + eAddr +
-		"){a:embedstr}}"
-	v4s3 := "{embed:(*" + v4t2 + "){a:(" + v4t3 + ")embedstr} e:(*" + v4t2 +
-		"){a:(" + v4t3 + ")embedstr}}"
-	v4s4 := "{embed:(*" + v4t2 + ")(" + eAddr + "){a:(" + v4t3 +
-		")embedstr} e:(*" + v4t2 + ")(" + eAddr + "){a:(" + v4t3 + ")embedstr}}"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s2)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s2)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s2)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s3)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s3)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s3)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s4)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s4)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s4)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addUintptrFormatterTests() {
-	// Null pointer.
-	v := uintptr(0)
-	nv := (*uintptr)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uintptr"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Address of real variable.
-	i := 1
-	v2 := uintptr(unsafe.Pointer(&i))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uintptr"
-	v2s := fmt.Sprintf("%p", &i)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addUnsafePointerFormatterTests() {
-	// Null pointer.
-	v := unsafe.Pointer(uintptr(0))
-	nv := (*unsafe.Pointer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "unsafe.Pointer"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Address of real variable.
-	i := 1
-	v2 := unsafe.Pointer(&i)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "unsafe.Pointer"
-	v2s := fmt.Sprintf("%p", &i)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addChanFormatterTests() {
-	// Nil channel.
-	var v chan int
-	pv := &v
-	nv := (*chan int)(nil)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "chan int"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Real channel.
-	v2 := make(chan int)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "chan int"
-	v2s := fmt.Sprintf("%p", v2)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addFuncFormatterTests() {
-	// Function with no params and no returns.
-	v := addIntFormatterTests
-	nv := (*func())(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "func()"
-	vs := fmt.Sprintf("%p", v)
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Function with param and no returns.
-	v2 := TestFormatter
-	nv2 := (*func(*testing.T))(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "func(*testing.T)"
-	v2s := fmt.Sprintf("%p", v2)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Function with multiple params and multiple returns.
-	var v3 = func(i int, s string) (b bool, err error) {
-		return true, nil
-	}
-	nv3 := (*func(int, string) (bool, error))(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "func(int, string) (bool, error)"
-	v3s := fmt.Sprintf("%p", v3)
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-}
-
-func addCircularFormatterTests() {
-	// Struct that is circular through self referencing.
-	type circular struct {
-		c *circular
-	}
-	v := circular{nil}
-	v.c = &v
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.circular"
-	vs := "{<*>{<*><shown>}}"
-	vs2 := "{<*><shown>}"
-	vs3 := "{c:<*>(" + vAddr + "){c:<*>(" + vAddr + ")<shown>}}"
-	vs4 := "{c:<*>(" + vAddr + ")<shown>}"
-	vs5 := "{c:(*" + vt + "){c:(*" + vt + ")<shown>}}"
-	vs6 := "{c:(*" + vt + ")<shown>}"
-	vs7 := "{c:(*" + vt + ")(" + vAddr + "){c:(*" + vt + ")(" + vAddr +
-		")<shown>}}"
-	vs8 := "{c:(*" + vt + ")(" + vAddr + ")<shown>}"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs2)
-	addFormatterTest("%v", &pv, "<**>"+vs2)
-	addFormatterTest("%+v", v, vs3)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs4)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs4)
-	addFormatterTest("%#v", v, "("+vt+")"+vs5)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs6)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs6)
-	addFormatterTest("%#+v", v, "("+vt+")"+vs7)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs8)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs8)
-
-	// Structs that are circular through cross referencing.
-	v2 := xref1{nil}
-	ts2 := xref2{&v2}
-	v2.ps2 = &ts2
-	pv2 := &v2
-	ts2Addr := fmt.Sprintf("%p", &ts2)
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.xref1"
-	v2t2 := "spew_test.xref2"
-	v2s := "{<*>{<*>{<*><shown>}}}"
-	v2s2 := "{<*>{<*><shown>}}"
-	v2s3 := "{ps2:<*>(" + ts2Addr + "){ps1:<*>(" + v2Addr + "){ps2:<*>(" +
-		ts2Addr + ")<shown>}}}"
-	v2s4 := "{ps2:<*>(" + ts2Addr + "){ps1:<*>(" + v2Addr + ")<shown>}}"
-	v2s5 := "{ps2:(*" + v2t2 + "){ps1:(*" + v2t + "){ps2:(*" + v2t2 +
-		")<shown>}}}"
-	v2s6 := "{ps2:(*" + v2t2 + "){ps1:(*" + v2t + ")<shown>}}"
-	v2s7 := "{ps2:(*" + v2t2 + ")(" + ts2Addr + "){ps1:(*" + v2t +
-		")(" + v2Addr + "){ps2:(*" + v2t2 + ")(" + ts2Addr +
-		")<shown>}}}"
-	v2s8 := "{ps2:(*" + v2t2 + ")(" + ts2Addr + "){ps1:(*" + v2t +
-		")(" + v2Addr + ")<shown>}}"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s2)
-	addFormatterTest("%v", &pv2, "<**>"+v2s2)
-	addFormatterTest("%+v", v2, v2s3)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s4)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s4)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s5)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s6)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s6)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s7)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s8)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s8)
-
-	// Structs that are indirectly circular.
-	v3 := indirCir1{nil}
-	tic2 := indirCir2{nil}
-	tic3 := indirCir3{&v3}
-	tic2.ps3 = &tic3
-	v3.ps2 = &tic2
-	pv3 := &v3
-	tic2Addr := fmt.Sprintf("%p", &tic2)
-	tic3Addr := fmt.Sprintf("%p", &tic3)
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.indirCir1"
-	v3t2 := "spew_test.indirCir2"
-	v3t3 := "spew_test.indirCir3"
-	v3s := "{<*>{<*>{<*>{<*><shown>}}}}"
-	v3s2 := "{<*>{<*>{<*><shown>}}}"
-	v3s3 := "{ps2:<*>(" + tic2Addr + "){ps3:<*>(" + tic3Addr + "){ps1:<*>(" +
-		v3Addr + "){ps2:<*>(" + tic2Addr + ")<shown>}}}}"
-	v3s4 := "{ps2:<*>(" + tic2Addr + "){ps3:<*>(" + tic3Addr + "){ps1:<*>(" +
-		v3Addr + ")<shown>}}}"
-	v3s5 := "{ps2:(*" + v3t2 + "){ps3:(*" + v3t3 + "){ps1:(*" + v3t +
-		"){ps2:(*" + v3t2 + ")<shown>}}}}"
-	v3s6 := "{ps2:(*" + v3t2 + "){ps3:(*" + v3t3 + "){ps1:(*" + v3t +
-		")<shown>}}}"
-	v3s7 := "{ps2:(*" + v3t2 + ")(" + tic2Addr + "){ps3:(*" + v3t3 + ")(" +
-		tic3Addr + "){ps1:(*" + v3t + ")(" + v3Addr + "){ps2:(*" + v3t2 +
-		")(" + tic2Addr + ")<shown>}}}}"
-	v3s8 := "{ps2:(*" + v3t2 + ")(" + tic2Addr + "){ps3:(*" + v3t3 + ")(" +
-		tic3Addr + "){ps1:(*" + v3t + ")(" + v3Addr + ")<shown>}}}"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s2)
-	addFormatterTest("%v", &pv3, "<**>"+v3s2)
-	addFormatterTest("%+v", v3, v3s3)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s4)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s4)
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s5)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s6)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s6)
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s7)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s8)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s8)
-}
-
-func addPanicFormatterTests() {
-	// Type that panics in its Stringer interface.
-	v := panicer(127)
-	nv := (*panicer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.panicer"
-	vs := "(PANIC=test panic)127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addErrorFormatterTests() {
-	// Type that has a custom Error interface.
-	v := customError(127)
-	nv := (*customError)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.customError"
-	vs := "error: 127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addPassthroughFormatterTests() {
-	// %x passthrough with uint.
-	v := uint(4294967295)
-	pv := &v
-	vAddr := fmt.Sprintf("%x", pv)
-	pvAddr := fmt.Sprintf("%x", &pv)
-	vs := "ffffffff"
-	addFormatterTest("%x", v, vs)
-	addFormatterTest("%x", pv, vAddr)
-	addFormatterTest("%x", &pv, pvAddr)
-
-	// %#x passthrough with uint.
-	v2 := int(2147483647)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%#x", pv2)
-	pv2Addr := fmt.Sprintf("%#x", &pv2)
-	v2s := "0x7fffffff"
-	addFormatterTest("%#x", v2, v2s)
-	addFormatterTest("%#x", pv2, v2Addr)
-	addFormatterTest("%#x", &pv2, pv2Addr)
-
-	// %f passthrough with precision.
-	addFormatterTest("%.2f", 3.1415, "3.14")
-	addFormatterTest("%.3f", 3.1415, "3.142")
-	addFormatterTest("%.4f", 3.1415, "3.1415")
-
-	// %f passthrough with width and precision.
-	addFormatterTest("%5.2f", 3.1415, " 3.14")
-	addFormatterTest("%6.3f", 3.1415, " 3.142")
-	addFormatterTest("%7.4f", 3.1415, " 3.1415")
-
-	// %d passthrough with width.
-	addFormatterTest("%3d", 127, "127")
-	addFormatterTest("%4d", 127, " 127")
-	addFormatterTest("%5d", 127, "  127")
-
-	// %q passthrough with string.
-	addFormatterTest("%q", "test", "\"test\"")
-}
-
-// TestFormatter executes all of the tests described by formatterTests.
-func TestFormatter(t *testing.T) {
-	// Setup tests.
-	addIntFormatterTests()
-	addUintFormatterTests()
-	addBoolFormatterTests()
-	addFloatFormatterTests()
-	addComplexFormatterTests()
-	addArrayFormatterTests()
-	addSliceFormatterTests()
-	addStringFormatterTests()
-	addInterfaceFormatterTests()
-	addMapFormatterTests()
-	addStructFormatterTests()
-	addUintptrFormatterTests()
-	addUnsafePointerFormatterTests()
-	addChanFormatterTests()
-	addFuncFormatterTests()
-	addCircularFormatterTests()
-	addPanicFormatterTests()
-	addErrorFormatterTests()
-	addPassthroughFormatterTests()
-
-	t.Logf("Running %d tests", len(formatterTests))
-	for i, test := range formatterTests {
-		buf := new(bytes.Buffer)
-		spew.Fprintf(buf, test.format, test.in)
-		s := buf.String()
-		if testFailed(s, test.wants) {
-			t.Errorf("Formatter #%d format: %s got: %s %s", i, test.format, s,
-				stringizeWants(test.wants))
-			continue
-		}
-	}
-}
-
-func TestPrintSortedKeys(t *testing.T) {
-	cfg := spew.ConfigState{SortKeys: true}
-	s := cfg.Sprint(map[int]string{1: "1", 3: "3", 2: "2"})
-	expected := "map[1:1 2:2 3:3]"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/internal_test.go b/vendor/github.com/davecgh/go-spew/spew/internal_test.go
deleted file mode 100644
index d8c976163..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/internal_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-This test file is part of the spew package rather than than the spew_test
-package because it needs access to internals to properly test certain cases
-which are not possible via the public interface since they should never happen.
-*/
-
-package spew
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-	"unsafe"
-)
-
-// dummyFmtState implements a fake fmt.State to use for testing invalid
-// reflect.Value handling.  This is necessary because the fmt package catches
-// invalid values before invoking the formatter on them.
-type dummyFmtState struct {
-	bytes.Buffer
-}
-
-func (dfs *dummyFmtState) Flag(f int) bool {
-	if f == int('+') {
-		return true
-	}
-	return false
-}
-
-func (dfs *dummyFmtState) Precision() (int, bool) {
-	return 0, false
-}
-
-func (dfs *dummyFmtState) Width() (int, bool) {
-	return 0, false
-}
-
-// TestInvalidReflectValue ensures the dump and formatter code handles an
-// invalid reflect value properly.  This needs access to internal state since it
-// should never happen in real code and therefore can't be tested via the public
-// API.
-func TestInvalidReflectValue(t *testing.T) {
-	i := 1
-
-	// Dump invalid reflect value.
-	v := new(reflect.Value)
-	buf := new(bytes.Buffer)
-	d := dumpState{w: buf, cs: &Config}
-	d.dump(*v)
-	s := buf.String()
-	want := "<invalid>"
-	if s != want {
-		t.Errorf("InvalidReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter invalid reflect value.
-	buf2 := new(dummyFmtState)
-	f := formatState{value: *v, cs: &Config, fs: buf2}
-	f.format(*v)
-	s = buf2.String()
-	want = "<invalid>"
-	if s != want {
-		t.Errorf("InvalidReflectValue #%d got: %s want: %s", i, s, want)
-	}
-}
-
-// flagRO, flagKindShift and flagKindWidth indicate various bit flags that the
-// reflect package uses internally to track kind and state information.
-const flagRO = 1 << 0
-const flagKindShift = 4
-const flagKindWidth = 5
-
-// changeKind uses unsafe to intentionally change the kind of a reflect.Value to
-// the maximum kind value which does not exist.  This is needed to test the
-// fallback code which punts to the standard fmt library for new types that
-// might get added to the language.
-func changeKind(v *reflect.Value, readOnly bool) {
-	rvf := (*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(v)) +
-		unsafe.Offsetof(reflectValue.flag)))
-	*rvf = *rvf | ((1<<flagKindWidth - 1) << flagKindShift)
-	if readOnly {
-		*rvf |= flagRO
-	} else {
-		*rvf &= ^uintptr(flagRO)
-	}
-}
-
-// TestAddedReflectValue tests functionaly of the dump and formatter code which
-// falls back to the standard fmt library for new types that might get added to
-// the language.
-func TestAddedReflectValue(t *testing.T) {
-	i := 1
-
-	// Dump using a reflect.Value that is exported.
-	v := reflect.ValueOf(int8(5))
-	changeKind(&v, false)
-	buf := new(bytes.Buffer)
-	d := dumpState{w: buf, cs: &Config}
-	d.dump(v)
-	s := buf.String()
-	want := "(int8) 5"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Dump using a reflect.Value that is not exported.
-	changeKind(&v, true)
-	buf.Reset()
-	d.dump(v)
-	s = buf.String()
-	want = "(int8) <int8 Value>"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter using a reflect.Value that is exported.
-	changeKind(&v, false)
-	buf2 := new(dummyFmtState)
-	f := formatState{value: v, cs: &Config, fs: buf2}
-	f.format(v)
-	s = buf2.String()
-	want = "5"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter using a reflect.Value that is not exported.
-	changeKind(&v, true)
-	buf2.Reset()
-	f = formatState{value: v, cs: &Config, fs: buf2}
-	f.format(v)
-	s = buf2.String()
-	want = "<int8 Value>"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d got: %s want: %s", i, s, want)
-	}
-}
-
-// SortValues makes the internal sortValues function available to the test
-// package.
-func SortValues(values []reflect.Value) {
-	sortValues(values)
-}
diff --git a/vendor/github.com/davecgh/go-spew/spew/spew_test.go b/vendor/github.com/davecgh/go-spew/spew/spew_test.go
deleted file mode 100644
index bbb531b12..000000000
--- a/vendor/github.com/davecgh/go-spew/spew/spew_test.go
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright (c) 2013 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/davecgh/go-spew/spew"
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// spewFunc is used to identify which public function of the spew package or
-// ConfigState a test applies to.
-type spewFunc int
-
-const (
-	fCSFdump spewFunc = iota
-	fCSFprint
-	fCSFprintf
-	fCSFprintln
-	fCSPrint
-	fCSPrintln
-	fCSSdump
-	fCSSprint
-	fCSSprintf
-	fCSSprintln
-	fCSErrorf
-	fCSNewFormatter
-	fErrorf
-	fFprint
-	fFprintln
-	fPrint
-	fPrintln
-	fSdump
-	fSprint
-	fSprintf
-	fSprintln
-)
-
-// Map of spewFunc values to names for pretty printing.
-var spewFuncStrings = map[spewFunc]string{
-	fCSFdump:        "ConfigState.Fdump",
-	fCSFprint:       "ConfigState.Fprint",
-	fCSFprintf:      "ConfigState.Fprintf",
-	fCSFprintln:     "ConfigState.Fprintln",
-	fCSSdump:        "ConfigState.Sdump",
-	fCSPrint:        "ConfigState.Print",
-	fCSPrintln:      "ConfigState.Println",
-	fCSSprint:       "ConfigState.Sprint",
-	fCSSprintf:      "ConfigState.Sprintf",
-	fCSSprintln:     "ConfigState.Sprintln",
-	fCSErrorf:       "ConfigState.Errorf",
-	fCSNewFormatter: "ConfigState.NewFormatter",
-	fErrorf:         "spew.Errorf",
-	fFprint:         "spew.Fprint",
-	fFprintln:       "spew.Fprintln",
-	fPrint:          "spew.Print",
-	fPrintln:        "spew.Println",
-	fSdump:          "spew.Sdump",
-	fSprint:         "spew.Sprint",
-	fSprintf:        "spew.Sprintf",
-	fSprintln:       "spew.Sprintln",
-}
-
-func (f spewFunc) String() string {
-	if s, ok := spewFuncStrings[f]; ok {
-		return s
-	}
-	return fmt.Sprintf("Unknown spewFunc (%d)", int(f))
-}
-
-// spewTest is used to describe a test to be performed against the public
-// functions of the spew package or ConfigState.
-type spewTest struct {
-	cs     *spew.ConfigState
-	f      spewFunc
-	format string
-	in     interface{}
-	want   string
-}
-
-// spewTests houses the tests to be performed against the public functions of
-// the spew package and ConfigState.
-//
-// These tests are only intended to ensure the public functions are exercised
-// and are intentionally not exhaustive of types.  The exhaustive type
-// tests are handled in the dump and format tests.
-var spewTests []spewTest
-
-// redirStdout is a helper function to return the standard output from f as a
-// byte slice.
-func redirStdout(f func()) ([]byte, error) {
-	tempFile, err := ioutil.TempFile("", "ss-test")
-	if err != nil {
-		return nil, err
-	}
-	fileName := tempFile.Name()
-	defer os.Remove(fileName) // Ignore error
-
-	origStdout := os.Stdout
-	os.Stdout = tempFile
-	f()
-	os.Stdout = origStdout
-	tempFile.Close()
-
-	return ioutil.ReadFile(fileName)
-}
-
-func initSpewTests() {
-	// Config states with various settings.
-	scsDefault := spew.NewDefaultConfig()
-	scsNoMethods := &spew.ConfigState{Indent: " ", DisableMethods: true}
-	scsNoPmethods := &spew.ConfigState{Indent: " ", DisablePointerMethods: true}
-	scsMaxDepth := &spew.ConfigState{Indent: " ", MaxDepth: 1}
-	scsContinue := &spew.ConfigState{Indent: " ", ContinueOnMethod: true}
-
-	// Variables for tests on types which implement Stringer interface with and
-	// without a pointer receiver.
-	ts := stringer("test")
-	tps := pstringer("test")
-
-	// depthTester is used to test max depth handling for structs, array, slices
-	// and maps.
-	type depthTester struct {
-		ic    indirCir1
-		arr   [1]string
-		slice []string
-		m     map[string]int
-	}
-	dt := depthTester{indirCir1{nil}, [1]string{"arr"}, []string{"slice"},
-		map[string]int{"one": 1}}
-
-	// Variable for tests on types which implement error interface.
-	te := customError(10)
-
-	spewTests = []spewTest{
-		{scsDefault, fCSFdump, "", int8(127), "(int8) 127\n"},
-		{scsDefault, fCSFprint, "", int16(32767), "32767"},
-		{scsDefault, fCSFprintf, "%v", int32(2147483647), "2147483647"},
-		{scsDefault, fCSFprintln, "", int(2147483647), "2147483647\n"},
-		{scsDefault, fCSPrint, "", int64(9223372036854775807), "9223372036854775807"},
-		{scsDefault, fCSPrintln, "", uint8(255), "255\n"},
-		{scsDefault, fCSSdump, "", uint8(64), "(uint8) 64\n"},
-		{scsDefault, fCSSprint, "", complex(1, 2), "(1+2i)"},
-		{scsDefault, fCSSprintf, "%v", complex(float32(3), 4), "(3+4i)"},
-		{scsDefault, fCSSprintln, "", complex(float64(5), 6), "(5+6i)\n"},
-		{scsDefault, fCSErrorf, "%#v", uint16(65535), "(uint16)65535"},
-		{scsDefault, fCSNewFormatter, "%v", uint32(4294967295), "4294967295"},
-		{scsDefault, fErrorf, "%v", uint64(18446744073709551615), "18446744073709551615"},
-		{scsDefault, fFprint, "", float32(3.14), "3.14"},
-		{scsDefault, fFprintln, "", float64(6.28), "6.28\n"},
-		{scsDefault, fPrint, "", true, "true"},
-		{scsDefault, fPrintln, "", false, "false\n"},
-		{scsDefault, fSdump, "", complex(-10, -20), "(complex128) (-10-20i)\n"},
-		{scsDefault, fSprint, "", complex(-1, -2), "(-1-2i)"},
-		{scsDefault, fSprintf, "%v", complex(float32(-3), -4), "(-3-4i)"},
-		{scsDefault, fSprintln, "", complex(float64(-5), -6), "(-5-6i)\n"},
-		{scsNoMethods, fCSFprint, "", ts, "test"},
-		{scsNoMethods, fCSFprint, "", &ts, "<*>test"},
-		{scsNoMethods, fCSFprint, "", tps, "test"},
-		{scsNoMethods, fCSFprint, "", &tps, "<*>test"},
-		{scsNoPmethods, fCSFprint, "", ts, "stringer test"},
-		{scsNoPmethods, fCSFprint, "", &ts, "<*>stringer test"},
-		{scsNoPmethods, fCSFprint, "", tps, "test"},
-		{scsNoPmethods, fCSFprint, "", &tps, "<*>stringer test"},
-		{scsMaxDepth, fCSFprint, "", dt, "{{<max>} [<max>] [<max>] map[<max>]}"},
-		{scsMaxDepth, fCSFdump, "", dt, "(spew_test.depthTester) {\n" +
-			" ic: (spew_test.indirCir1) {\n  <max depth reached>\n },\n" +
-			" arr: ([1]string) {\n  <max depth reached>\n },\n" +
-			" slice: ([]string) {\n  <max depth reached>\n },\n" +
-			" m: (map[string]int) {\n  <max depth reached>\n }\n}\n"},
-		{scsContinue, fCSFprint, "", ts, "(stringer test) test"},
-		{scsContinue, fCSFdump, "", ts, "(spew_test.stringer) " +
-			"(stringer test) \"test\"\n"},
-		{scsContinue, fCSFprint, "", te, "(error: 10) 10"},
-		{scsContinue, fCSFdump, "", te, "(spew_test.customError) " +
-			"(error: 10) 10\n"},
-	}
-}
-
-// TestSpew executes all of the tests described by spewTests.
-func TestSpew(t *testing.T) {
-	initSpewTests()
-
-	t.Logf("Running %d tests", len(spewTests))
-	for i, test := range spewTests {
-		buf := new(bytes.Buffer)
-		switch test.f {
-		case fCSFdump:
-			test.cs.Fdump(buf, test.in)
-
-		case fCSFprint:
-			test.cs.Fprint(buf, test.in)
-
-		case fCSFprintf:
-			test.cs.Fprintf(buf, test.format, test.in)
-
-		case fCSFprintln:
-			test.cs.Fprintln(buf, test.in)
-
-		case fCSPrint:
-			b, err := redirStdout(func() { test.cs.Print(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fCSPrintln:
-			b, err := redirStdout(func() { test.cs.Println(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fCSSdump:
-			str := test.cs.Sdump(test.in)
-			buf.WriteString(str)
-
-		case fCSSprint:
-			str := test.cs.Sprint(test.in)
-			buf.WriteString(str)
-
-		case fCSSprintf:
-			str := test.cs.Sprintf(test.format, test.in)
-			buf.WriteString(str)
-
-		case fCSSprintln:
-			str := test.cs.Sprintln(test.in)
-			buf.WriteString(str)
-
-		case fCSErrorf:
-			err := test.cs.Errorf(test.format, test.in)
-			buf.WriteString(err.Error())
-
-		case fCSNewFormatter:
-			fmt.Fprintf(buf, test.format, test.cs.NewFormatter(test.in))
-
-		case fErrorf:
-			err := spew.Errorf(test.format, test.in)
-			buf.WriteString(err.Error())
-
-		case fFprint:
-			spew.Fprint(buf, test.in)
-
-		case fFprintln:
-			spew.Fprintln(buf, test.in)
-
-		case fPrint:
-			b, err := redirStdout(func() { spew.Print(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fPrintln:
-			b, err := redirStdout(func() { spew.Println(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fSdump:
-			str := spew.Sdump(test.in)
-			buf.WriteString(str)
-
-		case fSprint:
-			str := spew.Sprint(test.in)
-			buf.WriteString(str)
-
-		case fSprintf:
-			str := spew.Sprintf(test.format, test.in)
-			buf.WriteString(str)
-
-		case fSprintln:
-			str := spew.Sprintln(test.in)
-			buf.WriteString(str)
-
-		default:
-			t.Errorf("%v #%d unrecognized function", test.f, i)
-			continue
-		}
-		s := buf.String()
-		if test.want != s {
-			t.Errorf("ConfigState #%d\n got: %s want: %s", i, s, test.want)
-			continue
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/.gitignore b/vendor/github.com/gocql/gocql/.gitignore
deleted file mode 100644
index 22f57be40..000000000
--- a/vendor/github.com/gocql/gocql/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-gocql-fuzz
-fuzz-corpus
-fuzz-work
-gocql.test
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/.travis.yml b/vendor/github.com/gocql/gocql/.travis.yml
deleted file mode 100644
index 5a5602280..000000000
--- a/vendor/github.com/gocql/gocql/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-language: go
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.ccm/repository
-
-matrix:
-  fast_finish: true
-
-env:
-  global:
-    - GOMAXPROCS=2
-  matrix:
-    - CASS=1.2.19 AUTH=false
-    - CASS=2.0.14 AUTH=false
-    - CASS=2.1.5  AUTH=false
-    - CASS=2.1.5  AUTH=true
-
-go:
-  - 1.3
-  - 1.4
-
-install:
-  - pip install --user cql PyYAML six
-  - go get golang.org/x/tools/cmd/vet
-  - go get golang.org/x/tools/cmd/cover
-  - git clone https://github.com/pcmanus/ccm.git
-  - pushd ccm
-  - ./setup.py install --user
-  - popd
-  - go get .
-
-script:
-  - set -e
-  - go test -v -tags unit
-  - PATH=$PATH:$HOME/.local/bin bash -x integration.sh $CASS $AUTH
-  - go vet .
-
-notifications:
-  - email: false
diff --git a/vendor/github.com/gocql/gocql/AUTHORS b/vendor/github.com/gocql/gocql/AUTHORS
deleted file mode 100644
index f125b3f97..000000000
--- a/vendor/github.com/gocql/gocql/AUTHORS
+++ /dev/null
@@ -1,54 +0,0 @@
-# This source file refers to The gocql Authors for copyright purposes.
-
-Christoph Hack <christoph@tux21b.org>
-Jonathan Rudenberg <jonathan@titanous.com>
-Thorsten von Eicken <tve@rightscale.com>
-Matt Robenolt <mattr@disqus.com>
-Phillip Couto <phillip.couto@stemstudios.com>
-Niklas Korz <korz.niklask@gmail.com>
-Nimi Wariboko Jr <nimi@channelmeter.com>
-Ghais Issa <ghais.issa@gmail.com>
-Sasha Klizhentas <klizhentas@gmail.com>
-Konstantin Cherkasov <k.cherkasoff@gmail.com>
-Ben Hood <0x6e6562@gmail.com>
-Pete Hopkins <phopkins@gmail.com>
-Chris Bannister <c.bannister@gmail.com>
-Maxim Bublis <b@codemonkey.ru>
-Alex Zorin <git@zor.io>
-Kasper Middelboe Petersen <me@phant.dk>
-Harpreet Sawhney <harpreet.sawhney@gmail.com>
-Charlie Andrews <charlieandrews.cwa@gmail.com>
-Stanislavs Koikovs <stanislavs.koikovs@gmail.com>
-Dan Forest <bonjour@dan.tf>
-Miguel Serrano <miguelvps@gmail.com>
-Stefan Radomski <gibheer@zero-knowledge.org>
-Josh Wright <jshwright@gmail.com>
-Jacob Rhoden <jacob.rhoden@gmail.com>
-Ben Frye <benfrye@gmail.com>
-Fred McCann <fred@sharpnoodles.com>
-Dan Simmons <dan@simmons.io>
-Muir Manders <muir@retailnext.net>
-Sankar P <sankar.curiosity@gmail.com>
-Julien Da Silva <julien.dasilva@gmail.com>
-Dan Kennedy <daniel@firstcs.co.uk>
-Nick Dhupia<nick.dhupia@gmail.com>
-Yasuharu Goto <matope.ono@gmail.com>
-Jeremy Schlatter <jeremy.schlatter@gmail.com>
-Matthias Kadenbach <matthias.kadenbach@gmail.com>
-Dean Elbaz <elbaz.dean@gmail.com>
-Mike Berman <evencode@gmail.com>
-Dmitriy Fedorenko <c0va23@gmail.com>
-Zach Marcantel <zmarcantel@gmail.com>
-James Maloney <jamessagan@gmail.com>
-Ashwin Purohit <purohit@gmail.com>
-Dan Kinder <dkinder.is.me@gmail.com>
-Oliver Beattie <oliver@obeattie.com>
-Justin Corpron <justin@retailnext.com>
-Miles Delahunty <miles.delahunty@gmail.com>
-Zach Badgett <zach.badgett@gmail.com>
-Maciek Sakrejda <maciek@heroku.com>
-Jeff Mitchell <jeffrey.mitchell@gmail.com>
-Baptiste Fontaine <b@ptistefontaine.fr>
-Matt Heath <matt@mattheath.com>
-Jamie Cuthill <jamie.cuthill@gmail.com>
-Adrian Casajus <adriancasajus@gmail.com>
diff --git a/vendor/github.com/gocql/gocql/CONTRIBUTING.md b/vendor/github.com/gocql/gocql/CONTRIBUTING.md
deleted file mode 100644
index e149322bb..000000000
--- a/vendor/github.com/gocql/gocql/CONTRIBUTING.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Contributing to gocql
-
-**TL;DR** - this manifesto sets out the bare mimimum requirements for submitting a patch to gocql.
-
-This guide outlines the process of landing patches in gocql and the general approach to maintaining the code base.
-
-## Background
-
-The goal of the gocql project is to provide a stable and robust CQL driver for Golang. gocql is a community driven project that is coordinated by a small team of core developers.
-
-## Minimum Requirement Checklist
-
-The following is a check list of requirements that need to be satisfied in order for us to merge your patch:
-
-* You should raise a pull request to gocql/gocql on Github
-* The pull request has a title that clearly summarizes the purpose of the patch
-* The motivation behind the patch is clearly defined in the pull request summary
-* Your name and email have been added to the `AUTHORS` file (for copyright purposes)
-* The patch will merge cleanly
-* The test coverage does not fall below the critical threshold (currently 64%) 
-* The merge commit passes the regression test suite on Travis
-* `go fmt` has been applied to the submitted code
-* Functional changes (i.e. new features or changed behavior) are appropriately documented, either as a godoc or in the README (non-functional changes such as bug fixes may not require documentation)
-
-If there are any requirements that can't be reasonably satifisfied, please state this either on the pull request or as part of discussion on the mailing list. Where appropriate, the core team may apply discretion and make an exception to these requirements.
-
-## Beyond The Checklist
-
-In addition to stating the hard requirements, there are a bunch of things that we consider when assessing changes to the library. These soft requirements are helpful pointers of how to get a patch landed quicker and with less fuss.
-
-### General QA Approach
-
-The gocql team needs to consider the ongoing maintainability of the library at all times. Patches that look like they will introduce maintenance issues for the team will not be accepted.
-
-Your patch will get merged quicker if you have decent test cases that provide test coverage for the new behavior you wish to introduce.
-
-Unit tests are good, integration tests are even better. An example of a unit test is `marshal_test.go` - this tests the serialization code in isolation. `cassandra_test.go` is an integration test suite that is executed against every version of Cassandra that gocql supports as part of the CI process on Travis.
-
-That said, the point of writing tests is to provide a safety net to catch regressions, so there is no need to go overboard with tests. Remember that the more tests you write, the more code we will have to maintain. So there's a balance to strike there.
-
-### When It's Too Difficult To Automate Testing
-
-There are legitimate examples of where it is infeasible to write a regression test for a change. Never fear, we will still consider the patch and quite possibly accept the change without a test. The gocql team takes a pragmatic approach to testing. At the end of the day, you could be addressing an issue that is too difficult to reproduce in a test suite, but still occurs in a real production app. In this case, your production app is the test case, and we will have to trust that your change is good.
-
-Examples of pull requests that have been accepted without tests include:
-
-* https://github.com/gocql/gocql/pull/181 - this patch would otherwise require a multi-node cluster to be booted as part of the CI build
-* https://github.com/gocql/gocql/pull/179 - this bug can only be reproduced under heavy load in certain circumstances
-
-### Sign Off Procedure
-
-Generally speaking, a pull request can get merged by any one of the core gocql team. If your change is minor, chances are that one team member will just go ahead and merge it there and then. As stated earlier, suitable test coverage will increase the likelihood that a single reviewer will assess and merge your change. If your change has no test coverage, or looks like it may have wider implications for the health and stability of the library, the reviewer may elect to refer the change to another team member to acheive consensus before proceeding. Therefore, the tighter and cleaner your patch is, the quicker it will go through the review process.
-
-### Supported Features
-
-gocql is a low level wire driver for Cassandra CQL. By and large, we would like to keep the functional scope of the library as narrow as possible. We think that gocql should be tight and focussed, and we will be naturally sceptical of things that could just as easily be implemented in a higher layer. Inevitably you will come accross something that could be implemented in a higher layer, save for a minor change to the core API. In this instance, please strike up a conversation with the gocql team. Chances are we will understand what you are trying to acheive and will try to accommodate this in a maintainable way.
-
-### Longer Term Evolution
-
-There are some long term plans for gocql that have to be taken into account when assessing changes. That said, gocql is ultimately a community driven project and we don't have a massive development budget, so sometimes the long term view might need to be de-prioritized ahead of short term changes.
-
-## Officially Supported Server Versions
-
-Currently, the officiallly supported versions of the Cassandra server include:
-
-* 1.2.18
-* 2.0.9
-
-Chances are that gocql will work with many other versions. If you would like us to support a particular version of Cassandra, please start a conversation about what version you'd like us to consider. We are more likely to accept a new version if you help out by extending the regression suite to cover the new version to be supported.
-
-## The Core Dev Team
-
-The core development team includes:
-
-* tux21b
-* phillipCouto
-* Zariel
-* 0x6e6562
diff --git a/vendor/github.com/gocql/gocql/LICENSE b/vendor/github.com/gocql/gocql/LICENSE
deleted file mode 100644
index 18d25f923..000000000
--- a/vendor/github.com/gocql/gocql/LICENSE
+++ /dev/null
@@ -1,27 +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.
diff --git a/vendor/github.com/gocql/gocql/README.md b/vendor/github.com/gocql/gocql/README.md
deleted file mode 100644
index a7e17371c..000000000
--- a/vendor/github.com/gocql/gocql/README.md
+++ /dev/null
@@ -1,197 +0,0 @@
-gocql
-=====
-
-[![Join the chat at https://gitter.im/gocql/gocql](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gocql/gocql?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/gocql/gocql.png?branch=master)](https://travis-ci.org/gocql/gocql)
-[![GoDoc](http://godoc.org/github.com/gocql/gocql?status.png)](http://godoc.org/github.com/gocql/gocql)
-
-Package gocql implements a fast and robust Cassandra client for the
-Go programming language.
-
-Project Website: http://gocql.github.io/<br>
-API documentation: http://godoc.org/github.com/gocql/gocql<br>
-Discussions: https://groups.google.com/forum/#!forum/gocql
-
-Supported Versions
-------------------
-
-The following matrix shows the versions of Go and Cassandra that are tested with the integration test suite as part of the CI build:
-
-Go/Cassandra | 1.2.19 | 2.0.14 | 2.1.5
--------------| -------| ------| ---------
-1.3  | yes | yes | yes
-1.4  | yes | yes | yes
-
-
-Sunsetting Model
-----------------
-
-In general, the gocql team will focus on supporting the current and previous versions of Golang. gocql may still work with older versions of Golang, but offical support for these versions will have been sunset.
-
-Installation
-------------
-
-    go get github.com/gocql/gocql
-
-
-Features
---------
-
-* Modern Cassandra client using the native transport
-* Automatic type conversations between Cassandra and Go
-  * Support for all common types including sets, lists and maps
-  * Custom types can implement a `Marshaler` and `Unmarshaler` interface
-  * Strict type conversations without any loss of precision
-  * Built-In support for UUIDs (version 1 and 4)
-* Support for logged, unlogged and counter batches
-* Cluster management
-  * Automatic reconnect on connection failures with exponential falloff
-  * Round robin distribution of queries to different hosts
-  * Round robin distribution of queries to different connections on a host
-  * Each connection can execute up to n concurrent queries (whereby n is the limit set by the protocol version the client chooses to use)
-  * Optional automatic discovery of nodes
-  * Optional support for periodic node discovery via system.peers
-  * Policy based connection pool with token aware and round-robin policy implementations
-* Support for password authentication
-* Iteration over paged results with configurable page size
-* Support for TLS/SSL
-* Optional frame compression (using snappy)
-* Automatic query preparation
-* Support for query tracing
-* Experimental support for [binary protocol version 3](https://github.com/apache/cassandra/blob/trunk/doc/native_protocol_v3.spec)
-  * Support for up to 32768 streams
-  * Support for tuple types
-  * Support for client side timestamps by default
-  * Support for UDTs via a custom marshaller or struct tags
-* An API to access the schema metadata of a given keyspace
-
-Please visit the [Roadmap](https://github.com/gocql/gocql/wiki/Roadmap) page to see what is on the horizion.
-
-Important Default Keyspace Changes
-----------------------------------
-gocql no longer supports executing "use <keyspace>" statements to simplfy the library. The user still has the
-ability to define the default keyspace for connections but now the keyspace can only be defined before a
-session is created. Queries can still access keyspaces by indicating the keyspace in the query:
-```sql
-SELECT * FROM example2.table;
-```
-
-Example of correct usage:
-```go
-	cluster := gocql.NewCluster("192.168.1.1", "192.168.1.2", "192.168.1.3")
-	cluster.Keyspace = "example"
-	...
-	session, err := cluster.CreateSession()
-
-```
-Example of incorrect usage:
-```go
-	cluster := gocql.NewCluster("192.168.1.1", "192.168.1.2", "192.168.1.3")
-	cluster.Keyspace = "example"
-	...
-	session, err := cluster.CreateSession()
-
-	if err = session.Query("use example2").Exec(); err != nil {
-		log.Fatal(err)
-	}
-```
-This will result in an err being returned from the session.Query line as the user is trying to execute a "use"
-statement. 
-
-Example
--------
-
-```go
-/* Before you execute the program, Launch `cqlsh` and execute:
-create keyspace example with replication = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
-create table example.tweet(timeline text, id UUID, text text, PRIMARY KEY(id));
-create index on example.tweet(timeline);
-*/
-package main
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/gocql/gocql"
-)
-
-func main() {
-	// connect to the cluster
-	cluster := gocql.NewCluster("192.168.1.1", "192.168.1.2", "192.168.1.3")
-	cluster.Keyspace = "example"
-	cluster.Consistency = gocql.Quorum
-	session, _ := cluster.CreateSession()
-	defer session.Close()
-
-	// insert a tweet
-	if err := session.Query(`INSERT INTO tweet (timeline, id, text) VALUES (?, ?, ?)`,
-		"me", gocql.TimeUUID(), "hello world").Exec(); err != nil {
-		log.Fatal(err)
-	}
-
-	var id gocql.UUID
-	var text string
-
-	/* Search for a specific set of records whose 'timeline' column matches
-	 * the value 'me'. The secondary index that we created earlier will be
-	 * used for optimizing the search */
-	if err := session.Query(`SELECT id, text FROM tweet WHERE timeline = ? LIMIT 1`,
-		"me").Consistency(gocql.One).Scan(&id, &text); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println("Tweet:", id, text)
-
-	// list all tweets
-	iter := session.Query(`SELECT id, text FROM tweet WHERE timeline = ?`, "me").Iter()
-	for iter.Scan(&id, &text) {
-		fmt.Println("Tweet:", id, text)
-	}
-	if err := iter.Close(); err != nil {
-		log.Fatal(err)
-	}
-}
-```
-
-Data Binding
-------------
-
-There are various ways to bind application level data structures to CQL statements:
-
-* You can write the data binding by hand, as outlined in the Tweet example. This provides you with the greatest flexibility, but it does mean that you need to keep your application code in sync with your Cassandra schema.
-* You can dynamically marshal an entire query result into an `[]map[string]interface{}` using the `SliceMap()` API. This returns a slice of row maps keyed by CQL column mames. This method requires no special interaction with the gocql API, but it does require your application to be able to deal with a key value view of your data.
-* As a refinement on the `SliceMap()` API you can also call `MapScan()` which returns `map[string]interface{}` instances in a row by row fashion.
-* The `Bind()` API provides a client app with a low level mechanism to introspect query meta data and extract appropriate field values from application level data structures.
-* Building on top of the gocql driver, [cqlr](https://github.com/relops/cqlr) adds the ability to auto-bind a CQL iterator to a struct or to bind a struct to an INSERT statement.
-* Another external project that layers on top of gocql is [cqlc](http://relops.com/cqlc) which generates gocql compliant code from your Cassandra schema so that you can write type safe CQL statements in Go with a natural query syntax.
-* [gocassa](https://github.com/hailocab/gocassa) is an external project that layers on top of gocql to provide convenient query building and data binding.
-* [gocqltable](https://github.com/elvtechnology/gocqltable) provides an ORM-style convenience layer to make CRUD operations with gocql easier.
-
-Ecosphere
----------
-
-The following community maintained tools are known to integrate with gocql:
-
-* [migrate](https://github.com/mattes/migrate) is a migration handling tool written in Go with Cassandra support.
-* [negronicql](https://github.com/mikebthun/negronicql) is gocql middleware for Negroni.
-* [cqlr](https://github.com/relops/cqlr) adds the ability to auto-bind a CQL iterator to a struct or to bind a struct to an INSERT statement.
-* [cqlc](http://relops.com/cqlc) which generates gocql compliant code from your Cassandra schema so that you can write type safe CQL statements in Go with a natural query syntax.
-* [gocassa](https://github.com/hailocab/gocassa) provides query building, adds data binding, and provides easy-to-use "recipe" tables for common query use-cases.
-* [gocqltable](https://github.com/elvtechnology/gocqltable) is a wrapper around gocql that aims to simplify common operations whilst working the library.
-
-Other Projects
---------------
-
-* [gocqldriver](https://github.com/tux21b/gocqldriver) is the predecessor of gocql based on Go's "database/sql" package. This project isn't maintained anymore, because Cassandra wasn't a good fit for the traditional "database/sql" API. Use this package instead.
-
-SEO
----
-
-For some reason, when you google `golang cassandra`, this project doesn't feature very highly in the result list. But if you google `go cassandra`, then we're a bit higher up the list. So this is note to try to convince Google that Golang is an alias for Go.
-
-License
--------
-
-> Copyright (c) 2012-2015 The gocql Authors. All rights reserved.
-> Use of this source code is governed by a BSD-style
-> license that can be found in the LICENSE file.
diff --git a/vendor/github.com/gocql/gocql/cass1batch_test.go b/vendor/github.com/gocql/gocql/cass1batch_test.go
deleted file mode 100644
index 35750a41d..000000000
--- a/vendor/github.com/gocql/gocql/cass1batch_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestProto1BatchInsert(t *testing.T) {
-	session := createSession(t)
-	if err := session.Query("CREATE TABLE large (id int primary key)").Exec(); err != nil {
-		t.Fatal("create table:", err)
-	}
-	defer session.Close()
-
-	begin := "BEGIN BATCH"
-	end := "APPLY BATCH"
-	query := "INSERT INTO large (id) VALUES (?)"
-	fullQuery := strings.Join([]string{begin, query, end}, "\n")
-	args := []interface{}{5}
-	if err := session.Query(fullQuery, args...).Consistency(Quorum).Exec(); err != nil {
-		t.Fatal(err)
-	}
-
-}
-
-func TestShouldPrepareFunction(t *testing.T) {
-	var shouldPrepareTests = []struct {
-		Stmt   string
-		Result bool
-	}{
-		{`
-      BEGIN BATCH
-        INSERT INTO users (userID, password)
-        VALUES ('smith', 'secret')
-      APPLY BATCH
-    ;
-      `, true},
-		{`INSERT INTO users (userID, password, name) VALUES ('user2', 'ch@ngem3b', 'second user')`, true},
-		{`BEGIN COUNTER BATCH UPDATE stats SET views = views + 1 WHERE pageid = 1 APPLY BATCH`, true},
-		{`delete name from users where userID = 'smith';`, true},
-		{`  UPDATE users SET password = 'secret' WHERE userID = 'smith'   `, true},
-		{`CREATE TABLE users (
-        user_name varchar PRIMARY KEY,
-        password varchar,
-        gender varchar,
-        session_token varchar,
-        state varchar,
-        birth_year bigint
-      );`, false},
-	}
-
-	for _, test := range shouldPrepareTests {
-		q := &Query{stmt: test.Stmt}
-		if got := q.shouldPrepare(); got != test.Result {
-			t.Fatalf("%q: got %v, expected %v\n", test.Stmt, got, test.Result)
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/cassandra_test.go b/vendor/github.com/gocql/gocql/cassandra_test.go
deleted file mode 100644
index 31cbc1136..000000000
--- a/vendor/github.com/gocql/gocql/cassandra_test.go
+++ /dev/null
@@ -1,2060 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"log"
-	"math"
-	"math/big"
-	"net"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-	"unicode"
-
-	"gopkg.in/inf.v0"
-)
-
-var (
-	flagCluster      = flag.String("cluster", "127.0.0.1", "a comma-separated list of host:port tuples")
-	flagProto        = flag.Int("proto", 2, "protcol version")
-	flagCQL          = flag.String("cql", "3.0.0", "CQL version")
-	flagRF           = flag.Int("rf", 1, "replication factor for test keyspace")
-	clusterSize      = flag.Int("clusterSize", 1, "the expected size of the cluster")
-	flagRetry        = flag.Int("retries", 5, "number of times to retry queries")
-	flagAutoWait     = flag.Duration("autowait", 1000*time.Millisecond, "time to wait for autodiscovery to fill the hosts poll")
-	flagRunSslTest   = flag.Bool("runssl", false, "Set to true to run ssl test")
-	flagRunAuthTest  = flag.Bool("runauth", false, "Set to true to run authentication test")
-	flagCompressTest = flag.String("compressor", "", "compressor to use")
-	clusterHosts     []string
-)
-
-func init() {
-	flag.Parse()
-	clusterHosts = strings.Split(*flagCluster, ",")
-	log.SetFlags(log.Lshortfile | log.LstdFlags)
-}
-
-func addSslOptions(cluster *ClusterConfig) *ClusterConfig {
-	if *flagRunSslTest {
-		cluster.SslOpts = &SslOptions{
-			CertPath:               "testdata/pki/gocql.crt",
-			KeyPath:                "testdata/pki/gocql.key",
-			CaPath:                 "testdata/pki/ca.crt",
-			EnableHostVerification: false,
-		}
-	}
-	return cluster
-}
-
-var initOnce sync.Once
-
-func createTable(s *Session, table string) error {
-	err := s.Query(table).Consistency(All).Exec()
-	if *clusterSize > 1 {
-		// wait for table definition to propogate
-		time.Sleep(1 * time.Second)
-	}
-	return err
-}
-
-func createCluster() *ClusterConfig {
-	cluster := NewCluster(clusterHosts...)
-	cluster.ProtoVersion = *flagProto
-	cluster.CQLVersion = *flagCQL
-	cluster.Timeout = 5 * time.Second
-	cluster.Consistency = Quorum
-	if *flagRetry > 0 {
-		cluster.RetryPolicy = &SimpleRetryPolicy{NumRetries: *flagRetry}
-	}
-
-	switch *flagCompressTest {
-	case "snappy":
-		cluster.Compressor = &SnappyCompressor{}
-	case "":
-	default:
-		panic("invalid compressor: " + *flagCompressTest)
-	}
-
-	cluster = addSslOptions(cluster)
-	return cluster
-}
-
-func createKeyspace(tb testing.TB, cluster *ClusterConfig, keyspace string) {
-	session, err := cluster.CreateSession()
-	if err != nil {
-		tb.Fatal("createSession:", err)
-	}
-	defer session.Close()
-	if err = session.Query(`DROP KEYSPACE IF EXISTS ` + keyspace).Exec(); err != nil {
-		tb.Log("drop keyspace:", err)
-	}
-	if err := session.Query(fmt.Sprintf(`CREATE KEYSPACE %s
-	WITH replication = {
-		'class' : 'SimpleStrategy',
-		'replication_factor' : %d
-	}`, keyspace, *flagRF)).Consistency(All).Exec(); err != nil {
-		tb.Fatalf("error creating keyspace %s: %v", keyspace, err)
-	}
-	tb.Logf("Created keyspace %s", keyspace)
-}
-
-func createSessionFromCluster(cluster *ClusterConfig, tb testing.TB) *Session {
-	// Drop and re-create the keyspace once. Different tests should use their own
-	// individual tables, but can assume that the table does not exist before.
-	initOnce.Do(func() {
-		createKeyspace(tb, cluster, "gocql_test")
-	})
-
-	cluster.Keyspace = "gocql_test"
-	session, err := cluster.CreateSession()
-	if err != nil {
-		tb.Fatal("createSession:", err)
-	}
-
-	return session
-}
-
-func createSession(tb testing.TB) *Session {
-	cluster := createCluster()
-	return createSessionFromCluster(cluster, tb)
-}
-
-// TestAuthentication verifies that gocql will work with a host configured to only accept authenticated connections
-func TestAuthentication(t *testing.T) {
-
-	if *flagProto < 2 {
-		t.Skip("Authentication is not supported with protocol < 2")
-	}
-
-	if !*flagRunAuthTest {
-		t.Skip("Authentication is not configured in the target cluster")
-	}
-
-	cluster := createCluster()
-
-	cluster.Authenticator = PasswordAuthenticator{
-		Username: "cassandra",
-		Password: "cassandra",
-	}
-
-	session, err := cluster.CreateSession()
-
-	if err != nil {
-		t.Fatalf("Authentication error: %s", err)
-	}
-
-	session.Close()
-}
-
-//TestRingDiscovery makes sure that you can autodiscover other cluster members when you seed a cluster config with just one node
-func TestRingDiscovery(t *testing.T) {
-	cluster := createCluster()
-	cluster.Hosts = clusterHosts[:1]
-	cluster.DiscoverHosts = true
-
-	session, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatalf("got error connecting to the cluster %v", err)
-	}
-
-	if *clusterSize > 1 {
-		// wait for autodiscovery to update the pool with the list of known hosts
-		time.Sleep(*flagAutoWait)
-	}
-
-	size := len(session.Pool.(*SimplePool).connPool)
-
-	if *clusterSize != size {
-		t.Logf("WARN: Expected a cluster size of %d, but actual size was %d", *clusterSize, size)
-	}
-
-	session.Close()
-}
-
-func TestEmptyHosts(t *testing.T) {
-	cluster := createCluster()
-	cluster.Hosts = nil
-	if session, err := cluster.CreateSession(); err == nil {
-		session.Close()
-		t.Error("expected err, got nil")
-	}
-}
-
-//TestUseStatementError checks to make sure the correct error is returned when the user tries to execute a use statement.
-func TestUseStatementError(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := session.Query("USE gocql_test").Exec(); err != nil {
-		if err != ErrUseStmt {
-			t.Error("expected ErrUseStmt, got " + err.Error())
-		}
-	} else {
-		t.Error("expected err, got nil.")
-	}
-}
-
-//TestInvalidKeyspace checks that an invalid keyspace will return promptly and without a flood of connections
-func TestInvalidKeyspace(t *testing.T) {
-	cluster := createCluster()
-	cluster.Keyspace = "invalidKeyspace"
-	session, err := cluster.CreateSession()
-	if err != nil {
-		if err != ErrNoConnectionsStarted {
-			t.Errorf("Expected ErrNoConnections but got %v", err)
-		}
-	} else {
-		session.Close() //Clean up the session
-		t.Error("expected err, got nil.")
-	}
-}
-
-func TestTracing(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE trace (id int primary key)`); err != nil {
-		t.Fatal("create:", err)
-	}
-
-	buf := &bytes.Buffer{}
-	trace := NewTraceWriter(session, buf)
-
-	if err := session.Query(`INSERT INTO trace (id) VALUES (?)`, 42).Trace(trace).Exec(); err != nil {
-		t.Error("insert:", err)
-	} else if buf.Len() == 0 {
-		t.Error("insert: failed to obtain any tracing")
-	}
-	buf.Reset()
-
-	var value int
-	if err := session.Query(`SELECT id FROM trace WHERE id = ?`, 42).Trace(trace).Scan(&value); err != nil {
-		t.Error("select:", err)
-	} else if value != 42 {
-		t.Errorf("value: expected %d, got %d", 42, value)
-	} else if buf.Len() == 0 {
-		t.Error("select: failed to obtain any tracing")
-	}
-}
-
-func TestPaging(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("Paging not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE paging (id int primary key)"); err != nil {
-		t.Fatal("create table:", err)
-	}
-	for i := 0; i < 100; i++ {
-		if err := session.Query("INSERT INTO paging (id) VALUES (?)", i).Exec(); err != nil {
-			t.Fatal("insert:", err)
-		}
-	}
-
-	iter := session.Query("SELECT id FROM paging").PageSize(10).Iter()
-	var id int
-	count := 0
-	for iter.Scan(&id) {
-		count++
-	}
-	if err := iter.Close(); err != nil {
-		t.Fatal("close:", err)
-	}
-	if count != 100 {
-		t.Fatalf("expected %d, got %d", 100, count)
-	}
-}
-
-func TestCAS(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("lightweight transactions not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-	session.cfg.SerialConsistency = LocalSerial
-
-	if err := createTable(session, `CREATE TABLE cas_table (
-			title         varchar,
-			revid   	  timeuuid,
-			last_modified timestamp,
-			PRIMARY KEY (title, revid)
-		)`); err != nil {
-		t.Fatal("create:", err)
-	}
-
-	title, revid, modified := "baz", TimeUUID(), time.Now()
-	var titleCAS string
-	var revidCAS UUID
-	var modifiedCAS time.Time
-
-	if applied, err := session.Query(`INSERT INTO cas_table (title, revid, last_modified)
-		VALUES (?, ?, ?) IF NOT EXISTS`,
-		title, revid, modified).ScanCAS(&titleCAS, &revidCAS, &modifiedCAS); err != nil {
-		t.Fatal("insert:", err)
-	} else if !applied {
-		t.Fatal("insert should have been applied")
-	}
-
-	if applied, err := session.Query(`INSERT INTO cas_table (title, revid, last_modified)
-		VALUES (?, ?, ?) IF NOT EXISTS`,
-		title, revid, modified).ScanCAS(&titleCAS, &revidCAS, &modifiedCAS); err != nil {
-		t.Fatal("insert:", err)
-	} else if applied {
-		t.Fatal("insert should not have been applied")
-	} else if title != titleCAS || revid != revidCAS {
-		t.Fatalf("expected %s/%v/%v but got %s/%v/%v", title, revid, modified, titleCAS, revidCAS, modifiedCAS)
-	}
-
-	tenSecondsLater := modified.Add(10 * time.Second)
-
-	if applied, err := session.Query(`DELETE FROM cas_table WHERE title = ? and revid = ? IF last_modified = ?`,
-		title, revid, tenSecondsLater).ScanCAS(&modifiedCAS); err != nil {
-		t.Fatal("delete:", err)
-	} else if applied {
-		t.Fatal("delete should have not been applied")
-	}
-
-	if modifiedCAS.Unix() != tenSecondsLater.Add(-10*time.Second).Unix() {
-		t.Fatalf("Was expecting modified CAS to be %v; but was one second later", modifiedCAS.UTC())
-	}
-
-	if _, err := session.Query(`DELETE FROM cas_table WHERE title = ? and revid = ? IF last_modified = ?`,
-		title, revid, tenSecondsLater).ScanCAS(); err.Error() != "count mismatch" {
-		t.Fatalf("delete: was expecting count mismatch error but got %s", err)
-	}
-
-	if applied, err := session.Query(`DELETE FROM cas_table WHERE title = ? and revid = ? IF last_modified = ?`,
-		title, revid, modified).ScanCAS(&modifiedCAS); err != nil {
-		t.Fatal("delete:", err)
-	} else if !applied {
-		t.Fatal("delete should have been applied")
-	}
-}
-
-func TestMapScanCAS(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("lightweight transactions not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE cas_table2 (
-			title         varchar,
-			revid   	  timeuuid,
-			last_modified timestamp,
-			deleted boolean,
-			PRIMARY KEY (title, revid)
-		)`); err != nil {
-		t.Fatal("create:", err)
-	}
-
-	title, revid, modified, deleted := "baz", TimeUUID(), time.Now(), false
-	mapCAS := map[string]interface{}{}
-
-	if applied, err := session.Query(`INSERT INTO cas_table2 (title, revid, last_modified, deleted)
-		VALUES (?, ?, ?, ?) IF NOT EXISTS`,
-		title, revid, modified, deleted).MapScanCAS(mapCAS); err != nil {
-		t.Fatal("insert:", err)
-	} else if !applied {
-		t.Fatal("insert should have been applied")
-	}
-
-	mapCAS = map[string]interface{}{}
-	if applied, err := session.Query(`INSERT INTO cas_table2 (title, revid, last_modified, deleted)
-		VALUES (?, ?, ?, ?) IF NOT EXISTS`,
-		title, revid, modified, deleted).MapScanCAS(mapCAS); err != nil {
-		t.Fatal("insert:", err)
-	} else if applied {
-		t.Fatal("insert should not have been applied")
-	} else if title != mapCAS["title"] || revid != mapCAS["revid"] || deleted != mapCAS["deleted"] {
-		t.Fatalf("expected %s/%v/%v/%v but got %s/%v/%v%v", title, revid, modified, false, mapCAS["title"], mapCAS["revid"], mapCAS["last_modified"], mapCAS["deleted"])
-	}
-
-}
-
-func TestBatch(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE batch_table (id int primary key)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	batch := NewBatch(LoggedBatch)
-	for i := 0; i < 100; i++ {
-		batch.Query(`INSERT INTO batch_table (id) VALUES (?)`, i)
-	}
-	if err := session.ExecuteBatch(batch); err != nil {
-		t.Fatal("execute batch:", err)
-	}
-
-	count := 0
-	if err := session.Query(`SELECT COUNT(*) FROM batch_table`).Scan(&count); err != nil {
-		t.Fatal("select count:", err)
-	} else if count != 100 {
-		t.Fatalf("count: expected %d, got %d\n", 100, count)
-	}
-}
-
-func TestUnpreparedBatch(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE batch_unprepared (id int primary key, c counter)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	var batch *Batch
-	if *flagProto == 2 {
-		batch = NewBatch(CounterBatch)
-	} else {
-		batch = NewBatch(UnloggedBatch)
-	}
-
-	for i := 0; i < 100; i++ {
-		batch.Query(`UPDATE batch_unprepared SET c = c + 1 WHERE id = 1`)
-	}
-
-	if err := session.ExecuteBatch(batch); err != nil {
-		t.Fatal("execute batch:", err)
-	}
-
-	count := 0
-	if err := session.Query(`SELECT COUNT(*) FROM batch_unprepared`).Scan(&count); err != nil {
-		t.Fatal("select count:", err)
-	} else if count != 1 {
-		t.Fatalf("count: expected %d, got %d\n", 100, count)
-	}
-
-	if err := session.Query(`SELECT c FROM batch_unprepared`).Scan(&count); err != nil {
-		t.Fatal("select count:", err)
-	} else if count != 100 {
-		t.Fatalf("count: expected %d, got %d\n", 100, count)
-	}
-}
-
-// TestBatchLimit tests gocql to make sure batch operations larger than the maximum
-// statement limit are not submitted to a cassandra node.
-func TestBatchLimit(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE batch_table2 (id int primary key)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	batch := NewBatch(LoggedBatch)
-	for i := 0; i < 65537; i++ {
-		batch.Query(`INSERT INTO batch_table2 (id) VALUES (?)`, i)
-	}
-	if err := session.ExecuteBatch(batch); err != ErrTooManyStmts {
-		t.Fatal("gocql attempted to execute a batch larger than the support limit of statements.")
-	}
-
-}
-
-func TestWhereIn(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE where_in_table (id int, cluster int, primary key (id,cluster))`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	if err := session.Query("INSERT INTO where_in_table (id, cluster) VALUES (?,?)", 100, 200).Exec(); err != nil {
-		t.Fatal("insert:", err)
-	}
-
-	iter := session.Query("SELECT * FROM where_in_table WHERE id = ? AND cluster IN (?)", 100, 200).Iter()
-	var id, cluster int
-	count := 0
-	for iter.Scan(&id, &cluster) {
-		count++
-	}
-
-	if id != 100 || cluster != 200 {
-		t.Fatalf("Was expecting id and cluster to be (100,200) but were (%d,%d)", id, cluster)
-	}
-}
-
-// TestTooManyQueryArgs tests to make sure the library correctly handles the application level bug
-// whereby too many query arguments are passed to a query
-func TestTooManyQueryArgs(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE too_many_query_args (id int primary key, value int)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	_, err := session.Query(`SELECT * FROM too_many_query_args WHERE id = ?`, 1, 2).Iter().SliceMap()
-
-	if err == nil {
-		t.Fatal("'`SELECT * FROM too_many_query_args WHERE id = ?`, 1, 2' should return an ErrQueryArgLength")
-	}
-
-	if err != ErrQueryArgLength {
-		t.Fatalf("'`SELECT * FROM too_many_query_args WHERE id = ?`, 1, 2' should return an ErrQueryArgLength, but returned: %s", err)
-	}
-
-	batch := session.NewBatch(UnloggedBatch)
-	batch.Query("INSERT INTO too_many_query_args (id, value) VALUES (?, ?)", 1, 2, 3)
-	err = session.ExecuteBatch(batch)
-
-	if err == nil {
-		t.Fatal("'`INSERT INTO too_many_query_args (id, value) VALUES (?, ?)`, 1, 2, 3' should return an ErrQueryArgLength")
-	}
-
-	if err != ErrQueryArgLength {
-		t.Fatalf("'INSERT INTO too_many_query_args (id, value) VALUES (?, ?)`, 1, 2, 3' should return an ErrQueryArgLength, but returned: %s", err)
-	}
-
-}
-
-// TestNotEnoughQueryArgs tests to make sure the library correctly handles the application level bug
-// whereby not enough query arguments are passed to a query
-func TestNotEnoughQueryArgs(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE not_enough_query_args (id int, cluster int, value int, primary key (id, cluster))`); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	_, err := session.Query(`SELECT * FROM not_enough_query_args WHERE id = ? and cluster = ?`, 1).Iter().SliceMap()
-
-	if err == nil {
-		t.Fatal("'`SELECT * FROM not_enough_query_args WHERE id = ? and cluster = ?`, 1' should return an ErrQueryArgLength")
-	}
-
-	if err != ErrQueryArgLength {
-		t.Fatalf("'`SELECT * FROM too_few_query_args WHERE id = ? and cluster = ?`, 1' should return an ErrQueryArgLength, but returned: %s", err)
-	}
-
-	batch := session.NewBatch(UnloggedBatch)
-	batch.Query("INSERT INTO not_enough_query_args (id, cluster, value) VALUES (?, ?, ?)", 1, 2)
-	err = session.ExecuteBatch(batch)
-
-	if err == nil {
-		t.Fatal("'`INSERT INTO not_enough_query_args (id, cluster, value) VALUES (?, ?, ?)`, 1, 2' should return an ErrQueryArgLength")
-	}
-
-	if err != ErrQueryArgLength {
-		t.Fatalf("'INSERT INTO not_enough_query_args (id, cluster, value) VALUES (?, ?, ?)`, 1, 2' should return an ErrQueryArgLength, but returned: %s", err)
-	}
-}
-
-// TestCreateSessionTimeout tests to make sure the CreateSession function timeouts out correctly
-// and prevents an infinite loop of connection retries.
-func TestCreateSessionTimeout(t *testing.T) {
-	go func() {
-		<-time.After(2 * time.Second)
-		t.Error("no startup timeout")
-	}()
-
-	cluster := createCluster()
-	cluster.Hosts = []string{"127.0.0.1:1"}
-	session, err := cluster.CreateSession()
-	if err == nil {
-		session.Close()
-		t.Fatal("expected ErrNoConnectionsStarted, but no error was returned.")
-	}
-
-	if err != ErrNoConnectionsStarted {
-		t.Fatalf("expected ErrNoConnectionsStarted, but received %v", err)
-	}
-}
-
-type FullName struct {
-	FirstName string
-	LastName  string
-}
-
-func (n FullName) MarshalCQL(info TypeInfo) ([]byte, error) {
-	return []byte(n.FirstName + " " + n.LastName), nil
-}
-
-func (n *FullName) UnmarshalCQL(info TypeInfo, data []byte) error {
-	t := strings.SplitN(string(data), " ", 2)
-	n.FirstName, n.LastName = t[0], t[1]
-	return nil
-}
-
-func TestMapScanWithRefMap(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-	if err := createTable(session, `CREATE TABLE scan_map_ref_table (
-			testtext       text PRIMARY KEY,
-			testfullname   text,
-			testint        int,
-		)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-	m := make(map[string]interface{})
-	m["testtext"] = "testtext"
-	m["testfullname"] = FullName{"John", "Doe"}
-	m["testint"] = 100
-
-	if err := session.Query(`INSERT INTO scan_map_ref_table (testtext, testfullname, testint) values (?,?,?)`, m["testtext"], m["testfullname"], m["testint"]).Exec(); err != nil {
-		t.Fatal("insert:", err)
-	}
-
-	var testText string
-	var testFullName FullName
-	ret := map[string]interface{}{
-		"testtext":     &testText,
-		"testfullname": &testFullName,
-		// testint is not set here.
-	}
-	iter := session.Query(`SELECT * FROM scan_map_ref_table`).Iter()
-	if ok := iter.MapScan(ret); !ok {
-		t.Fatal("select:", iter.Close())
-	} else {
-		if ret["testtext"] != "testtext" {
-			t.Fatal("returned testtext did not match")
-		}
-		f := ret["testfullname"].(FullName)
-		if f.FirstName != "John" || f.LastName != "Doe" {
-			t.Fatal("returned testfullname did not match")
-		}
-		if ret["testint"] != 100 {
-			t.Fatal("returned testinit did not match")
-		}
-	}
-
-}
-
-func TestSliceMap(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-	if err := createTable(session, `CREATE TABLE slice_map_table (
-			testuuid       timeuuid PRIMARY KEY,
-			testtimestamp  timestamp,
-			testvarchar    varchar,
-			testbigint     bigint,
-			testblob       blob,
-			testbool       boolean,
-			testfloat      float,
-			testdouble     double,
-			testint        int,
-			testdecimal    decimal,
-			testlist       list<text>,
-			testset        set<int>,
-			testmap        map<varchar, varchar>,
-			testvarint     varint,
-			testinet			 inet
-		)`); err != nil {
-		t.Fatal("create table:", err)
-	}
-	m := make(map[string]interface{})
-
-	bigInt := new(big.Int)
-	if _, ok := bigInt.SetString("830169365738487321165427203929228", 10); !ok {
-		t.Fatal("Failed setting bigint by string")
-	}
-
-	m["testuuid"] = TimeUUID()
-	m["testvarchar"] = "Test VarChar"
-	m["testbigint"] = time.Now().Unix()
-	m["testtimestamp"] = time.Now().Truncate(time.Millisecond).UTC()
-	m["testblob"] = []byte("test blob")
-	m["testbool"] = true
-	m["testfloat"] = float32(4.564)
-	m["testdouble"] = float64(4.815162342)
-	m["testint"] = 2343
-	m["testdecimal"] = inf.NewDec(100, 0)
-	m["testlist"] = []string{"quux", "foo", "bar", "baz", "quux"}
-	m["testset"] = []int{1, 2, 3, 4, 5, 6, 7, 8, 9}
-	m["testmap"] = map[string]string{"field1": "val1", "field2": "val2", "field3": "val3"}
-	m["testvarint"] = bigInt
-	m["testinet"] = "213.212.2.19"
-	sliceMap := []map[string]interface{}{m}
-	if err := session.Query(`INSERT INTO slice_map_table (testuuid, testtimestamp, testvarchar, testbigint, testblob, testbool, testfloat, testdouble, testint, testdecimal, testlist, testset, testmap, testvarint, testinet) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-		m["testuuid"], m["testtimestamp"], m["testvarchar"], m["testbigint"], m["testblob"], m["testbool"], m["testfloat"], m["testdouble"], m["testint"], m["testdecimal"], m["testlist"], m["testset"], m["testmap"], m["testvarint"], m["testinet"]).Exec(); err != nil {
-		t.Fatal("insert:", err)
-	}
-	if returned, retErr := session.Query(`SELECT * FROM slice_map_table`).Iter().SliceMap(); retErr != nil {
-		t.Fatal("select:", retErr)
-	} else {
-		matchSliceMap(t, sliceMap, returned[0])
-	}
-
-	// Test for Iter.MapScan()
-	{
-		testMap := make(map[string]interface{})
-		if !session.Query(`SELECT * FROM slice_map_table`).Iter().MapScan(testMap) {
-			t.Fatal("MapScan failed to work with one row")
-		}
-		matchSliceMap(t, sliceMap, testMap)
-	}
-
-	// Test for Query.MapScan()
-	{
-		testMap := make(map[string]interface{})
-		if session.Query(`SELECT * FROM slice_map_table`).MapScan(testMap) != nil {
-			t.Fatal("MapScan failed to work with one row")
-		}
-		matchSliceMap(t, sliceMap, testMap)
-	}
-}
-func matchSliceMap(t *testing.T, sliceMap []map[string]interface{}, testMap map[string]interface{}) {
-	if sliceMap[0]["testuuid"] != testMap["testuuid"] {
-		t.Fatal("returned testuuid did not match")
-	}
-	if sliceMap[0]["testtimestamp"] != testMap["testtimestamp"] {
-		t.Fatal("returned testtimestamp did not match")
-	}
-	if sliceMap[0]["testvarchar"] != testMap["testvarchar"] {
-		t.Fatal("returned testvarchar did not match")
-	}
-	if sliceMap[0]["testbigint"] != testMap["testbigint"] {
-		t.Fatal("returned testbigint did not match")
-	}
-	if !reflect.DeepEqual(sliceMap[0]["testblob"], testMap["testblob"]) {
-		t.Fatal("returned testblob did not match")
-	}
-	if sliceMap[0]["testbool"] != testMap["testbool"] {
-		t.Fatal("returned testbool did not match")
-	}
-	if sliceMap[0]["testfloat"] != testMap["testfloat"] {
-		t.Fatal("returned testfloat did not match")
-	}
-	if sliceMap[0]["testdouble"] != testMap["testdouble"] {
-		t.Fatal("returned testdouble did not match")
-	}
-	if sliceMap[0]["testinet"] != testMap["testinet"] {
-		t.Fatal("returned testinet did not match")
-	}
-
-	expectedDecimal := sliceMap[0]["testdecimal"].(*inf.Dec)
-	returnedDecimal := testMap["testdecimal"].(*inf.Dec)
-
-	if expectedDecimal.Cmp(returnedDecimal) != 0 {
-		t.Fatal("returned testdecimal did not match")
-	}
-
-	if !reflect.DeepEqual(sliceMap[0]["testlist"], testMap["testlist"]) {
-		t.Fatal("returned testlist did not match")
-	}
-	if !reflect.DeepEqual(sliceMap[0]["testset"], testMap["testset"]) {
-		t.Fatal("returned testset did not match")
-	}
-	if !reflect.DeepEqual(sliceMap[0]["testmap"], testMap["testmap"]) {
-		t.Fatal("returned testmap did not match")
-	}
-	if sliceMap[0]["testint"] != testMap["testint"] {
-		t.Fatal("returned testint did not match")
-	}
-}
-
-func TestScanWithNilArguments(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE scan_with_nil_arguments (
-			foo   varchar,
-			bar   int,
-			PRIMARY KEY (foo, bar)
-	)`); err != nil {
-		t.Fatal("create:", err)
-	}
-	for i := 1; i <= 20; i++ {
-		if err := session.Query("INSERT INTO scan_with_nil_arguments (foo, bar) VALUES (?, ?)",
-			"squares", i*i).Exec(); err != nil {
-			t.Fatal("insert:", err)
-		}
-	}
-
-	iter := session.Query("SELECT * FROM scan_with_nil_arguments WHERE foo = ?", "squares").Iter()
-	var n int
-	count := 0
-	for iter.Scan(nil, &n) {
-		count += n
-	}
-	if err := iter.Close(); err != nil {
-		t.Fatal("close:", err)
-	}
-	if count != 2870 {
-		t.Fatalf("expected %d, got %d", 2870, count)
-	}
-}
-
-func TestScanCASWithNilArguments(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("lightweight transactions not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE scan_cas_with_nil_arguments (
-		foo   varchar,
-		bar   varchar,
-		PRIMARY KEY (foo, bar)
-	)`); err != nil {
-		t.Fatal("create:", err)
-	}
-
-	foo := "baz"
-	var cas string
-
-	if applied, err := session.Query(`INSERT INTO scan_cas_with_nil_arguments (foo, bar)
-		VALUES (?, ?) IF NOT EXISTS`,
-		foo, foo).ScanCAS(nil, nil); err != nil {
-		t.Fatal("insert:", err)
-	} else if !applied {
-		t.Fatal("insert should have been applied")
-	}
-
-	if applied, err := session.Query(`INSERT INTO scan_cas_with_nil_arguments (foo, bar)
-		VALUES (?, ?) IF NOT EXISTS`,
-		foo, foo).ScanCAS(&cas, nil); err != nil {
-		t.Fatal("insert:", err)
-	} else if applied {
-		t.Fatal("insert should not have been applied")
-	} else if foo != cas {
-		t.Fatalf("expected %v but got %v", foo, cas)
-	}
-
-	if applied, err := session.Query(`INSERT INTO scan_cas_with_nil_arguments (foo, bar)
-		VALUES (?, ?) IF NOT EXISTS`,
-		foo, foo).ScanCAS(nil, &cas); err != nil {
-		t.Fatal("insert:", err)
-	} else if applied {
-		t.Fatal("insert should not have been applied")
-	} else if foo != cas {
-		t.Fatalf("expected %v but got %v", foo, cas)
-	}
-}
-
-func TestRebindQueryInfo(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE rebind_query (id int, value text, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query("INSERT INTO rebind_query (id, value) VALUES (?, ?)", 23, "quux").Exec(); err != nil {
-		t.Fatalf("insert into rebind_query failed, err '%v'", err)
-	}
-
-	if err := session.Query("INSERT INTO rebind_query (id, value) VALUES (?, ?)", 24, "w00t").Exec(); err != nil {
-		t.Fatalf("insert into rebind_query failed, err '%v'", err)
-	}
-
-	q := session.Query("SELECT value FROM rebind_query WHERE ID = ?")
-	q.Bind(23)
-
-	iter := q.Iter()
-	var value string
-	for iter.Scan(&value) {
-	}
-
-	if value != "quux" {
-		t.Fatalf("expected %v but got %v", "quux", value)
-	}
-
-	q.Bind(24)
-	iter = q.Iter()
-
-	for iter.Scan(&value) {
-	}
-
-	if value != "w00t" {
-		t.Fatalf("expected %v but got %v", "quux", value)
-	}
-}
-
-//TestStaticQueryInfo makes sure that the application can manually bind query parameters using the simplest possible static binding strategy
-func TestStaticQueryInfo(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE static_query_info (id int, value text, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query("INSERT INTO static_query_info (id, value) VALUES (?, ?)", 113, "foo").Exec(); err != nil {
-		t.Fatalf("insert into static_query_info failed, err '%v'", err)
-	}
-
-	autobinder := func(q *QueryInfo) ([]interface{}, error) {
-		values := make([]interface{}, 1)
-		values[0] = 113
-		return values, nil
-	}
-
-	qry := session.Bind("SELECT id, value FROM static_query_info WHERE id = ?", autobinder)
-
-	if err := qry.Exec(); err != nil {
-		t.Fatalf("expose query info failed, error '%v'", err)
-	}
-
-	iter := qry.Iter()
-
-	var id int
-	var value string
-
-	iter.Scan(&id, &value)
-
-	if err := iter.Close(); err != nil {
-		t.Fatalf("query with exposed info failed, err '%v'", err)
-	}
-
-	if value != "foo" {
-		t.Fatalf("Expected value %s, but got %s", "foo", value)
-	}
-
-}
-
-type ClusteredKeyValue struct {
-	Id      int
-	Cluster int
-	Value   string
-}
-
-func (kv *ClusteredKeyValue) Bind(q *QueryInfo) ([]interface{}, error) {
-	values := make([]interface{}, len(q.Args))
-
-	for i, info := range q.Args {
-		fieldName := upcaseInitial(info.Name)
-		value := reflect.ValueOf(kv)
-		field := reflect.Indirect(value).FieldByName(fieldName)
-		values[i] = field.Addr().Interface()
-	}
-
-	return values, nil
-}
-
-func upcaseInitial(str string) string {
-	for i, v := range str {
-		return string(unicode.ToUpper(v)) + str[i+1:]
-	}
-	return ""
-}
-
-//TestBoundQueryInfo makes sure that the application can manually bind query parameters using the query meta data supplied at runtime
-func TestBoundQueryInfo(t *testing.T) {
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE clustered_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	write := &ClusteredKeyValue{Id: 200, Cluster: 300, Value: "baz"}
-
-	insert := session.Bind("INSERT INTO clustered_query_info (id, cluster, value) VALUES (?, ?,?)", write.Bind)
-
-	if err := insert.Exec(); err != nil {
-		t.Fatalf("insert into clustered_query_info failed, err '%v'", err)
-	}
-
-	read := &ClusteredKeyValue{Id: 200, Cluster: 300}
-
-	qry := session.Bind("SELECT id, cluster, value FROM clustered_query_info WHERE id = ? and cluster = ?", read.Bind)
-
-	iter := qry.Iter()
-
-	var id, cluster int
-	var value string
-
-	iter.Scan(&id, &cluster, &value)
-
-	if err := iter.Close(); err != nil {
-		t.Fatalf("query with clustered_query_info info failed, err '%v'", err)
-	}
-
-	if value != "baz" {
-		t.Fatalf("Expected value %s, but got %s", "baz", value)
-	}
-
-}
-
-//TestBatchQueryInfo makes sure that the application can manually bind query parameters when executing in a batch
-func TestBatchQueryInfo(t *testing.T) {
-
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE batch_query_info (id int, cluster int, value text, PRIMARY KEY (id, cluster))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	write := func(q *QueryInfo) ([]interface{}, error) {
-		values := make([]interface{}, 3)
-		values[0] = 4000
-		values[1] = 5000
-		values[2] = "bar"
-		return values, nil
-	}
-
-	batch := session.NewBatch(LoggedBatch)
-	batch.Bind("INSERT INTO batch_query_info (id, cluster, value) VALUES (?, ?,?)", write)
-
-	if err := session.ExecuteBatch(batch); err != nil {
-		t.Fatalf("batch insert into batch_query_info failed, err '%v'", err)
-	}
-
-	read := func(q *QueryInfo) ([]interface{}, error) {
-		values := make([]interface{}, 2)
-		values[0] = 4000
-		values[1] = 5000
-		return values, nil
-	}
-
-	qry := session.Bind("SELECT id, cluster, value FROM batch_query_info WHERE id = ? and cluster = ?", read)
-
-	iter := qry.Iter()
-
-	var id, cluster int
-	var value string
-
-	iter.Scan(&id, &cluster, &value)
-
-	if err := iter.Close(); err != nil {
-		t.Fatalf("query with batch_query_info info failed, err '%v'", err)
-	}
-
-	if value != "bar" {
-		t.Fatalf("Expected value %s, but got %s", "bar", value)
-	}
-}
-
-func injectInvalidPreparedStatement(t *testing.T, session *Session, table string) (string, *Conn) {
-	if err := createTable(session, `CREATE TABLE `+table+` (
-			foo   varchar,
-			bar   int,
-			PRIMARY KEY (foo, bar)
-	)`); err != nil {
-		t.Fatal("create:", err)
-	}
-	stmt := "INSERT INTO " + table + " (foo, bar) VALUES (?, 7)"
-	conn := session.Pool.Pick(nil)
-	flight := new(inflightPrepare)
-	stmtsLRU.Lock()
-	stmtsLRU.lru.Add(conn.addr+stmt, flight)
-	stmtsLRU.Unlock()
-	flight.info = &resultPreparedFrame{
-		preparedID: []byte{'f', 'o', 'o', 'b', 'a', 'r'},
-		reqMeta: resultMetadata{
-			columns: []ColumnInfo{
-				{
-					Keyspace: "gocql_test",
-					Table:    table,
-					Name:     "foo",
-					TypeInfo: NativeType{
-						typ: TypeVarchar,
-					},
-				},
-			}},
-	}
-	return stmt, conn
-}
-
-func TestMissingSchemaPrepare(t *testing.T) {
-	s := createSession(t)
-	conn := s.Pool.Pick(nil)
-	defer s.Close()
-
-	insertQry := &Query{stmt: "INSERT INTO invalidschemaprep (val) VALUES (?)", values: []interface{}{5}, cons: s.cons,
-		session: s, pageSize: s.pageSize, trace: s.trace,
-		prefetch: s.prefetch, rt: s.cfg.RetryPolicy}
-
-	if err := conn.executeQuery(insertQry).err; err == nil {
-		t.Fatal("expected error, but got nil.")
-	}
-
-	if err := createTable(s, "CREATE TABLE invalidschemaprep (val int, PRIMARY KEY (val))"); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	if err := conn.executeQuery(insertQry).err; err != nil {
-		t.Fatal(err) // unconfigured columnfamily
-	}
-}
-
-func TestReprepareStatement(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-	stmt, conn := injectInvalidPreparedStatement(t, session, "test_reprepare_statement")
-	query := session.Query(stmt, "bar")
-	if err := conn.executeQuery(query).Close(); err != nil {
-		t.Fatalf("Failed to execute query for reprepare statement: %v", err)
-	}
-}
-
-func TestReprepareBatch(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-	session := createSession(t)
-	defer session.Close()
-	stmt, conn := injectInvalidPreparedStatement(t, session, "test_reprepare_statement_batch")
-	batch := session.NewBatch(UnloggedBatch)
-	batch.Query(stmt, "bar")
-	if err := conn.executeBatch(batch); err != nil {
-		t.Fatalf("Failed to execute query for reprepare statement: %v", err)
-	}
-
-}
-
-func TestQueryInfo(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	conn := session.Pool.Pick(nil)
-	info, err := conn.prepareStatement("SELECT release_version, host_id FROM system.local WHERE key = ?", nil)
-
-	if err != nil {
-		t.Fatalf("Failed to execute query for preparing statement: %v", err)
-	}
-
-	if len(info.reqMeta.columns) != 1 {
-		t.Fatalf("Was not expecting meta data for %d query arguments, but got %d\n", 1, len(info.reqMeta.columns))
-	}
-
-	if *flagProto > 1 {
-		if len(info.respMeta.columns) != 2 {
-			t.Fatalf("Was not expecting meta data for %d result columns, but got %d\n", 2, len(info.respMeta.columns))
-		}
-	}
-}
-
-//TestPreparedCacheEviction will make sure that the cache size is maintained
-func TestPreparedCacheEviction(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-	stmtsLRU.Lock()
-	stmtsLRU.Max(4)
-	stmtsLRU.Unlock()
-
-	if err := createTable(session, "CREATE TABLE prepcachetest (id int,mod int,PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-	//Fill the table
-	for i := 0; i < 2; i++ {
-		if err := session.Query("INSERT INTO prepcachetest (id,mod) VALUES (?, ?)", i, 10000%(i+1)).Exec(); err != nil {
-			t.Fatalf("insert into prepcachetest failed, err '%v'", err)
-		}
-	}
-	//Populate the prepared statement cache with select statements
-	var id, mod int
-	for i := 0; i < 2; i++ {
-		err := session.Query("SELECT id,mod FROM prepcachetest WHERE id = "+strconv.FormatInt(int64(i), 10)).Scan(&id, &mod)
-		if err != nil {
-			t.Fatalf("select from prepcachetest failed, error '%v'", err)
-		}
-	}
-
-	//generate an update statement to test they are prepared
-	err := session.Query("UPDATE prepcachetest SET mod = ? WHERE id = ?", 1, 11).Exec()
-	if err != nil {
-		t.Fatalf("update prepcachetest failed, error '%v'", err)
-	}
-
-	//generate a delete statement to test they are prepared
-	err = session.Query("DELETE FROM prepcachetest WHERE id = ?", 1).Exec()
-	if err != nil {
-		t.Fatalf("delete from prepcachetest failed, error '%v'", err)
-	}
-
-	//generate an insert statement to test they are prepared
-	err = session.Query("INSERT INTO prepcachetest (id,mod) VALUES (?, ?)", 3, 11).Exec()
-	if err != nil {
-		t.Fatalf("insert into prepcachetest failed, error '%v'", err)
-	}
-
-	stmtsLRU.Lock()
-
-	//Make sure the cache size is maintained
-	if stmtsLRU.lru.Len() != stmtsLRU.lru.MaxEntries {
-		t.Fatalf("expected cache size of %v, got %v", stmtsLRU.lru.MaxEntries, stmtsLRU.lru.Len())
-	}
-
-	//Walk through all the configured hosts and test cache retention and eviction
-	var selFound, insFound, updFound, delFound, selEvict bool
-	for i := range session.cfg.Hosts {
-		_, ok := stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testSELECT id,mod FROM prepcachetest WHERE id = 1")
-		selFound = selFound || ok
-
-		_, ok = stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testINSERT INTO prepcachetest (id,mod) VALUES (?, ?)")
-		insFound = insFound || ok
-
-		_, ok = stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testUPDATE prepcachetest SET mod = ? WHERE id = ?")
-		updFound = updFound || ok
-
-		_, ok = stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testDELETE FROM prepcachetest WHERE id = ?")
-		delFound = delFound || ok
-
-		_, ok = stmtsLRU.lru.Get(session.cfg.Hosts[i] + ":9042gocql_testSELECT id,mod FROM prepcachetest WHERE id = 0")
-		selEvict = selEvict || !ok
-	}
-
-	stmtsLRU.Unlock()
-
-	if !selEvict {
-		t.Fatalf("expected first select statement to be purged, but statement was found in the cache.")
-	}
-	if !selFound {
-		t.Fatalf("expected second select statement to be cached, but statement was purged or not prepared.")
-	}
-	if !insFound {
-		t.Fatalf("expected insert statement to be cached, but statement was purged or not prepared.")
-	}
-	if !updFound {
-		t.Fatalf("expected update statement to be cached, but statement was purged or not prepared.")
-	}
-	if !delFound {
-		t.Error("expected delete statement to be cached, but statement was purged or not prepared.")
-	}
-}
-
-func TestPreparedCacheKey(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	// create a second keyspace
-	cluster2 := createCluster()
-	createKeyspace(t, cluster2, "gocql_test2")
-	cluster2.Keyspace = "gocql_test2"
-	session2, err := cluster2.CreateSession()
-	if err != nil {
-		t.Fatal("create session:", err)
-	}
-	defer session2.Close()
-
-	// both keyspaces have a table named "test_stmt_cache_key"
-	if err := createTable(session, "CREATE TABLE test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil {
-		t.Fatal("create table:", err)
-	}
-	if err := createTable(session2, "CREATE TABLE test_stmt_cache_key (id varchar primary key, field varchar)"); err != nil {
-		t.Fatal("create table:", err)
-	}
-
-	// both tables have a single row with the same partition key but different column value
-	if err = session.Query(`INSERT INTO test_stmt_cache_key (id, field) VALUES (?, ?)`, "key", "one").Exec(); err != nil {
-		t.Fatal("insert:", err)
-	}
-	if err = session2.Query(`INSERT INTO test_stmt_cache_key (id, field) VALUES (?, ?)`, "key", "two").Exec(); err != nil {
-		t.Fatal("insert:", err)
-	}
-
-	// should be able to see different values in each keyspace
-	var value string
-	if err = session.Query("SELECT field FROM test_stmt_cache_key WHERE id = ?", "key").Scan(&value); err != nil {
-		t.Fatal("select:", err)
-	}
-	if value != "one" {
-		t.Errorf("Expected one, got %s", value)
-	}
-
-	if err = session2.Query("SELECT field FROM test_stmt_cache_key WHERE id = ?", "key").Scan(&value); err != nil {
-		t.Fatal("select:", err)
-	}
-	if value != "two" {
-		t.Errorf("Expected two, got %s", value)
-	}
-}
-
-//TestMarshalFloat64Ptr tests to see that a pointer to a float64 is marshalled correctly.
-func TestMarshalFloat64Ptr(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE float_test (id double, test double, primary key (id))"); err != nil {
-		t.Fatal("create table:", err)
-	}
-	testNum := float64(7500)
-	if err := session.Query(`INSERT INTO float_test (id,test) VALUES (?,?)`, float64(7500.00), &testNum).Exec(); err != nil {
-		t.Fatal("insert float64:", err)
-	}
-}
-
-//TestMarshalInet tests to see that a pointer to a float64 is marshalled correctly.
-func TestMarshalInet(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE inet_test (ip inet, name text, primary key (ip))"); err != nil {
-		t.Fatal("create table:", err)
-	}
-	stringIp := "123.34.45.56"
-	if err := session.Query(`INSERT INTO inet_test (ip,name) VALUES (?,?)`, stringIp, "Test IP 1").Exec(); err != nil {
-		t.Fatal("insert string inet:", err)
-	}
-	var stringResult string
-	if err := session.Query("SELECT ip FROM inet_test").Scan(&stringResult); err != nil {
-		t.Fatalf("select for string from inet_test 1 failed: %v", err)
-	}
-	if stringResult != stringIp {
-		t.Errorf("Expected %s, was %s", stringIp, stringResult)
-	}
-
-	var ipResult net.IP
-	if err := session.Query("SELECT ip FROM inet_test").Scan(&ipResult); err != nil {
-		t.Fatalf("select for net.IP from inet_test 1 failed: %v", err)
-	}
-	if ipResult.String() != stringIp {
-		t.Errorf("Expected %s, was %s", stringIp, ipResult.String())
-	}
-
-	if err := session.Query(`DELETE FROM inet_test WHERE ip = ?`, stringIp).Exec(); err != nil {
-		t.Fatal("delete inet table:", err)
-	}
-
-	netIp := net.ParseIP("222.43.54.65")
-	if err := session.Query(`INSERT INTO inet_test (ip,name) VALUES (?,?)`, netIp, "Test IP 2").Exec(); err != nil {
-		t.Fatal("insert netIp inet:", err)
-	}
-
-	if err := session.Query("SELECT ip FROM inet_test").Scan(&stringResult); err != nil {
-		t.Fatalf("select for string from inet_test 2 failed: %v", err)
-	}
-	if stringResult != netIp.String() {
-		t.Errorf("Expected %s, was %s", netIp.String(), stringResult)
-	}
-	if err := session.Query("SELECT ip FROM inet_test").Scan(&ipResult); err != nil {
-		t.Fatalf("select for net.IP from inet_test 2 failed: %v", err)
-	}
-	if ipResult.String() != netIp.String() {
-		t.Errorf("Expected %s, was %s", netIp.String(), ipResult.String())
-	}
-
-}
-
-func TestVarint(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE varint_test (id varchar, test varint, test2 varint, primary key (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query(`INSERT INTO varint_test (id, test) VALUES (?, ?)`, "id", 0).Exec(); err != nil {
-		t.Fatalf("insert varint: %v", err)
-	}
-
-	var result int
-	if err := session.Query("SELECT test FROM varint_test").Scan(&result); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if result != 0 {
-		t.Errorf("Expected 0, was %d", result)
-	}
-
-	if err := session.Query(`INSERT INTO varint_test (id, test) VALUES (?, ?)`, "id", -1).Exec(); err != nil {
-		t.Fatalf("insert varint: %v", err)
-	}
-
-	if err := session.Query("SELECT test FROM varint_test").Scan(&result); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if result != -1 {
-		t.Errorf("Expected -1, was %d", result)
-	}
-
-	if err := session.Query(`INSERT INTO varint_test (id, test) VALUES (?, ?)`, "id", int64(math.MaxInt32)+1).Exec(); err != nil {
-		t.Fatalf("insert varint: %v", err)
-	}
-
-	var result64 int64
-	if err := session.Query("SELECT test FROM varint_test").Scan(&result64); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if result64 != int64(math.MaxInt32)+1 {
-		t.Errorf("Expected %d, was %d", int64(math.MaxInt32)+1, result64)
-	}
-
-	biggie := new(big.Int)
-	biggie.SetString("36893488147419103232", 10) // > 2**64
-	if err := session.Query(`INSERT INTO varint_test (id, test) VALUES (?, ?)`, "id", biggie).Exec(); err != nil {
-		t.Fatalf("insert varint: %v", err)
-	}
-
-	resultBig := new(big.Int)
-	if err := session.Query("SELECT test FROM varint_test").Scan(resultBig); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if resultBig.String() != biggie.String() {
-		t.Errorf("Expected %s, was %s", biggie.String(), resultBig.String())
-	}
-
-	err := session.Query("SELECT test FROM varint_test").Scan(&result64)
-	if err == nil || strings.Index(err.Error(), "out of range") == -1 {
-		t.Errorf("expected out of range error since value is too big for int64")
-	}
-
-	// value not set in cassandra, leave bind variable empty
-	resultBig = new(big.Int)
-	if err := session.Query("SELECT test2 FROM varint_test").Scan(resultBig); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if resultBig.Int64() != 0 {
-		t.Errorf("Expected %s, was %s", biggie.String(), resultBig.String())
-	}
-
-	// can use double pointer to explicitly detect value is not set in cassandra
-	if err := session.Query("SELECT test2 FROM varint_test").Scan(&resultBig); err != nil {
-		t.Fatalf("select from varint_test failed: %v", err)
-	}
-
-	if resultBig != nil {
-		t.Errorf("Expected %v, was %v", nil, *resultBig)
-	}
-}
-
-//TestQueryStats confirms that the stats are returning valid data. Accuracy may be questionable.
-func TestQueryStats(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-	qry := session.Query("SELECT * FROM system.peers")
-	if err := qry.Exec(); err != nil {
-		t.Fatalf("query failed. %v", err)
-	} else {
-		if qry.Attempts() < 1 {
-			t.Fatal("expected at least 1 attempt, but got 0")
-		}
-		if qry.Latency() <= 0 {
-			t.Fatalf("expected latency to be greater than 0, but got %v instead.", qry.Latency())
-		}
-	}
-}
-
-//TestBatchStats confirms that the stats are returning valid data. Accuracy may be questionable.
-func TestBatchStats(t *testing.T) {
-	if *flagProto == 1 {
-		t.Skip("atomic batches not supported. Please use Cassandra >= 2.0")
-	}
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE batchStats (id int, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	b := session.NewBatch(LoggedBatch)
-	b.Query("INSERT INTO batchStats (id) VALUES (?)", 1)
-	b.Query("INSERT INTO batchStats (id) VALUES (?)", 2)
-
-	if err := session.ExecuteBatch(b); err != nil {
-		t.Fatalf("query failed. %v", err)
-	} else {
-		if b.Attempts() < 1 {
-			t.Fatal("expected at least 1 attempt, but got 0")
-		}
-		if b.Latency() <= 0 {
-			t.Fatalf("expected latency to be greater than 0, but got %v instead.", b.Latency())
-		}
-	}
-}
-
-//TestNilInQuery tests to see that a nil value passed to a query is handled by Cassandra
-//TODO validate the nil value by reading back the nil. Need to fix Unmarshalling.
-func TestNilInQuery(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE testNilInsert (id int, count int, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-	if err := session.Query("INSERT INTO testNilInsert (id,count) VALUES (?,?)", 1, nil).Exec(); err != nil {
-		t.Fatalf("failed to insert with err: %v", err)
-	}
-
-	var id int
-
-	if err := session.Query("SELECT id FROM testNilInsert").Scan(&id); err != nil {
-		t.Fatalf("failed to select with err: %v", err)
-	} else if id != 1 {
-		t.Fatalf("expected id to be 1, got %v", id)
-	}
-}
-
-// Don't initialize time.Time bind variable if cassandra timestamp column is empty
-func TestEmptyTimestamp(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE test_empty_timestamp (id int, time timestamp, num int, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query("INSERT INTO test_empty_timestamp (id, num) VALUES (?,?)", 1, 561).Exec(); err != nil {
-		t.Fatalf("failed to insert with err: %v", err)
-	}
-
-	var timeVal time.Time
-
-	if err := session.Query("SELECT time FROM test_empty_timestamp where id = ?", 1).Scan(&timeVal); err != nil {
-		t.Fatalf("failed to select with err: %v", err)
-	}
-
-	if !timeVal.IsZero() {
-		t.Errorf("time.Time bind variable should still be empty (was %s)", timeVal)
-	}
-}
-
-// Integration test of just querying for data from the system.schema_keyspace table
-func TestGetKeyspaceMetadata(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	keyspaceMetadata, err := getKeyspaceMetadata(session, "gocql_test")
-	if err != nil {
-		t.Fatalf("failed to query the keyspace metadata with err: %v", err)
-	}
-	if keyspaceMetadata == nil {
-		t.Fatal("failed to query the keyspace metadata, nil returned")
-	}
-	if keyspaceMetadata.Name != "gocql_test" {
-		t.Errorf("Expected keyspace name to be 'gocql' but was '%s'", keyspaceMetadata.Name)
-	}
-	if keyspaceMetadata.StrategyClass != "org.apache.cassandra.locator.SimpleStrategy" {
-		t.Errorf("Expected replication strategy class to be 'org.apache.cassandra.locator.SimpleStrategy' but was '%s'", keyspaceMetadata.StrategyClass)
-	}
-	if keyspaceMetadata.StrategyOptions == nil {
-		t.Error("Expected replication strategy options map but was nil")
-	}
-	rfStr, ok := keyspaceMetadata.StrategyOptions["replication_factor"]
-	if !ok {
-		t.Fatalf("Expected strategy option 'replication_factor' but was not found in %v", keyspaceMetadata.StrategyOptions)
-	}
-	rfInt, err := strconv.Atoi(rfStr.(string))
-	if err != nil {
-		t.Fatalf("Error converting string to int with err: %v", err)
-	}
-	if rfInt != *flagRF {
-		t.Errorf("Expected replication factor to be %d but was %d", *flagRF, rfInt)
-	}
-}
-
-// Integration test of just querying for data from the system.schema_columnfamilies table
-func TestGetTableMetadata(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE test_table_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	tables, err := getTableMetadata(session, "gocql_test")
-	if err != nil {
-		t.Fatalf("failed to query the table metadata with err: %v", err)
-	}
-	if tables == nil {
-		t.Fatal("failed to query the table metadata, nil returned")
-	}
-
-	var testTable *TableMetadata
-
-	// verify all tables have minimum expected data
-	for i := range tables {
-		table := &tables[i]
-
-		if table.Name == "" {
-			t.Errorf("Expected table name to be set, but it was empty: index=%d metadata=%+v", i, table)
-		}
-		if table.Keyspace != "gocql_test" {
-			t.Errorf("Expected keyspace for '%d' table metadata to be 'gocql_test' but was '%s'", table.Name, table.Keyspace)
-		}
-		if table.KeyValidator == "" {
-			t.Errorf("Expected key validator to be set for table %s", table.Name)
-		}
-		if table.Comparator == "" {
-			t.Errorf("Expected comparator to be set for table %s", table.Name)
-		}
-		if table.DefaultValidator == "" {
-			t.Errorf("Expected default validator to be set for table %s", table.Name)
-		}
-
-		// these fields are not set until the metadata is compiled
-		if table.PartitionKey != nil {
-			t.Errorf("Did not expect partition key for table %s", table.Name)
-		}
-		if table.ClusteringColumns != nil {
-			t.Errorf("Did not expect clustering columns for table %s", table.Name)
-		}
-		if table.Columns != nil {
-			t.Errorf("Did not expect columns for table %s", table.Name)
-		}
-
-		// for the next part of the test after this loop, find the metadata for the test table
-		if table.Name == "test_table_metadata" {
-			testTable = table
-		}
-	}
-
-	// verify actual values on the test tables
-	if testTable == nil {
-		t.Fatal("Expected table metadata for name 'test_table_metadata'")
-	}
-	if testTable.KeyValidator != "org.apache.cassandra.db.marshal.Int32Type" {
-		t.Errorf("Expected test_table_metadata key validator to be 'org.apache.cassandra.db.marshal.Int32Type' but was '%s'", testTable.KeyValidator)
-	}
-	if testTable.Comparator != "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.UTF8Type)" {
-		t.Errorf("Expected test_table_metadata key validator to be 'org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.UTF8Type)' but was '%s'", testTable.Comparator)
-	}
-	if testTable.DefaultValidator != "org.apache.cassandra.db.marshal.BytesType" {
-		t.Errorf("Expected test_table_metadata key validator to be 'org.apache.cassandra.db.marshal.BytesType' but was '%s'", testTable.DefaultValidator)
-	}
-	expectedKeyAliases := []string{"first_id"}
-	if !reflect.DeepEqual(testTable.KeyAliases, expectedKeyAliases) {
-		t.Errorf("Expected key aliases %v but was %v", expectedKeyAliases, testTable.KeyAliases)
-	}
-	expectedColumnAliases := []string{"second_id"}
-	if !reflect.DeepEqual(testTable.ColumnAliases, expectedColumnAliases) {
-		t.Errorf("Expected key aliases %v but was %v", expectedColumnAliases, testTable.ColumnAliases)
-	}
-	if testTable.ValueAlias != "" {
-		t.Errorf("Expected value alias '' but was '%s'", testTable.ValueAlias)
-	}
-}
-
-// Integration test of just querying for data from the system.schema_columns table
-func TestGetColumnMetadata(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE test_column_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query("CREATE INDEX index_column_metadata ON test_column_metadata ( third_id )").Exec(); err != nil {
-		t.Fatalf("failed to create index with err: %v", err)
-	}
-
-	columns, err := getColumnMetadata(session, "gocql_test")
-	if err != nil {
-		t.Fatalf("failed to query column metadata with err: %v", err)
-	}
-	if columns == nil {
-		t.Fatal("failed to query column metadata, nil returned")
-	}
-
-	testColumns := map[string]*ColumnMetadata{}
-
-	// verify actual values on the test columns
-	for i := range columns {
-		column := &columns[i]
-
-		if column.Name == "" {
-			t.Errorf("Expected column name to be set, but it was empty: index=%d metadata=%+v", i, column)
-		}
-		if column.Table == "" {
-			t.Errorf("Expected column %s table name to be set, but it was empty", column.Name)
-		}
-		if column.Keyspace != "gocql_test" {
-			t.Errorf("Expected column %s keyspace name to be 'gocql_test', but it was '%s'", column.Name, column.Keyspace)
-		}
-		if column.Kind == "" {
-			t.Errorf("Expected column %s kind to be set, but it was empty", column.Name)
-		}
-		if session.cfg.ProtoVersion == 1 && column.Kind != "regular" {
-			t.Errorf("Expected column %s kind to be set to 'regular' for proto V1 but it was '%s'", column.Name, column.Kind)
-		}
-		if column.Validator == "" {
-			t.Errorf("Expected column %s validator to be set, but it was empty", column.Name)
-		}
-
-		// find the test table columns for the next step after this loop
-		if column.Table == "test_column_metadata" {
-			testColumns[column.Name] = column
-		}
-	}
-
-	if *flagProto == 1 {
-		// V1 proto only returns "regular columns"
-		if len(testColumns) != 1 {
-			t.Errorf("Expected 1 test columns but there were %d", len(testColumns))
-		}
-		thirdID, found := testColumns["third_id"]
-		if !found {
-			t.Fatalf("Expected to find column 'third_id' metadata but there was only %v", testColumns)
-		}
-
-		if thirdID.Kind != REGULAR {
-			t.Errorf("Expected %s column kind to be '%s' but it was '%s'", thirdID.Name, REGULAR, thirdID.Kind)
-		}
-
-		if thirdID.Index.Name != "index_column_metadata" {
-			t.Errorf("Expected %s column index name to be 'index_column_metadata' but it was '%s'", thirdID.Name, thirdID.Index.Name)
-		}
-	} else {
-		if len(testColumns) != 3 {
-			t.Errorf("Expected 3 test columns but there were %d", len(testColumns))
-		}
-		firstID, found := testColumns["first_id"]
-		if !found {
-			t.Fatalf("Expected to find column 'first_id' metadata but there was only %v", testColumns)
-		}
-		secondID, found := testColumns["second_id"]
-		if !found {
-			t.Fatalf("Expected to find column 'second_id' metadata but there was only %v", testColumns)
-		}
-		thirdID, found := testColumns["third_id"]
-		if !found {
-			t.Fatalf("Expected to find column 'third_id' metadata but there was only %v", testColumns)
-		}
-
-		if firstID.Kind != PARTITION_KEY {
-			t.Errorf("Expected %s column kind to be '%s' but it was '%s'", firstID.Name, PARTITION_KEY, firstID.Kind)
-		}
-		if secondID.Kind != CLUSTERING_KEY {
-			t.Errorf("Expected %s column kind to be '%s' but it was '%s'", secondID.Name, CLUSTERING_KEY, secondID.Kind)
-		}
-		if thirdID.Kind != REGULAR {
-			t.Errorf("Expected %s column kind to be '%s' but it was '%s'", thirdID.Name, REGULAR, thirdID.Kind)
-		}
-
-		if thirdID.Index.Name != "index_column_metadata" {
-			t.Errorf("Expected %s column index name to be 'index_column_metadata' but it was '%s'", thirdID.Name, thirdID.Index.Name)
-		}
-	}
-}
-
-// Integration test of querying and composition the keyspace metadata
-func TestKeyspaceMetadata(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE test_metadata (first_id int, second_id int, third_id int, PRIMARY KEY (first_id, second_id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	if err := session.Query("CREATE INDEX index_metadata ON test_metadata ( third_id )").Exec(); err != nil {
-		t.Fatalf("failed to create index with err: %v", err)
-	}
-
-	keyspaceMetadata, err := session.KeyspaceMetadata("gocql_test")
-	if err != nil {
-		t.Fatalf("failed to query keyspace metadata with err: %v", err)
-	}
-	if keyspaceMetadata == nil {
-		t.Fatal("expected the keyspace metadata to not be nil, but it was nil")
-	}
-	if keyspaceMetadata.Name != session.cfg.Keyspace {
-		t.Fatalf("Expected the keyspace name to be %s but was %s", session.cfg.Keyspace, keyspaceMetadata.Name)
-	}
-	if len(keyspaceMetadata.Tables) == 0 {
-		t.Errorf("Expected tables but there were none")
-	}
-
-	tableMetadata, found := keyspaceMetadata.Tables["test_metadata"]
-	if !found {
-		t.Fatalf("failed to find the test_metadata table metadata")
-	}
-
-	if len(tableMetadata.PartitionKey) != 1 {
-		t.Errorf("expected partition key length of 1, but was %d", len(tableMetadata.PartitionKey))
-	}
-	for i, column := range tableMetadata.PartitionKey {
-		if column == nil {
-			t.Errorf("partition key column metadata at index %d was nil", i)
-		}
-	}
-	if tableMetadata.PartitionKey[0].Name != "first_id" {
-		t.Errorf("Expected the first partition key column to be 'first_id' but was '%s'", tableMetadata.PartitionKey[0].Name)
-	}
-	if len(tableMetadata.ClusteringColumns) != 1 {
-		t.Fatalf("expected clustering columns length of 1, but was %d", len(tableMetadata.ClusteringColumns))
-	}
-	for i, column := range tableMetadata.ClusteringColumns {
-		if column == nil {
-			t.Fatalf("clustering column metadata at index %d was nil", i)
-		}
-	}
-	if tableMetadata.ClusteringColumns[0].Name != "second_id" {
-		t.Errorf("Expected the first clustering column to be 'second_id' but was '%s'", tableMetadata.ClusteringColumns[0].Name)
-	}
-	thirdColumn, found := tableMetadata.Columns["third_id"]
-	if !found {
-		t.Fatalf("Expected a column definition for 'third_id'")
-	}
-	if thirdColumn.Index.Name != "index_metadata" {
-		t.Errorf("Expected column index named 'index_metadata' but was '%s'", thirdColumn.Index.Name)
-	}
-}
-
-// Integration test of the routing key calculation
-func TestRoutingKey(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE test_single_routing_key (first_id int, second_id int, PRIMARY KEY (first_id, second_id))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-	if err := createTable(session, "CREATE TABLE test_composite_routing_key (first_id int, second_id int, PRIMARY KEY ((first_id, second_id)))"); err != nil {
-		t.Fatalf("failed to create table with error '%v'", err)
-	}
-
-	routingKeyInfo, err := session.routingKeyInfo("SELECT * FROM test_single_routing_key WHERE second_id=? AND first_id=?")
-	if err != nil {
-		t.Fatalf("failed to get routing key info due to error: %v", err)
-	}
-	if routingKeyInfo == nil {
-		t.Fatal("Expected routing key info, but was nil")
-	}
-	if len(routingKeyInfo.indexes) != 1 {
-		t.Fatalf("Expected routing key indexes length to be 1 but was %d", len(routingKeyInfo.indexes))
-	}
-	if routingKeyInfo.indexes[0] != 1 {
-		t.Errorf("Expected routing key index[0] to be 1 but was %d", routingKeyInfo.indexes[0])
-	}
-	if len(routingKeyInfo.types) != 1 {
-		t.Fatalf("Expected routing key types length to be 1 but was %d", len(routingKeyInfo.types))
-	}
-	if routingKeyInfo.types[0] == nil {
-		t.Fatal("Expected routing key types[0] to be non-nil")
-	}
-	if routingKeyInfo.types[0].Type() != TypeInt {
-		t.Fatalf("Expected routing key types[0].Type to be %v but was %v", TypeInt, routingKeyInfo.types[0].Type())
-	}
-
-	// verify the cache is working
-	routingKeyInfo, err = session.routingKeyInfo("SELECT * FROM test_single_routing_key WHERE second_id=? AND first_id=?")
-	if err != nil {
-		t.Fatalf("failed to get routing key info due to error: %v", err)
-	}
-	if len(routingKeyInfo.indexes) != 1 {
-		t.Fatalf("Expected routing key indexes length to be 1 but was %d", len(routingKeyInfo.indexes))
-	}
-	if routingKeyInfo.indexes[0] != 1 {
-		t.Errorf("Expected routing key index[0] to be 1 but was %d", routingKeyInfo.indexes[0])
-	}
-	if len(routingKeyInfo.types) != 1 {
-		t.Fatalf("Expected routing key types length to be 1 but was %d", len(routingKeyInfo.types))
-	}
-	if routingKeyInfo.types[0] == nil {
-		t.Fatal("Expected routing key types[0] to be non-nil")
-	}
-	if routingKeyInfo.types[0].Type() != TypeInt {
-		t.Fatalf("Expected routing key types[0] to be %v but was %v", TypeInt, routingKeyInfo.types[0].Type())
-	}
-	cacheSize := session.routingKeyInfoCache.lru.Len()
-	if cacheSize != 1 {
-		t.Errorf("Expected cache size to be 1 but was %d", cacheSize)
-	}
-
-	query := session.Query("SELECT * FROM test_single_routing_key WHERE second_id=? AND first_id=?", 1, 2)
-	routingKey, err := query.GetRoutingKey()
-	if err != nil {
-		t.Fatalf("Failed to get routing key due to error: %v", err)
-	}
-	expectedRoutingKey := []byte{0, 0, 0, 2}
-	if !reflect.DeepEqual(expectedRoutingKey, routingKey) {
-		t.Errorf("Expected routing key %v but was %v", expectedRoutingKey, routingKey)
-	}
-
-	routingKeyInfo, err = session.routingKeyInfo("SELECT * FROM test_composite_routing_key WHERE second_id=? AND first_id=?")
-	if err != nil {
-		t.Fatalf("failed to get routing key info due to error: %v", err)
-	}
-	if routingKeyInfo == nil {
-		t.Fatal("Expected routing key info, but was nil")
-	}
-	if len(routingKeyInfo.indexes) != 2 {
-		t.Fatalf("Expected routing key indexes length to be 2 but was %d", len(routingKeyInfo.indexes))
-	}
-	if routingKeyInfo.indexes[0] != 1 {
-		t.Errorf("Expected routing key index[0] to be 1 but was %d", routingKeyInfo.indexes[0])
-	}
-	if routingKeyInfo.indexes[1] != 0 {
-		t.Errorf("Expected routing key index[1] to be 0 but was %d", routingKeyInfo.indexes[1])
-	}
-	if len(routingKeyInfo.types) != 2 {
-		t.Fatalf("Expected routing key types length to be 1 but was %d", len(routingKeyInfo.types))
-	}
-	if routingKeyInfo.types[0] == nil {
-		t.Fatal("Expected routing key types[0] to be non-nil")
-	}
-	if routingKeyInfo.types[0].Type() != TypeInt {
-		t.Fatalf("Expected routing key types[0] to be %v but was %v", TypeInt, routingKeyInfo.types[0].Type())
-	}
-	if routingKeyInfo.types[1] == nil {
-		t.Fatal("Expected routing key types[1] to be non-nil")
-	}
-	if routingKeyInfo.types[1].Type() != TypeInt {
-		t.Fatalf("Expected routing key types[0] to be %v but was %v", TypeInt, routingKeyInfo.types[1].Type())
-	}
-
-	query = session.Query("SELECT * FROM test_composite_routing_key WHERE second_id=? AND first_id=?", 1, 2)
-	routingKey, err = query.GetRoutingKey()
-	if err != nil {
-		t.Fatalf("Failed to get routing key due to error: %v", err)
-	}
-	expectedRoutingKey = []byte{0, 4, 0, 0, 0, 2, 0, 0, 4, 0, 0, 0, 1, 0}
-	if !reflect.DeepEqual(expectedRoutingKey, routingKey) {
-		t.Errorf("Expected routing key %v but was %v", expectedRoutingKey, routingKey)
-	}
-
-	// verify the cache is working
-	cacheSize = session.routingKeyInfoCache.lru.Len()
-	if cacheSize != 2 {
-		t.Errorf("Expected cache size to be 2 but was %d", cacheSize)
-	}
-}
-
-// Integration test of the token-aware policy-based connection pool
-func TestTokenAwareConnPool(t *testing.T) {
-	cluster := createCluster()
-	cluster.ConnPoolType = NewTokenAwareConnPool
-	cluster.DiscoverHosts = true
-
-	// Drop and re-create the keyspace once. Different tests should use their own
-	// individual tables, but can assume that the table does not exist before.
-	initOnce.Do(func() {
-		createKeyspace(t, cluster, "gocql_test")
-	})
-
-	cluster.Keyspace = "gocql_test"
-	session, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal("createSession:", err)
-	}
-	defer session.Close()
-
-	if *clusterSize > 1 {
-		// wait for autodiscovery to update the pool with the list of known hosts
-		time.Sleep(*flagAutoWait)
-	}
-
-	if session.Pool.Size() != cluster.NumConns*len(cluster.Hosts) {
-		t.Errorf("Expected pool size %d but was %d", cluster.NumConns*len(cluster.Hosts), session.Pool.Size())
-	}
-
-	if err := createTable(session, "CREATE TABLE test_token_aware (id int, data text, PRIMARY KEY (id))"); err != nil {
-		t.Fatalf("failed to create test_token_aware table with err: %v", err)
-	}
-	query := session.Query("INSERT INTO test_token_aware (id, data) VALUES (?,?)", 42, "8 * 6 =")
-	if err := query.Exec(); err != nil {
-		t.Fatalf("failed to insert with err: %v", err)
-	}
-	query = session.Query("SELECT data FROM test_token_aware where id = ?", 42).Consistency(One)
-	iter := query.Iter()
-	var data string
-	if !iter.Scan(&data) {
-		t.Error("failed to scan data")
-	}
-	if err := iter.Close(); err != nil {
-		t.Errorf("iter failed with err: %v", err)
-	}
-
-	// TODO add verification that the query went to the correct host
-}
-
-type frameWriterFunc func(framer *framer, streamID int) error
-
-func (f frameWriterFunc) writeFrame(framer *framer, streamID int) error {
-	return f(framer, streamID)
-}
-
-func TestStream0(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	var conn *Conn
-	for i := 0; i < 5; i++ {
-		if conn != nil {
-			break
-		}
-
-		conn = session.Pool.Pick(nil)
-	}
-
-	if conn == nil {
-		t.Fatal("no connections available in the pool")
-	}
-
-	writer := frameWriterFunc(func(f *framer, streamID int) error {
-		if streamID == 0 {
-			t.Fatal("should not use stream 0 for requests")
-		}
-		f.writeHeader(0, opError, streamID)
-		f.writeString("i am a bad frame")
-		f.wbuf[0] = 0xFF
-		return f.finishWrite()
-	})
-
-	const expErr = "gocql: error on stream 0:"
-	// need to write out an invalid frame, which we need a connection to do
-	frame, err := conn.exec(writer, nil)
-	if err == nil {
-		t.Fatal("expected to get an error on stream 0")
-	} else if !strings.HasPrefix(err.Error(), expErr) {
-		t.Fatalf("expected to get error prefix %q got %q", expErr, err.Error())
-	} else if frame != nil {
-		t.Fatalf("expected to get nil frame got %+v", frame)
-	}
-}
-
-func TestNegativeStream(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	var conn *Conn
-	for i := 0; i < 5; i++ {
-		if conn != nil {
-			break
-		}
-
-		conn = session.Pool.Pick(nil)
-	}
-
-	if conn == nil {
-		t.Fatal("no connections available in the pool")
-	}
-
-	const stream = -50
-	writer := frameWriterFunc(func(f *framer, streamID int) error {
-		f.writeHeader(0, opOptions, stream)
-		return f.finishWrite()
-	})
-
-	frame, err := conn.exec(writer, nil)
-	if err == nil {
-		t.Fatalf("expected to get an error on stream %d", stream)
-	} else if frame != nil {
-		t.Fatalf("expected to get nil frame got %+v", frame)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/cluster.go b/vendor/github.com/gocql/gocql/cluster.go
deleted file mode 100644
index 94b1bc486..000000000
--- a/vendor/github.com/gocql/gocql/cluster.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"errors"
-	"sync"
-	"time"
-
-	"github.com/golang/groupcache/lru"
-)
-
-const defaultMaxPreparedStmts = 1000
-
-//Package global reference to Prepared Statements LRU
-var stmtsLRU preparedLRU
-
-//preparedLRU is the prepared statement cache
-type preparedLRU struct {
-	sync.Mutex
-	lru *lru.Cache
-}
-
-//Max adjusts the maximum size of the cache and cleans up the oldest records if
-//the new max is lower than the previous value. Not concurrency safe.
-func (p *preparedLRU) Max(max int) {
-	for p.lru.Len() > max {
-		p.lru.RemoveOldest()
-	}
-	p.lru.MaxEntries = max
-}
-
-func initStmtsLRU(max int) {
-	if stmtsLRU.lru != nil {
-		stmtsLRU.Max(max)
-	} else {
-		stmtsLRU.lru = lru.New(max)
-	}
-}
-
-// To enable periodic node discovery enable DiscoverHosts in ClusterConfig
-type DiscoveryConfig struct {
-	// If not empty will filter all discoverred hosts to a single Data Centre (default: "")
-	DcFilter string
-	// If not empty will filter all discoverred hosts to a single Rack (default: "")
-	RackFilter string
-	// The interval to check for new hosts (default: 30s)
-	Sleep time.Duration
-}
-
-// ClusterConfig is a struct to configure the default cluster implementation
-// of gocoql. It has a varity of attributes that can be used to modify the
-// behavior to fit the most common use cases. Applications that requre a
-// different setup must implement their own cluster.
-type ClusterConfig struct {
-	Hosts             []string          // addresses for the initial connections
-	CQLVersion        string            // CQL version (default: 3.0.0)
-	ProtoVersion      int               // version of the native protocol (default: 2)
-	Timeout           time.Duration     // connection timeout (default: 600ms)
-	Port              int               // port (default: 9042)
-	Keyspace          string            // initial keyspace (optional)
-	NumConns          int               // number of connections per host (default: 2)
-	NumStreams        int               // number of streams per connection (default: max per protocol, either 128 or 32768)
-	Consistency       Consistency       // default consistency level (default: Quorum)
-	Compressor        Compressor        // compression algorithm (default: nil)
-	Authenticator     Authenticator     // authenticator (default: nil)
-	RetryPolicy       RetryPolicy       // Default retry policy to use for queries (default: 0)
-	SocketKeepalive   time.Duration     // The keepalive period to use, enabled if > 0 (default: 0)
-	ConnPoolType      NewPoolFunc       // The function used to create the connection pool for the session (default: NewSimplePool)
-	DiscoverHosts     bool              // If set, gocql will attempt to automatically discover other members of the Cassandra cluster (default: false)
-	MaxPreparedStmts  int               // Sets the maximum cache size for prepared statements globally for gocql (default: 1000)
-	MaxRoutingKeyInfo int               // Sets the maximum cache size for query info about statements for each session (default: 1000)
-	PageSize          int               // Default page size to use for created sessions (default: 5000)
-	SerialConsistency SerialConsistency // Sets the consistency for the serial part of queries, values can be either SERIAL or LOCAL_SERIAL (default: unset)
-	Discovery         DiscoveryConfig
-	SslOpts           *SslOptions
-	DefaultTimestamp  bool // Sends a client side timestamp for all requests which overrides the timestamp at which it arrives at the server. (default: true, only enabled for protocol 3 and above)
-}
-
-// NewCluster generates a new config for the default cluster implementation.
-func NewCluster(hosts ...string) *ClusterConfig {
-	cfg := &ClusterConfig{
-		Hosts:             hosts,
-		CQLVersion:        "3.0.0",
-		ProtoVersion:      2,
-		Timeout:           600 * time.Millisecond,
-		Port:              9042,
-		NumConns:          2,
-		Consistency:       Quorum,
-		ConnPoolType:      NewSimplePool,
-		DiscoverHosts:     false,
-		MaxPreparedStmts:  defaultMaxPreparedStmts,
-		MaxRoutingKeyInfo: 1000,
-		PageSize:          5000,
-		DefaultTimestamp:  true,
-	}
-	return cfg
-}
-
-// CreateSession initializes the cluster based on this config and returns a
-// session object that can be used to interact with the database.
-func (cfg *ClusterConfig) CreateSession() (*Session, error) {
-	return NewSession(*cfg)
-}
-
-var (
-	ErrNoHosts              = errors.New("no hosts provided")
-	ErrNoConnectionsStarted = errors.New("no connections were made when creating the session")
-	ErrHostQueryFailed      = errors.New("unable to populate Hosts")
-)
diff --git a/vendor/github.com/gocql/gocql/compressor.go b/vendor/github.com/gocql/gocql/compressor.go
deleted file mode 100644
index 26853ae7f..000000000
--- a/vendor/github.com/gocql/gocql/compressor.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package gocql
-
-import (
-	"github.com/golang/snappy"
-)
-
-type Compressor interface {
-	Name() string
-	Encode(data []byte) ([]byte, error)
-	Decode(data []byte) ([]byte, error)
-}
-
-// SnappyCompressor implements the Compressor interface and can be used to
-// compress incoming and outgoing frames. The snappy compression algorithm
-// aims for very high speeds and reasonable compression.
-type SnappyCompressor struct{}
-
-func (s SnappyCompressor) Name() string {
-	return "snappy"
-}
-
-func (s SnappyCompressor) Encode(data []byte) ([]byte, error) {
-	return snappy.Encode(nil, data), nil
-}
-
-func (s SnappyCompressor) Decode(data []byte) ([]byte, error) {
-	return snappy.Decode(nil, data)
-}
diff --git a/vendor/github.com/gocql/gocql/compressor_test.go b/vendor/github.com/gocql/gocql/compressor_test.go
deleted file mode 100644
index cbf16a468..000000000
--- a/vendor/github.com/gocql/gocql/compressor_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build all unit
-
-package gocql
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/golang/snappy"
-)
-
-func TestSnappyCompressor(t *testing.T) {
-	c := SnappyCompressor{}
-	if c.Name() != "snappy" {
-		t.Fatalf("expected name to be 'snappy', got %v", c.Name())
-	}
-
-	str := "My Test String"
-	//Test Encoding
-	expected := snappy.Encode(nil, []byte(str))
-	if res, err := c.Encode([]byte(str)); err != nil {
-		t.Fatalf("failed to encode '%v' with error %v", str, err)
-	} else if bytes.Compare(expected, res) != 0 {
-		t.Fatal("failed to match the expected encoded value with the result encoded value.")
-	}
-
-	val, err := c.Encode([]byte(str))
-	if err != nil {
-		t.Fatalf("failed to encode '%v' with error '%v'", str, err)
-	}
-
-	//Test Decoding
-	if expected, err := snappy.Decode(nil, val); err != nil {
-		t.Fatalf("failed to decode '%v' with error %v", val, err)
-	} else if res, err := c.Decode(val); err != nil {
-		t.Fatalf("failed to decode '%v' with error %v", val, err)
-	} else if bytes.Compare(expected, res) != 0 {
-		t.Fatal("failed to match the expected decoded value with the result decoded value.")
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/conn.go b/vendor/github.com/gocql/gocql/conn.go
deleted file mode 100644
index cec77c3f6..000000000
--- a/vendor/github.com/gocql/gocql/conn.go
+++ /dev/null
@@ -1,824 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"bufio"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-//JoinHostPort is a utility to return a address string that can be used
-//gocql.Conn to form a connection with a host.
-func JoinHostPort(addr string, port int) string {
-	addr = strings.TrimSpace(addr)
-	if _, _, err := net.SplitHostPort(addr); err != nil {
-		addr = net.JoinHostPort(addr, strconv.Itoa(port))
-	}
-	return addr
-}
-
-type Authenticator interface {
-	Challenge(req []byte) (resp []byte, auth Authenticator, err error)
-	Success(data []byte) error
-}
-
-type PasswordAuthenticator struct {
-	Username string
-	Password string
-}
-
-func (p PasswordAuthenticator) Challenge(req []byte) ([]byte, Authenticator, error) {
-	if string(req) != "org.apache.cassandra.auth.PasswordAuthenticator" {
-		return nil, nil, fmt.Errorf("unexpected authenticator %q", req)
-	}
-	resp := make([]byte, 2+len(p.Username)+len(p.Password))
-	resp[0] = 0
-	copy(resp[1:], p.Username)
-	resp[len(p.Username)+1] = 0
-	copy(resp[2+len(p.Username):], p.Password)
-	return resp, nil, nil
-}
-
-func (p PasswordAuthenticator) Success(data []byte) error {
-	return nil
-}
-
-type SslOptions struct {
-	tls.Config
-
-	// CertPath and KeyPath are optional depending on server
-	// config, but both fields must be omitted to avoid using a
-	// client certificate
-	CertPath string
-	KeyPath  string
-	CaPath   string //optional depending on server config
-	// If you want to verify the hostname and server cert (like a wildcard for cass cluster) then you should turn this on
-	// This option is basically the inverse of InSecureSkipVerify
-	// See InSecureSkipVerify in http://golang.org/pkg/crypto/tls/ for more info
-	EnableHostVerification bool
-}
-
-type ConnConfig struct {
-	ProtoVersion  int
-	CQLVersion    string
-	Timeout       time.Duration
-	NumStreams    int
-	Compressor    Compressor
-	Authenticator Authenticator
-	Keepalive     time.Duration
-	tlsConfig     *tls.Config
-}
-
-type ConnErrorHandler interface {
-	HandleError(conn *Conn, err error, closed bool)
-}
-
-// How many timeouts we will allow to occur before the connection is closed
-// and restarted. This is to prevent a single query timeout from killing a connection
-// which may be serving more queries just fine.
-// Default is 10, should not be changed concurrently with queries.
-var TimeoutLimit int64 = 10
-
-// Conn is a single connection to a Cassandra node. It can be used to execute
-// queries, but users are usually advised to use a more reliable, higher
-// level API.
-type Conn struct {
-	conn    net.Conn
-	r       *bufio.Reader
-	timeout time.Duration
-
-	headerBuf []byte
-
-	uniq  chan int
-	calls []callReq
-
-	errorHandler    ConnErrorHandler
-	compressor      Compressor
-	auth            Authenticator
-	addr            string
-	version         uint8
-	currentKeyspace string
-	started         bool
-
-	closed int32
-	quit   chan struct{}
-
-	timeouts int64
-}
-
-// Connect establishes a connection to a Cassandra node.
-// You must also call the Serve method before you can execute any queries.
-func Connect(addr string, cfg ConnConfig, errorHandler ConnErrorHandler) (*Conn, error) {
-	var (
-		err  error
-		conn net.Conn
-	)
-
-	dialer := &net.Dialer{
-		Timeout: cfg.Timeout,
-	}
-
-	if cfg.tlsConfig != nil {
-		// the TLS config is safe to be reused by connections but it must not
-		// be modified after being used.
-		conn, err = tls.DialWithDialer(dialer, "tcp", addr, cfg.tlsConfig)
-	} else {
-		conn, err = dialer.Dial("tcp", addr)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	// going to default to proto 2
-	if cfg.ProtoVersion < protoVersion1 || cfg.ProtoVersion > protoVersion3 {
-		log.Printf("unsupported protocol version: %d using 2\n", cfg.ProtoVersion)
-		cfg.ProtoVersion = 2
-	}
-
-	headerSize := 8
-
-	maxStreams := 128
-	if cfg.ProtoVersion > protoVersion2 {
-		maxStreams = 32768
-		headerSize = 9
-	}
-
-	if cfg.NumStreams <= 0 || cfg.NumStreams >= maxStreams {
-		cfg.NumStreams = maxStreams
-	} else {
-		cfg.NumStreams++
-	}
-
-	c := &Conn{
-		conn:         conn,
-		r:            bufio.NewReader(conn),
-		uniq:         make(chan int, cfg.NumStreams),
-		calls:        make([]callReq, cfg.NumStreams),
-		timeout:      cfg.Timeout,
-		version:      uint8(cfg.ProtoVersion),
-		addr:         conn.RemoteAddr().String(),
-		errorHandler: errorHandler,
-		compressor:   cfg.Compressor,
-		auth:         cfg.Authenticator,
-		headerBuf:    make([]byte, headerSize),
-		quit:         make(chan struct{}),
-	}
-
-	if cfg.Keepalive > 0 {
-		c.setKeepalive(cfg.Keepalive)
-	}
-
-	// reserve stream 0 incase cassandra returns an error on it without us sending
-	// a request.
-	for i := 1; i < cfg.NumStreams; i++ {
-		c.calls[i].resp = make(chan error)
-		c.uniq <- i
-	}
-
-	go c.serve()
-
-	if err := c.startup(&cfg); err != nil {
-		conn.Close()
-		return nil, err
-	}
-	c.started = true
-
-	return c, nil
-}
-
-func (c *Conn) Write(p []byte) (int, error) {
-	if c.timeout > 0 {
-		c.conn.SetWriteDeadline(time.Now().Add(c.timeout))
-	}
-
-	return c.conn.Write(p)
-}
-
-func (c *Conn) Read(p []byte) (n int, err error) {
-	const maxAttempts = 5
-
-	for i := 0; i < maxAttempts; i++ {
-		var nn int
-		if c.timeout > 0 {
-			c.conn.SetReadDeadline(time.Now().Add(c.timeout))
-		}
-
-		nn, err = io.ReadFull(c.r, p[n:])
-		n += nn
-		if err == nil {
-			break
-		}
-
-		if verr, ok := err.(net.Error); !ok || !verr.Temporary() {
-			break
-		}
-	}
-
-	return
-}
-
-func (c *Conn) startup(cfg *ConnConfig) error {
-	m := map[string]string{
-		"CQL_VERSION": cfg.CQLVersion,
-	}
-
-	if c.compressor != nil {
-		m["COMPRESSION"] = c.compressor.Name()
-	}
-
-	frame, err := c.exec(&writeStartupFrame{opts: m}, nil)
-	if err != nil {
-		return err
-	}
-
-	switch v := frame.(type) {
-	case error:
-		return v
-	case *readyFrame:
-		return nil
-	case *authenticateFrame:
-		return c.authenticateHandshake(v)
-	default:
-		return NewErrProtocol("Unknown type of response to startup frame: %s", v)
-	}
-}
-
-func (c *Conn) authenticateHandshake(authFrame *authenticateFrame) error {
-	if c.auth == nil {
-		return fmt.Errorf("authentication required (using %q)", authFrame.class)
-	}
-
-	resp, challenger, err := c.auth.Challenge([]byte(authFrame.class))
-	if err != nil {
-		return err
-	}
-
-	req := &writeAuthResponseFrame{data: resp}
-
-	for {
-		frame, err := c.exec(req, nil)
-		if err != nil {
-			return err
-		}
-
-		switch v := frame.(type) {
-		case error:
-			return v
-		case *authSuccessFrame:
-			if challenger != nil {
-				return challenger.Success(v.data)
-			}
-			return nil
-		case *authChallengeFrame:
-			resp, challenger, err = challenger.Challenge(v.data)
-			if err != nil {
-				return err
-			}
-
-			req = &writeAuthResponseFrame{
-				data: resp,
-			}
-		default:
-			return fmt.Errorf("unknown frame response during authentication: %v", v)
-		}
-	}
-}
-
-func (c *Conn) closeWithError(err error) {
-	if !atomic.CompareAndSwapInt32(&c.closed, 0, 1) {
-		return
-	}
-
-	if err != nil {
-		// we should attempt to deliver the error back to the caller if it
-		// exists
-		for id := 0; id < len(c.calls); id++ {
-			req := &c.calls[id]
-			// we need to send the error to all waiting queries, put the state
-			// of this conn into not active so that it can not execute any queries.
-			if err != nil {
-				select {
-				case req.resp <- err:
-				default:
-				}
-			}
-		}
-	}
-
-	// if error was nil then unblock the quit channel
-	close(c.quit)
-	c.conn.Close()
-
-	if c.started && err != nil {
-		c.errorHandler.HandleError(c, err, true)
-	}
-}
-
-func (c *Conn) Close() {
-	c.closeWithError(nil)
-}
-
-// Serve starts the stream multiplexer for this connection, which is required
-// to execute any queries. This method runs as long as the connection is
-// open and is therefore usually called in a separate goroutine.
-func (c *Conn) serve() {
-	var (
-		err error
-	)
-
-	for {
-		err = c.recv()
-		if err != nil {
-			break
-		}
-	}
-
-	c.closeWithError(err)
-}
-
-func (c *Conn) recv() error {
-	// not safe for concurrent reads
-
-	// read a full header, ignore timeouts, as this is being ran in a loop
-	// TODO: TCP level deadlines? or just query level deadlines?
-	if c.timeout > 0 {
-		c.conn.SetReadDeadline(time.Time{})
-	}
-
-	// were just reading headers over and over and copy bodies
-	head, err := readHeader(c.r, c.headerBuf)
-	if err != nil {
-		return err
-	}
-
-	if head.stream > len(c.calls) {
-		return fmt.Errorf("gocql: frame header stream is beyond call exepected bounds: %d", head.stream)
-	} else if head.stream == -1 {
-		// TODO: handle cassandra event frames, we shouldnt get any currently
-		_, err := io.CopyN(ioutil.Discard, c, int64(head.length))
-		if err != nil {
-			return err
-		}
-		return nil
-	} else if head.stream <= 0 {
-		// reserved stream that we dont use, probably due to a protocol error
-		// or a bug in Cassandra, this should be an error, parse it and return.
-		framer := newFramer(c, c, c.compressor, c.version)
-		if err := framer.readFrame(&head); err != nil {
-			return err
-		}
-
-		frame, err := framer.parseFrame()
-		if err != nil {
-			return err
-		}
-
-		switch v := frame.(type) {
-		case error:
-			return fmt.Errorf("gocql: error on stream %d: %v", head.stream, v)
-		default:
-			return fmt.Errorf("gocql: received frame on stream %d: %v", head.stream, frame)
-		}
-	}
-
-	call := &c.calls[head.stream]
-	err = call.framer.readFrame(&head)
-	if err != nil {
-		// only net errors should cause the connection to be closed. Though
-		// cassandra returning corrupt frames will be returned here as well.
-		if _, ok := err.(net.Error); ok {
-			return err
-		}
-	}
-
-	// we either, return a response to the caller, the caller timedout, or the
-	// connection has closed. Either way we should never block indefinatly here
-	select {
-	case call.resp <- err:
-	case <-call.timeout:
-		c.releaseStream(head.stream)
-	case <-c.quit:
-	}
-
-	return nil
-}
-
-type callReq struct {
-	// could use a waitgroup but this allows us to do timeouts on the read/send
-	resp    chan error
-	framer  *framer
-	timeout chan struct{} // indicates to recv() that a call has timedout
-}
-
-func (c *Conn) releaseStream(stream int) {
-	call := &c.calls[stream]
-	framerPool.Put(call.framer)
-	call.framer = nil
-
-	select {
-	case c.uniq <- stream:
-	case <-c.quit:
-	}
-}
-
-func (c *Conn) handleTimeout() {
-	if atomic.AddInt64(&c.timeouts, 1) > TimeoutLimit {
-		c.closeWithError(ErrTooManyTimeouts)
-	}
-}
-
-func (c *Conn) exec(req frameWriter, tracer Tracer) (frame, error) {
-	// TODO: move tracer onto conn
-	var stream int
-	select {
-	case stream = <-c.uniq:
-	case <-c.quit:
-		return nil, ErrConnectionClosed
-	}
-
-	// resp is basically a waiting semaphore protecting the framer
-	framer := newFramer(c, c, c.compressor, c.version)
-	call := &c.calls[stream]
-	call.framer = framer
-	call.timeout = make(chan struct{})
-
-	if tracer != nil {
-		framer.trace()
-	}
-
-	err := req.writeFrame(framer, stream)
-	if err != nil {
-		return nil, err
-	}
-
-	select {
-	case err := <-call.resp:
-		if err != nil {
-			return nil, err
-		}
-	case <-time.After(c.timeout):
-		close(call.timeout)
-		c.handleTimeout()
-		return nil, ErrTimeoutNoResponse
-	case <-c.quit:
-		return nil, ErrConnectionClosed
-	}
-
-	// dont release the stream if detect a timeout as another request can reuse
-	// that stream and get a response for the old request, which we have no
-	// easy way of detecting.
-	//
-	// Ensure that the stream is not released if there are potentially outstanding
-	// requests on the stream to prevent nil pointer dereferences in recv().
-	defer c.releaseStream(stream)
-
-	if v := framer.header.version.version(); v != c.version {
-		return nil, NewErrProtocol("unexpected protocol version in response: got %d expected %d", v, c.version)
-	}
-
-	frame, err := framer.parseFrame()
-	if err != nil {
-		return nil, err
-	}
-
-	if len(framer.traceID) > 0 {
-		tracer.Trace(framer.traceID)
-	}
-
-	return frame, nil
-}
-
-func (c *Conn) prepareStatement(stmt string, trace Tracer) (*resultPreparedFrame, error) {
-	stmtsLRU.Lock()
-	if stmtsLRU.lru == nil {
-		initStmtsLRU(defaultMaxPreparedStmts)
-	}
-
-	stmtCacheKey := c.addr + c.currentKeyspace + stmt
-
-	if val, ok := stmtsLRU.lru.Get(stmtCacheKey); ok {
-		stmtsLRU.Unlock()
-		flight := val.(*inflightPrepare)
-		flight.wg.Wait()
-		return flight.info, flight.err
-	}
-
-	flight := new(inflightPrepare)
-	flight.wg.Add(1)
-	stmtsLRU.lru.Add(stmtCacheKey, flight)
-	stmtsLRU.Unlock()
-
-	prep := &writePrepareFrame{
-		statement: stmt,
-	}
-
-	resp, err := c.exec(prep, trace)
-	if err != nil {
-		flight.err = err
-		flight.wg.Done()
-		return nil, err
-	}
-
-	switch x := resp.(type) {
-	case *resultPreparedFrame:
-		flight.info = x
-	case error:
-		flight.err = x
-	default:
-		flight.err = NewErrProtocol("Unknown type in response to prepare frame: %s", x)
-	}
-	flight.wg.Done()
-
-	if flight.err != nil {
-		stmtsLRU.Lock()
-		stmtsLRU.lru.Remove(stmtCacheKey)
-		stmtsLRU.Unlock()
-	}
-
-	return flight.info, flight.err
-}
-
-func (c *Conn) executeQuery(qry *Query) *Iter {
-	params := queryParams{
-		consistency: qry.cons,
-	}
-
-	// frame checks that it is not 0
-	params.serialConsistency = qry.serialCons
-	params.defaultTimestamp = qry.defaultTimestamp
-
-	if len(qry.pageState) > 0 {
-		params.pagingState = qry.pageState
-	}
-	if qry.pageSize > 0 {
-		params.pageSize = qry.pageSize
-	}
-
-	var frame frameWriter
-	if qry.shouldPrepare() {
-		// Prepare all DML queries. Other queries can not be prepared.
-		info, err := c.prepareStatement(qry.stmt, qry.trace)
-		if err != nil {
-			return &Iter{err: err}
-		}
-
-		var values []interface{}
-
-		if qry.binding == nil {
-			values = qry.values
-		} else {
-			binding := &QueryInfo{
-				Id:   info.preparedID,
-				Args: info.reqMeta.columns,
-				Rval: info.respMeta.columns,
-			}
-
-			values, err = qry.binding(binding)
-			if err != nil {
-				return &Iter{err: err}
-			}
-		}
-
-		if len(values) != len(info.reqMeta.columns) {
-			return &Iter{err: ErrQueryArgLength}
-		}
-		params.values = make([]queryValues, len(values))
-		for i := 0; i < len(values); i++ {
-			val, err := Marshal(info.reqMeta.columns[i].TypeInfo, values[i])
-			if err != nil {
-				return &Iter{err: err}
-			}
-
-			v := &params.values[i]
-			v.value = val
-			// TODO: handle query binding names
-		}
-
-		frame = &writeExecuteFrame{
-			preparedID: info.preparedID,
-			params:     params,
-		}
-	} else {
-		frame = &writeQueryFrame{
-			statement: qry.stmt,
-			params:    params,
-		}
-	}
-
-	resp, err := c.exec(frame, qry.trace)
-	if err != nil {
-		return &Iter{err: err}
-	}
-
-	switch x := resp.(type) {
-	case *resultVoidFrame:
-		return &Iter{}
-	case *resultRowsFrame:
-		iter := &Iter{
-			meta: x.meta,
-			rows: x.rows,
-		}
-
-		if len(x.meta.pagingState) > 0 {
-			iter.next = &nextIter{
-				qry: *qry,
-				pos: int((1 - qry.prefetch) * float64(len(iter.rows))),
-			}
-
-			iter.next.qry.pageState = x.meta.pagingState
-			if iter.next.pos < 1 {
-				iter.next.pos = 1
-			}
-		}
-
-		return iter
-	case *resultKeyspaceFrame, *resultSchemaChangeFrame:
-		return &Iter{}
-	case *RequestErrUnprepared:
-		stmtsLRU.Lock()
-		stmtCacheKey := c.addr + c.currentKeyspace + qry.stmt
-		if _, ok := stmtsLRU.lru.Get(stmtCacheKey); ok {
-			stmtsLRU.lru.Remove(stmtCacheKey)
-			stmtsLRU.Unlock()
-			return c.executeQuery(qry)
-		}
-		stmtsLRU.Unlock()
-		return &Iter{err: x}
-	case error:
-		return &Iter{err: x}
-	default:
-		return &Iter{err: NewErrProtocol("Unknown type in response to execute query: %s", x)}
-	}
-}
-
-func (c *Conn) Pick(qry *Query) *Conn {
-	if c.Closed() {
-		return nil
-	}
-	return c
-}
-
-func (c *Conn) Closed() bool {
-	return atomic.LoadInt32(&c.closed) == 1
-}
-
-func (c *Conn) Address() string {
-	return c.addr
-}
-
-func (c *Conn) AvailableStreams() int {
-	return len(c.uniq)
-}
-
-func (c *Conn) UseKeyspace(keyspace string) error {
-	q := &writeQueryFrame{statement: `USE "` + keyspace + `"`}
-	q.params.consistency = Any
-
-	resp, err := c.exec(q, nil)
-	if err != nil {
-		return err
-	}
-
-	switch x := resp.(type) {
-	case *resultKeyspaceFrame:
-	case error:
-		return x
-	default:
-		return NewErrProtocol("unknown frame in response to USE: %v", x)
-	}
-
-	c.currentKeyspace = keyspace
-
-	return nil
-}
-
-func (c *Conn) executeBatch(batch *Batch) error {
-	if c.version == protoVersion1 {
-		return ErrUnsupported
-	}
-
-	n := len(batch.Entries)
-	req := &writeBatchFrame{
-		typ:               batch.Type,
-		statements:        make([]batchStatment, n),
-		consistency:       batch.Cons,
-		serialConsistency: batch.serialCons,
-		defaultTimestamp:  batch.defaultTimestamp,
-	}
-
-	stmts := make(map[string]string)
-
-	for i := 0; i < n; i++ {
-		entry := &batch.Entries[i]
-		b := &req.statements[i]
-		if len(entry.Args) > 0 || entry.binding != nil {
-			info, err := c.prepareStatement(entry.Stmt, nil)
-			if err != nil {
-				return err
-			}
-
-			var args []interface{}
-			if entry.binding == nil {
-				args = entry.Args
-			} else {
-				binding := &QueryInfo{
-					Id:   info.preparedID,
-					Args: info.reqMeta.columns,
-					Rval: info.respMeta.columns,
-				}
-				args, err = entry.binding(binding)
-				if err != nil {
-					return err
-				}
-			}
-
-			if len(args) != len(info.reqMeta.columns) {
-				return ErrQueryArgLength
-			}
-
-			b.preparedID = info.preparedID
-			stmts[string(info.preparedID)] = entry.Stmt
-
-			b.values = make([]queryValues, len(info.reqMeta.columns))
-
-			for j := 0; j < len(info.reqMeta.columns); j++ {
-				val, err := Marshal(info.reqMeta.columns[j].TypeInfo, args[j])
-				if err != nil {
-					return err
-				}
-
-				b.values[j].value = val
-				// TODO: add names
-			}
-		} else {
-			b.statement = entry.Stmt
-		}
-	}
-
-	// TODO: should batch support tracing?
-	resp, err := c.exec(req, nil)
-	if err != nil {
-		return err
-	}
-
-	switch x := resp.(type) {
-	case *resultVoidFrame:
-		return nil
-	case *RequestErrUnprepared:
-		stmt, found := stmts[string(x.StatementId)]
-		if found {
-			stmtsLRU.Lock()
-			stmtsLRU.lru.Remove(c.addr + c.currentKeyspace + stmt)
-			stmtsLRU.Unlock()
-		}
-		if found {
-			return c.executeBatch(batch)
-		} else {
-			return x
-		}
-	case error:
-		return x
-	default:
-		return NewErrProtocol("Unknown type in response to batch statement: %s", x)
-	}
-}
-
-func (c *Conn) setKeepalive(d time.Duration) error {
-	if tc, ok := c.conn.(*net.TCPConn); ok {
-		err := tc.SetKeepAlivePeriod(d)
-		if err != nil {
-			return err
-		}
-
-		return tc.SetKeepAlive(true)
-	}
-
-	return nil
-}
-
-type inflightPrepare struct {
-	info *resultPreparedFrame
-	err  error
-	wg   sync.WaitGroup
-}
-
-var (
-	ErrQueryArgLength    = errors.New("gocql: query argument length mismatch")
-	ErrTimeoutNoResponse = errors.New("gocql: no response received from cassandra within timeout period")
-	ErrTooManyTimeouts   = errors.New("gocql: too many query timeouts on the connection")
-	ErrConnectionClosed  = errors.New("gocql: connection closed waiting for response")
-)
diff --git a/vendor/github.com/gocql/gocql/conn_test.go b/vendor/github.com/gocql/gocql/conn_test.go
deleted file mode 100644
index 85aea6437..000000000
--- a/vendor/github.com/gocql/gocql/conn_test.go
+++ /dev/null
@@ -1,817 +0,0 @@
-// Copyright (c) 2012 The gocql 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 all unit
-
-package gocql
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-const (
-	defaultProto = protoVersion2
-)
-
-func TestJoinHostPort(t *testing.T) {
-	tests := map[string]string{
-		"127.0.0.1:0":                                 JoinHostPort("127.0.0.1", 0),
-		"127.0.0.1:1":                                 JoinHostPort("127.0.0.1:1", 9142),
-		"[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:0": JoinHostPort("2001:0db8:85a3:0000:0000:8a2e:0370:7334", 0),
-		"[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:1": JoinHostPort("[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:1", 9142),
-	}
-	for k, v := range tests {
-		if k != v {
-			t.Fatalf("expected '%v', got '%v'", k, v)
-		}
-	}
-}
-
-func TestSimple(t *testing.T) {
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	cluster.ProtoVersion = int(defaultProto)
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Errorf("0x%x: NewCluster: %v", defaultProto, err)
-		return
-	}
-
-	if err := db.Query("void").Exec(); err != nil {
-		t.Errorf("0x%x: %v", defaultProto, err)
-	}
-}
-
-func TestSSLSimple(t *testing.T) {
-	srv := NewSSLTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	db, err := createTestSslCluster(srv.Address, defaultProto, true).CreateSession()
-	if err != nil {
-		t.Fatalf("0x%x: NewCluster: %v", defaultProto, err)
-	}
-
-	if err := db.Query("void").Exec(); err != nil {
-		t.Fatalf("0x%x: %v", defaultProto, err)
-	}
-}
-
-func TestSSLSimpleNoClientCert(t *testing.T) {
-	srv := NewSSLTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	db, err := createTestSslCluster(srv.Address, defaultProto, false).CreateSession()
-	if err != nil {
-		t.Fatalf("0x%x: NewCluster: %v", defaultProto, err)
-	}
-
-	if err := db.Query("void").Exec(); err != nil {
-		t.Fatalf("0x%x: %v", defaultProto, err)
-	}
-}
-
-func createTestSslCluster(hosts string, proto uint8, useClientCert bool) *ClusterConfig {
-	cluster := NewCluster(hosts)
-	sslOpts := &SslOptions{
-		CaPath:                 "testdata/pki/ca.crt",
-		EnableHostVerification: false,
-	}
-	if useClientCert {
-		sslOpts.CertPath = "testdata/pki/gocql.crt"
-		sslOpts.KeyPath = "testdata/pki/gocql.key"
-	}
-	cluster.SslOpts = sslOpts
-	cluster.ProtoVersion = int(proto)
-	return cluster
-}
-
-func TestClosed(t *testing.T) {
-	t.Skip("Skipping the execution of TestClosed for now to try to concentrate on more important test failures on Travis")
-
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	cluster.ProtoVersion = int(defaultProto)
-
-	session, err := cluster.CreateSession()
-	defer session.Close()
-	if err != nil {
-		t.Errorf("0x%x: NewCluster: %v", defaultProto, err)
-		return
-	}
-
-	if err := session.Query("void").Exec(); err != ErrSessionClosed {
-		t.Errorf("0x%x: expected %#v, got %#v", defaultProto, ErrSessionClosed, err)
-		return
-	}
-}
-
-func newTestSession(addr string, proto uint8) (*Session, error) {
-	cluster := NewCluster(addr)
-	cluster.ProtoVersion = int(proto)
-	return cluster.CreateSession()
-}
-
-func TestTimeout(t *testing.T) {
-
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	db, err := newTestSession(srv.Address, defaultProto)
-	if err != nil {
-		t.Errorf("NewCluster: %v", err)
-		return
-	}
-	defer db.Close()
-
-	go func() {
-		<-time.After(2 * time.Second)
-		t.Errorf("no timeout")
-	}()
-
-	if err := db.Query("kill").Exec(); err == nil {
-		t.Errorf("expected error")
-	}
-}
-
-// TestQueryRetry will test to make sure that gocql will execute
-// the exact amount of retry queries designated by the user.
-func TestQueryRetry(t *testing.T) {
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	db, err := newTestSession(srv.Address, defaultProto)
-	if err != nil {
-		t.Fatalf("NewCluster: %v", err)
-	}
-	defer db.Close()
-
-	go func() {
-		<-time.After(5 * time.Second)
-		t.Fatalf("no timeout")
-	}()
-	rt := &SimpleRetryPolicy{NumRetries: 1}
-
-	qry := db.Query("kill").RetryPolicy(rt)
-	if err := qry.Exec(); err == nil {
-		t.Fatalf("expected error")
-	}
-
-	requests := atomic.LoadInt64(&srv.nKillReq)
-	attempts := qry.Attempts()
-	if requests != int64(attempts) {
-		t.Fatalf("expected requests %v to match query attemps %v", requests, attempts)
-	}
-
-	//Minus 1 from the requests variable since there is the initial query attempt
-	if requests-1 != int64(rt.NumRetries) {
-		t.Fatalf("failed to retry the query %v time(s). Query executed %v times", rt.NumRetries, requests-1)
-	}
-}
-
-func TestSimplePoolRoundRobin(t *testing.T) {
-	servers := make([]*TestServer, 5)
-	addrs := make([]string, len(servers))
-	for n := 0; n < len(servers); n++ {
-		servers[n] = NewTestServer(t, defaultProto)
-		addrs[n] = servers[n].Address
-		defer servers[n].Stop()
-	}
-	cluster := NewCluster(addrs...)
-	cluster.ProtoVersion = defaultProto
-
-	db, err := cluster.CreateSession()
-	time.Sleep(1 * time.Second) // Sleep to allow the Cluster.fillPool to complete
-
-	if err != nil {
-		t.Fatalf("NewCluster: %v", err)
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(5)
-	for n := 0; n < 5; n++ {
-		go func() {
-			for j := 0; j < 5; j++ {
-				if err := db.Query("void").Exec(); err != nil {
-					t.Fatal(err)
-				}
-			}
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	diff := 0
-	for n := 1; n < len(servers); n++ {
-		d := 0
-		if servers[n].nreq > servers[n-1].nreq {
-			d = int(servers[n].nreq - servers[n-1].nreq)
-		} else {
-			d = int(servers[n-1].nreq - servers[n].nreq)
-		}
-		if d > diff {
-			diff = d
-		}
-	}
-
-	if diff > 0 {
-		t.Errorf("Expected 0 difference in usage but was %d", diff)
-	}
-}
-
-func TestConnClosing(t *testing.T) {
-	t.Skip("Skipping until test can be ran reliably")
-
-	srv := NewTestServer(t, protoVersion2)
-	defer srv.Stop()
-
-	db, err := NewCluster(srv.Address).CreateSession()
-	if err != nil {
-		t.Errorf("NewCluster: %v", err)
-	}
-	defer db.Close()
-
-	numConns := db.cfg.NumConns
-	count := db.cfg.NumStreams * numConns
-
-	wg := &sync.WaitGroup{}
-	wg.Add(count)
-	for i := 0; i < count; i++ {
-		go func(wg *sync.WaitGroup) {
-			wg.Done()
-			db.Query("kill").Exec()
-		}(wg)
-	}
-
-	wg.Wait()
-
-	time.Sleep(1 * time.Second) //Sleep so the fillPool can complete.
-	pool := db.Pool.(ConnectionPool)
-	conns := pool.Size()
-
-	if conns != numConns {
-		t.Errorf("Expected to have %d connections but have %d", numConns, conns)
-	}
-}
-
-func TestStreams_Protocol1(t *testing.T) {
-	srv := NewTestServer(t, protoVersion1)
-	defer srv.Stop()
-
-	// TODO: these are more like session tests and should instead operate
-	// on a single Conn
-	cluster := NewCluster(srv.Address)
-	cluster.NumConns = 1
-	cluster.ProtoVersion = 1
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	var wg sync.WaitGroup
-	for i := 1; i < db.cfg.NumStreams; i++ {
-		// here were just validating that if we send NumStream request we get
-		// a response for every stream and the lengths for the queries are set
-		// correctly.
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			if err := db.Query("void").Exec(); err != nil {
-				t.Error(err)
-			}
-		}()
-	}
-	wg.Wait()
-}
-
-func TestStreams_Protocol2(t *testing.T) {
-	srv := NewTestServer(t, protoVersion2)
-	defer srv.Stop()
-
-	// TODO: these are more like session tests and should instead operate
-	// on a single Conn
-	cluster := NewCluster(srv.Address)
-	cluster.NumConns = 1
-	cluster.ProtoVersion = 2
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	for i := 1; i < db.cfg.NumStreams; i++ {
-		// the test server processes each conn synchronously
-		// here were just validating that if we send NumStream request we get
-		// a response for every stream and the lengths for the queries are set
-		// correctly.
-		if err = db.Query("void").Exec(); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestStreams_Protocol3(t *testing.T) {
-	srv := NewTestServer(t, protoVersion3)
-	defer srv.Stop()
-
-	// TODO: these are more like session tests and should instead operate
-	// on a single Conn
-	cluster := NewCluster(srv.Address)
-	cluster.NumConns = 1
-	cluster.ProtoVersion = 3
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	for i := 1; i < db.cfg.NumStreams; i++ {
-		// the test server processes each conn synchronously
-		// here were just validating that if we send NumStream request we get
-		// a response for every stream and the lengths for the queries are set
-		// correctly.
-		if err = db.Query("void").Exec(); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkProtocolV3(b *testing.B) {
-	srv := NewTestServer(b, protoVersion3)
-	defer srv.Stop()
-
-	// TODO: these are more like session tests and should instead operate
-	// on a single Conn
-	cluster := NewCluster(srv.Address)
-	cluster.NumConns = 1
-	cluster.ProtoVersion = 3
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer db.Close()
-
-	b.ResetTimer()
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		if err = db.Query("void").Exec(); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func TestRoundRobinConnPoolRoundRobin(t *testing.T) {
-	// create 5 test servers
-	servers := make([]*TestServer, 5)
-	addrs := make([]string, len(servers))
-	for n := 0; n < len(servers); n++ {
-		servers[n] = NewTestServer(t, defaultProto)
-		addrs[n] = servers[n].Address
-		defer servers[n].Stop()
-	}
-
-	// create a new cluster using the policy-based round robin conn pool
-	cluster := NewCluster(addrs...)
-	cluster.ConnPoolType = NewRoundRobinConnPool
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatalf("failed to create a new session: %v", err)
-	}
-
-	// Sleep to allow the pool to fill
-	time.Sleep(100 * time.Millisecond)
-
-	// run concurrent queries against the pool, server usage should
-	// be even
-	var wg sync.WaitGroup
-	wg.Add(5)
-	for n := 0; n < 5; n++ {
-		go func() {
-			for j := 0; j < 5; j++ {
-				if err := db.Query("void").Exec(); err != nil {
-					t.Errorf("Query failed with error: %v", err)
-				}
-			}
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	db.Close()
-
-	// wait for the pool to drain
-	time.Sleep(100 * time.Millisecond)
-	size := db.Pool.Size()
-	if size != 0 {
-		t.Errorf("connection pool did not drain, still contains %d connections", size)
-	}
-
-	// verify that server usage is even
-	diff := 0
-	for n := 1; n < len(servers); n++ {
-		d := 0
-		if servers[n].nreq > servers[n-1].nreq {
-			d = int(servers[n].nreq - servers[n-1].nreq)
-		} else {
-			d = int(servers[n-1].nreq - servers[n].nreq)
-		}
-		if d > diff {
-			diff = d
-		}
-	}
-
-	if diff > 0 {
-		t.Errorf("expected 0 difference in usage but was %d", diff)
-	}
-}
-
-// This tests that the policy connection pool handles SSL correctly
-func TestPolicyConnPoolSSL(t *testing.T) {
-	srv := NewSSLTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := createTestSslCluster(srv.Address, defaultProto, true)
-	cluster.ConnPoolType = NewRoundRobinConnPool
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatalf("failed to create new session: %v", err)
-	}
-
-	if err := db.Query("void").Exec(); err != nil {
-		t.Errorf("query failed due to error: %v", err)
-	}
-
-	db.Close()
-
-	// wait for the pool to drain
-	time.Sleep(100 * time.Millisecond)
-	size := db.Pool.Size()
-	if size != 0 {
-		t.Errorf("connection pool did not drain, still contains %d connections", size)
-	}
-}
-
-func TestQueryTimeout(t *testing.T) {
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	// Set the timeout arbitrarily low so that the query hits the timeout in a
-	// timely manner.
-	cluster.Timeout = 1 * time.Millisecond
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Errorf("NewCluster: %v", err)
-	}
-	defer db.Close()
-
-	ch := make(chan error, 1)
-
-	go func() {
-		err := db.Query("timeout").Exec()
-		if err != nil {
-			ch <- err
-			return
-		}
-		t.Errorf("err was nil, expected to get a timeout after %v", db.cfg.Timeout)
-	}()
-
-	select {
-	case err := <-ch:
-		if err != ErrTimeoutNoResponse {
-			t.Fatalf("expected to get %v for timeout got %v", ErrTimeoutNoResponse, err)
-		}
-	case <-time.After(10*time.Millisecond + db.cfg.Timeout):
-		// ensure that the query goroutines have been scheduled
-		t.Fatalf("query did not timeout after %v", db.cfg.Timeout)
-	}
-}
-
-func TestQueryTimeoutReuseStream(t *testing.T) {
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	// Set the timeout arbitrarily low so that the query hits the timeout in a
-	// timely manner.
-	cluster.Timeout = 1 * time.Millisecond
-	cluster.NumConns = 1
-	cluster.NumStreams = 1
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatalf("NewCluster: %v", err)
-	}
-	defer db.Close()
-
-	db.Query("slow").Exec()
-
-	err = db.Query("void").Exec()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestQueryTimeoutClose(t *testing.T) {
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	// Set the timeout arbitrarily low so that the query hits the timeout in a
-	// timely manner.
-	cluster.Timeout = 1000 * time.Millisecond
-	cluster.NumConns = 1
-	cluster.NumStreams = 1
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatalf("NewCluster: %v", err)
-	}
-
-	ch := make(chan error)
-	go func() {
-		err := db.Query("timeout").Exec()
-		ch <- err
-	}()
-	// ensure that the above goroutine gets sheduled
-	time.Sleep(50 * time.Millisecond)
-
-	db.Close()
-	select {
-	case err = <-ch:
-	case <-time.After(1 * time.Second):
-		t.Fatal("timedout waiting to get a response once cluster is closed")
-	}
-
-	if err != ErrConnectionClosed {
-		t.Fatalf("expected to get %v got %v", ErrConnectionClosed, err)
-	}
-}
-
-func TestExecPanic(t *testing.T) {
-	t.Skip("test can cause unrelated failures, skipping until it can be fixed.")
-	srv := NewTestServer(t, defaultProto)
-	defer srv.Stop()
-
-	cluster := NewCluster(srv.Address)
-	// Set the timeout arbitrarily low so that the query hits the timeout in a
-	// timely manner.
-	cluster.Timeout = 5 * time.Millisecond
-	cluster.NumConns = 1
-	// cluster.NumStreams = 1
-
-	db, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer db.Close()
-
-	streams := db.cfg.NumStreams
-
-	wg := &sync.WaitGroup{}
-	wg.Add(streams)
-	for i := 0; i < streams; i++ {
-		go func() {
-			defer wg.Done()
-			q := db.Query("void")
-			for {
-				if err := q.Exec(); err != nil {
-					return
-				}
-			}
-		}()
-	}
-
-	wg.Add(1)
-
-	go func() {
-		defer wg.Done()
-		for i := 0; i < int(TimeoutLimit); i++ {
-			db.Query("timeout").Exec()
-		}
-	}()
-
-	wg.Wait()
-
-	time.Sleep(500 * time.Millisecond)
-}
-
-func NewTestServer(t testing.TB, protocol uint8) *TestServer {
-	laddr, err := net.ResolveTCPAddr("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	listen, err := net.ListenTCP("tcp", laddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	headerSize := 8
-	if protocol > protoVersion2 {
-		headerSize = 9
-	}
-
-	srv := &TestServer{
-		Address:    listen.Addr().String(),
-		listen:     listen,
-		t:          t,
-		protocol:   protocol,
-		headerSize: headerSize,
-		quit:       make(chan struct{}),
-	}
-
-	go srv.serve()
-
-	return srv
-}
-
-func NewSSLTestServer(t testing.TB, protocol uint8) *TestServer {
-	pem, err := ioutil.ReadFile("testdata/pki/ca.crt")
-	certPool := x509.NewCertPool()
-	if !certPool.AppendCertsFromPEM(pem) {
-		t.Errorf("Failed parsing or appending certs")
-	}
-	mycert, err := tls.LoadX509KeyPair("testdata/pki/cassandra.crt", "testdata/pki/cassandra.key")
-	if err != nil {
-		t.Errorf("could not load cert")
-	}
-	config := &tls.Config{
-		Certificates: []tls.Certificate{mycert},
-		RootCAs:      certPool,
-	}
-	listen, err := tls.Listen("tcp", "127.0.0.1:0", config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	headerSize := 8
-	if protocol > protoVersion2 {
-		headerSize = 9
-	}
-
-	srv := &TestServer{
-		Address:    listen.Addr().String(),
-		listen:     listen,
-		t:          t,
-		protocol:   protocol,
-		headerSize: headerSize,
-		quit:       make(chan struct{}),
-	}
-	go srv.serve()
-	return srv
-}
-
-type TestServer struct {
-	Address    string
-	t          testing.TB
-	nreq       uint64
-	listen     net.Listener
-	nKillReq   int64
-	compressor Compressor
-
-	protocol   byte
-	headerSize int
-
-	quit chan struct{}
-}
-
-func (srv *TestServer) serve() {
-	defer srv.listen.Close()
-	for {
-		conn, err := srv.listen.Accept()
-		if err != nil {
-			break
-		}
-		go func(conn net.Conn) {
-			defer conn.Close()
-			for {
-				framer, err := srv.readFrame(conn)
-				if err != nil {
-					if err == io.EOF {
-						return
-					}
-
-					srv.t.Error(err)
-					return
-				}
-
-				atomic.AddUint64(&srv.nreq, 1)
-
-				go srv.process(framer)
-			}
-		}(conn)
-	}
-}
-
-func (srv *TestServer) Stop() {
-	srv.listen.Close()
-	close(srv.quit)
-}
-
-func (srv *TestServer) process(f *framer) {
-	head := f.header
-	if head == nil {
-		srv.t.Error("process frame with a nil header")
-		return
-	}
-
-	switch head.op {
-	case opStartup:
-		f.writeHeader(0, opReady, head.stream)
-	case opOptions:
-		f.writeHeader(0, opSupported, head.stream)
-		f.writeShort(0)
-	case opQuery:
-		query := f.readLongString()
-		first := query
-		if n := strings.Index(query, " "); n > 0 {
-			first = first[:n]
-		}
-		switch strings.ToLower(first) {
-		case "kill":
-			atomic.AddInt64(&srv.nKillReq, 1)
-			f.writeHeader(0, opError, head.stream)
-			f.writeInt(0x1001)
-			f.writeString("query killed")
-		case "use":
-			f.writeInt(resultKindKeyspace)
-			f.writeString(strings.TrimSpace(query[3:]))
-		case "void":
-			f.writeHeader(0, opResult, head.stream)
-			f.writeInt(resultKindVoid)
-		case "timeout":
-			<-srv.quit
-			return
-		case "slow":
-			go func() {
-				f.writeHeader(0, opResult, head.stream)
-				f.writeInt(resultKindVoid)
-				f.wbuf[0] = srv.protocol | 0x80
-				select {
-				case <-srv.quit:
-				case <-time.After(50 * time.Millisecond):
-					f.finishWrite()
-				}
-			}()
-			return
-		default:
-			f.writeHeader(0, opResult, head.stream)
-			f.writeInt(resultKindVoid)
-		}
-	default:
-		f.writeHeader(0, opError, head.stream)
-		f.writeInt(0)
-		f.writeString("not supported")
-	}
-
-	f.wbuf[0] = srv.protocol | 0x80
-
-	if err := f.finishWrite(); err != nil {
-		srv.t.Error(err)
-	}
-}
-
-func (srv *TestServer) readFrame(conn net.Conn) (*framer, error) {
-	buf := make([]byte, srv.headerSize)
-	head, err := readHeader(conn, buf)
-	if err != nil {
-		return nil, err
-	}
-	framer := newFramer(conn, conn, nil, srv.protocol)
-
-	err = framer.readFrame(&head)
-	if err != nil {
-		return nil, err
-	}
-
-	// should be a request frame
-	if head.version.response() {
-		return nil, fmt.Errorf("expected to read a request frame got version: %v", head.version)
-	} else if head.version.version() != srv.protocol {
-		return nil, fmt.Errorf("expected to read protocol version 0x%x got 0x%x", srv.protocol, head.version.version())
-	}
-
-	return framer, nil
-}
diff --git a/vendor/github.com/gocql/gocql/connectionpool.go b/vendor/github.com/gocql/gocql/connectionpool.go
deleted file mode 100644
index 9f9904be1..000000000
--- a/vendor/github.com/gocql/gocql/connectionpool.go
+++ /dev/null
@@ -1,895 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"net"
-	"sync"
-	"time"
-)
-
-/*ConnectionPool represents the interface gocql will use to work with a collection of connections.
-
-Purpose
-
-The connection pool in gocql opens and closes connections as well as selects an available connection
-for gocql to execute a query against. The pool is also respnsible for handling connection errors that
-are caught by the connection experiencing the error.
-
-A connection pool should make a copy of the variables used from the ClusterConfig provided to the pool
-upon creation. ClusterConfig is a pointer and can be modified after the creation of the pool. This can
-lead to issues with variables being modified outside the expectations of the ConnectionPool type.
-
-Example of Single Connection Pool:
-
-	type SingleConnection struct {
-		conn *Conn
-		cfg *ClusterConfig
-	}
-
-	func NewSingleConnection(cfg *ClusterConfig) ConnectionPool {
-		addr := JoinHostPort(cfg.Hosts[0], cfg.Port)
-
-		connCfg := ConnConfig{
-			ProtoVersion:  cfg.ProtoVersion,
-			CQLVersion:    cfg.CQLVersion,
-			Timeout:       cfg.Timeout,
-			NumStreams:    cfg.NumStreams,
-			Compressor:    cfg.Compressor,
-			Authenticator: cfg.Authenticator,
-			Keepalive:     cfg.SocketKeepalive,
-		}
-		pool := SingleConnection{cfg:cfg}
-		pool.conn = Connect(addr,connCfg,pool)
-		return &pool
-	}
-
-	func (s *SingleConnection) HandleError(conn *Conn, err error, closed bool) {
-		if closed {
-			connCfg := ConnConfig{
-				ProtoVersion:  cfg.ProtoVersion,
-				CQLVersion:    cfg.CQLVersion,
-				Timeout:       cfg.Timeout,
-				NumStreams:    cfg.NumStreams,
-				Compressor:    cfg.Compressor,
-				Authenticator: cfg.Authenticator,
-				Keepalive:     cfg.SocketKeepalive,
-			}
-			s.conn = Connect(conn.Address(),connCfg,s)
-		}
-	}
-
-	func (s *SingleConnection) Pick(qry *Query) *Conn {
-		if s.conn.isClosed {
-			return nil
-		}
-		return s.conn
-	}
-
-	func (s *SingleConnection) Size() int {
-		return 1
-	}
-
-	func (s *SingleConnection) Close() {
-		s.conn.Close()
-	}
-
-This is a very simple example of a type that exposes the connection pool interface. To assign
-this type as the connection pool to use you would assign it to the ClusterConfig like so:
-
-		cluster := NewCluster("127.0.0.1")
-		cluster.ConnPoolType = NewSingleConnection
-		...
-		session, err := cluster.CreateSession()
-
-To see a more complete example of a ConnectionPool implementation please see the SimplePool type.
-*/
-type ConnectionPool interface {
-	SetHosts
-	Pick(*Query) *Conn
-	Size() int
-	Close()
-}
-
-// interface to implement to receive the host information
-type SetHosts interface {
-	SetHosts(hosts []HostInfo)
-}
-
-// interface to implement to receive the partitioner value
-type SetPartitioner interface {
-	SetPartitioner(partitioner string)
-}
-
-//NewPoolFunc is the type used by ClusterConfig to create a pool of a specific type.
-type NewPoolFunc func(*ClusterConfig) (ConnectionPool, error)
-
-//SimplePool is the current implementation of the connection pool inside gocql. This
-//pool is meant to be a simple default used by gocql so users can get up and running
-//quickly.
-type SimplePool struct {
-	cfg      *ClusterConfig
-	hostPool *RoundRobin
-	connPool map[string]*RoundRobin
-	conns    map[*Conn]struct{}
-	keyspace string
-
-	hostMu sync.RWMutex
-	// this is the set of current hosts which the pool will attempt to connect to
-	hosts map[string]*HostInfo
-
-	// protects hostpool, connPoll, conns, quit
-	mu sync.Mutex
-
-	cFillingPool chan int
-
-	quit     bool
-	quitWait chan bool
-	quitOnce sync.Once
-
-	tlsConfig *tls.Config
-}
-
-func setupTLSConfig(sslOpts *SslOptions) (*tls.Config, error) {
-	// ca cert is optional
-	if sslOpts.CaPath != "" {
-		if sslOpts.RootCAs == nil {
-			sslOpts.RootCAs = x509.NewCertPool()
-		}
-
-		pem, err := ioutil.ReadFile(sslOpts.CaPath)
-		if err != nil {
-			return nil, fmt.Errorf("connectionpool: unable to open CA certs: %v", err)
-		}
-
-		if !sslOpts.RootCAs.AppendCertsFromPEM(pem) {
-			return nil, errors.New("connectionpool: failed parsing or CA certs")
-		}
-	}
-
-	if sslOpts.CertPath != "" || sslOpts.KeyPath != "" {
-		mycert, err := tls.LoadX509KeyPair(sslOpts.CertPath, sslOpts.KeyPath)
-		if err != nil {
-			return nil, fmt.Errorf("connectionpool: unable to load X509 key pair: %v", err)
-		}
-		sslOpts.Certificates = append(sslOpts.Certificates, mycert)
-	}
-
-	sslOpts.InsecureSkipVerify = !sslOpts.EnableHostVerification
-
-	return &sslOpts.Config, nil
-}
-
-//NewSimplePool is the function used by gocql to create the simple connection pool.
-//This is the default if no other pool type is specified.
-func NewSimplePool(cfg *ClusterConfig) (ConnectionPool, error) {
-	pool := &SimplePool{
-		cfg:          cfg,
-		hostPool:     NewRoundRobin(),
-		connPool:     make(map[string]*RoundRobin),
-		conns:        make(map[*Conn]struct{}),
-		quitWait:     make(chan bool),
-		cFillingPool: make(chan int, 1),
-		keyspace:     cfg.Keyspace,
-		hosts:        make(map[string]*HostInfo),
-	}
-
-	for _, host := range cfg.Hosts {
-		// seed hosts have unknown topology
-		// TODO: Handle populating this during SetHosts
-		pool.hosts[host] = &HostInfo{Peer: host}
-	}
-
-	if cfg.SslOpts != nil {
-		config, err := setupTLSConfig(cfg.SslOpts)
-		if err != nil {
-			return nil, err
-		}
-		pool.tlsConfig = config
-	}
-
-	//Walk through connecting to hosts. As soon as one host connects
-	//defer the remaining connections to cluster.fillPool()
-	for i := 0; i < len(cfg.Hosts); i++ {
-		addr := JoinHostPort(cfg.Hosts[i], cfg.Port)
-
-		if pool.connect(addr) == nil {
-			pool.cFillingPool <- 1
-			go pool.fillPool()
-			break
-		}
-	}
-
-	return pool, nil
-}
-
-func (c *SimplePool) connect(addr string) error {
-
-	cfg := ConnConfig{
-		ProtoVersion:  c.cfg.ProtoVersion,
-		CQLVersion:    c.cfg.CQLVersion,
-		Timeout:       c.cfg.Timeout,
-		NumStreams:    c.cfg.NumStreams,
-		Compressor:    c.cfg.Compressor,
-		Authenticator: c.cfg.Authenticator,
-		Keepalive:     c.cfg.SocketKeepalive,
-		tlsConfig:     c.tlsConfig,
-	}
-
-	conn, err := Connect(addr, cfg, c)
-	if err != nil {
-		log.Printf("connect: failed to connect to %q: %v", addr, err)
-		return err
-	}
-
-	return c.addConn(conn)
-}
-
-func (c *SimplePool) addConn(conn *Conn) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.quit {
-		conn.Close()
-		return nil
-	}
-
-	//Set the connection's keyspace if any before adding it to the pool
-	if c.keyspace != "" {
-		if err := conn.UseKeyspace(c.keyspace); err != nil {
-			log.Printf("error setting connection keyspace. %v", err)
-			conn.Close()
-			return err
-		}
-	}
-
-	connPool := c.connPool[conn.Address()]
-	if connPool == nil {
-		connPool = NewRoundRobin()
-		c.connPool[conn.Address()] = connPool
-		c.hostPool.AddNode(connPool)
-	}
-
-	connPool.AddNode(conn)
-	c.conns[conn] = struct{}{}
-
-	return nil
-}
-
-//fillPool manages the pool of connections making sure that each host has the correct
-//amount of connections defined. Also the method will test a host with one connection
-//instead of flooding the host with number of connections defined in the cluster config
-func (c *SimplePool) fillPool() {
-	//Debounce large amounts of requests to fill pool
-	select {
-	case <-time.After(1 * time.Millisecond):
-		return
-	case <-c.cFillingPool:
-		defer func() { c.cFillingPool <- 1 }()
-	}
-
-	c.mu.Lock()
-	isClosed := c.quit
-	c.mu.Unlock()
-	//Exit if cluster(session) is closed
-	if isClosed {
-		return
-	}
-
-	c.hostMu.RLock()
-
-	//Walk through list of defined hosts
-	var wg sync.WaitGroup
-	for host := range c.hosts {
-		addr := JoinHostPort(host, c.cfg.Port)
-
-		numConns := 1
-		//See if the host already has connections in the pool
-		c.mu.Lock()
-		conns, ok := c.connPool[addr]
-		c.mu.Unlock()
-
-		if ok {
-			//if the host has enough connections just exit
-			numConns = conns.Size()
-			if numConns >= c.cfg.NumConns {
-				continue
-			}
-		} else {
-			//See if the host is reachable
-			if err := c.connect(addr); err != nil {
-				continue
-			}
-		}
-
-		//This is reached if the host is responsive and needs more connections
-		//Create connections for host synchronously to mitigate flooding the host.
-		wg.Add(1)
-		go func(a string, conns int) {
-			defer wg.Done()
-			for ; conns < c.cfg.NumConns; conns++ {
-				c.connect(a)
-			}
-		}(addr, numConns)
-	}
-
-	c.hostMu.RUnlock()
-
-	//Wait until we're finished connecting to each host before returning
-	wg.Wait()
-}
-
-// Should only be called if c.mu is locked
-func (c *SimplePool) removeConnLocked(conn *Conn) {
-	conn.Close()
-	connPool := c.connPool[conn.addr]
-	if connPool == nil {
-		return
-	}
-	connPool.RemoveNode(conn)
-	if connPool.Size() == 0 {
-		c.hostPool.RemoveNode(connPool)
-		delete(c.connPool, conn.addr)
-	}
-	delete(c.conns, conn)
-}
-
-func (c *SimplePool) removeConn(conn *Conn) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	c.removeConnLocked(conn)
-}
-
-//HandleError is called by a Connection object to report to the pool an error has occured.
-//Logic is then executed within the pool to clean up the erroroneous connection and try to
-//top off the pool.
-func (c *SimplePool) HandleError(conn *Conn, err error, closed bool) {
-	if !closed {
-		// ignore all non-fatal errors
-		return
-	}
-	c.removeConn(conn)
-	c.mu.Lock()
-	poolClosed := c.quit
-	c.mu.Unlock()
-	if !poolClosed {
-		go c.fillPool() // top off pool.
-	}
-}
-
-//Pick selects a connection to be used by the query.
-func (c *SimplePool) Pick(qry *Query) *Conn {
-	//Check if connections are available
-	c.mu.Lock()
-	conns := len(c.conns)
-	c.mu.Unlock()
-
-	if conns == 0 {
-		//try to populate the pool before returning.
-		c.fillPool()
-	}
-
-	return c.hostPool.Pick(qry)
-}
-
-//Size returns the number of connections currently active in the pool
-func (p *SimplePool) Size() int {
-	p.mu.Lock()
-	conns := len(p.conns)
-	p.mu.Unlock()
-	return conns
-}
-
-//Close kills the pool and all associated connections.
-func (c *SimplePool) Close() {
-	c.quitOnce.Do(func() {
-		c.mu.Lock()
-		defer c.mu.Unlock()
-		c.quit = true
-		close(c.quitWait)
-		for conn := range c.conns {
-			c.removeConnLocked(conn)
-		}
-	})
-}
-
-func (c *SimplePool) SetHosts(hosts []HostInfo) {
-
-	c.hostMu.Lock()
-	toRemove := make(map[string]struct{})
-	for k := range c.hosts {
-		toRemove[k] = struct{}{}
-	}
-
-	for _, host := range hosts {
-		host := host
-		delete(toRemove, host.Peer)
-		// we already have it
-		if _, ok := c.hosts[host.Peer]; ok {
-			// TODO: Check rack, dc, token range is consistent, trigger topology change
-			// update stored host
-			continue
-		}
-
-		c.hosts[host.Peer] = &host
-	}
-
-	// can we hold c.mu whilst iterating this loop?
-	for addr := range toRemove {
-		c.removeHostLocked(addr)
-	}
-	c.hostMu.Unlock()
-
-	c.fillPool()
-}
-
-func (c *SimplePool) removeHostLocked(addr string) {
-	if _, ok := c.hosts[addr]; !ok {
-		return
-	}
-	delete(c.hosts, addr)
-
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	if _, ok := c.connPool[addr]; !ok {
-		return
-	}
-
-	for conn := range c.conns {
-		if conn.Address() == addr {
-			c.removeConnLocked(conn)
-		}
-	}
-}
-
-//NewRoundRobinConnPool creates a connection pool which selects hosts by
-//round-robin, and then selects a connection for that host by round-robin.
-func NewRoundRobinConnPool(cfg *ClusterConfig) (ConnectionPool, error) {
-	return NewPolicyConnPool(
-		cfg,
-		NewRoundRobinHostPolicy(),
-		NewRoundRobinConnPolicy,
-	)
-}
-
-//NewTokenAwareConnPool creates a connection pool which selects hosts by
-//a token aware policy, and then selects a connection for that host by
-//round-robin.
-func NewTokenAwareConnPool(cfg *ClusterConfig) (ConnectionPool, error) {
-	return NewPolicyConnPool(
-		cfg,
-		NewTokenAwareHostPolicy(NewRoundRobinHostPolicy()),
-		NewRoundRobinConnPolicy,
-	)
-}
-
-type policyConnPool struct {
-	port     int
-	numConns int
-	connCfg  ConnConfig
-	keyspace string
-
-	mu            sync.RWMutex
-	hostPolicy    HostSelectionPolicy
-	connPolicy    func() ConnSelectionPolicy
-	hostConnPools map[string]*hostConnPool
-}
-
-//Creates a policy based connection pool. This func isn't meant to be directly
-//used as a NewPoolFunc in ClusterConfig, instead a func should be created
-//which satisfies the NewPoolFunc type, which calls this func with the desired
-//hostPolicy and connPolicy; see NewRoundRobinConnPool or NewTokenAwareConnPool
-//for examples.
-func NewPolicyConnPool(
-	cfg *ClusterConfig,
-	hostPolicy HostSelectionPolicy,
-	connPolicy func() ConnSelectionPolicy,
-) (ConnectionPool, error) {
-	var err error
-	var tlsConfig *tls.Config
-
-	if cfg.SslOpts != nil {
-		tlsConfig, err = setupTLSConfig(cfg.SslOpts)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// create the pool
-	pool := &policyConnPool{
-		port:     cfg.Port,
-		numConns: cfg.NumConns,
-		connCfg: ConnConfig{
-			ProtoVersion:  cfg.ProtoVersion,
-			CQLVersion:    cfg.CQLVersion,
-			Timeout:       cfg.Timeout,
-			NumStreams:    cfg.NumStreams,
-			Compressor:    cfg.Compressor,
-			Authenticator: cfg.Authenticator,
-			Keepalive:     cfg.SocketKeepalive,
-			tlsConfig:     tlsConfig,
-		},
-		keyspace:      cfg.Keyspace,
-		hostPolicy:    hostPolicy,
-		connPolicy:    connPolicy,
-		hostConnPools: map[string]*hostConnPool{},
-	}
-
-	hosts := make([]HostInfo, len(cfg.Hosts))
-	for i, hostAddr := range cfg.Hosts {
-		hosts[i].Peer = hostAddr
-	}
-
-	pool.SetHosts(hosts)
-
-	return pool, nil
-}
-
-func (p *policyConnPool) SetHosts(hosts []HostInfo) {
-	p.mu.Lock()
-
-	toRemove := make(map[string]struct{})
-	for addr := range p.hostConnPools {
-		toRemove[addr] = struct{}{}
-	}
-
-	// TODO connect to hosts in parallel, but wait for pools to be
-	// created before returning
-
-	for i := range hosts {
-		pool, exists := p.hostConnPools[hosts[i].Peer]
-		if !exists {
-			// create a connection pool for the host
-			pool = newHostConnPool(
-				hosts[i].Peer,
-				p.port,
-				p.numConns,
-				p.connCfg,
-				p.keyspace,
-				p.connPolicy(),
-			)
-			p.hostConnPools[hosts[i].Peer] = pool
-		} else {
-			// still have this host, so don't remove it
-			delete(toRemove, hosts[i].Peer)
-		}
-	}
-
-	for addr := range toRemove {
-		pool := p.hostConnPools[addr]
-		delete(p.hostConnPools, addr)
-		pool.Close()
-	}
-
-	// update the policy
-	p.hostPolicy.SetHosts(hosts)
-
-	p.mu.Unlock()
-}
-
-func (p *policyConnPool) SetPartitioner(partitioner string) {
-	p.hostPolicy.SetPartitioner(partitioner)
-}
-
-func (p *policyConnPool) Size() int {
-	p.mu.RLock()
-	count := 0
-	for _, pool := range p.hostConnPools {
-		count += pool.Size()
-	}
-	p.mu.RUnlock()
-
-	return count
-}
-
-func (p *policyConnPool) Pick(qry *Query) *Conn {
-	nextHost := p.hostPolicy.Pick(qry)
-
-	p.mu.RLock()
-	var host *HostInfo
-	var conn *Conn
-	for conn == nil {
-		host = nextHost()
-		if host == nil {
-			break
-		}
-		conn = p.hostConnPools[host.Peer].Pick(qry)
-	}
-	p.mu.RUnlock()
-	return conn
-}
-
-func (p *policyConnPool) Close() {
-	p.mu.Lock()
-
-	// remove the hosts from the policy
-	p.hostPolicy.SetHosts([]HostInfo{})
-
-	// close the pools
-	for addr, pool := range p.hostConnPools {
-		delete(p.hostConnPools, addr)
-		pool.Close()
-	}
-	p.mu.Unlock()
-}
-
-// hostConnPool is a connection pool for a single host.
-// Connection selection is based on a provided ConnSelectionPolicy
-type hostConnPool struct {
-	host     string
-	port     int
-	addr     string
-	size     int
-	connCfg  ConnConfig
-	keyspace string
-	policy   ConnSelectionPolicy
-	// protection for conns, closed, filling
-	mu      sync.RWMutex
-	conns   []*Conn
-	closed  bool
-	filling bool
-}
-
-func newHostConnPool(
-	host string,
-	port int,
-	size int,
-	connCfg ConnConfig,
-	keyspace string,
-	policy ConnSelectionPolicy,
-) *hostConnPool {
-
-	pool := &hostConnPool{
-		host:     host,
-		port:     port,
-		addr:     JoinHostPort(host, port),
-		size:     size,
-		connCfg:  connCfg,
-		keyspace: keyspace,
-		policy:   policy,
-		conns:    make([]*Conn, 0, size),
-		filling:  false,
-		closed:   false,
-	}
-
-	// fill the pool with the initial connections before returning
-	pool.fill()
-
-	return pool
-}
-
-// Pick a connection from this connection pool for the given query.
-func (pool *hostConnPool) Pick(qry *Query) *Conn {
-	pool.mu.RLock()
-	if pool.closed {
-		pool.mu.RUnlock()
-		return nil
-	}
-
-	empty := len(pool.conns) == 0
-	pool.mu.RUnlock()
-
-	if empty {
-		// try to fill the empty pool
-		go pool.fill()
-		return nil
-	}
-
-	return pool.policy.Pick(qry)
-}
-
-//Size returns the number of connections currently active in the pool
-func (pool *hostConnPool) Size() int {
-	pool.mu.RLock()
-	defer pool.mu.RUnlock()
-
-	return len(pool.conns)
-}
-
-//Close the connection pool
-func (pool *hostConnPool) Close() {
-	pool.mu.Lock()
-	defer pool.mu.Unlock()
-
-	if pool.closed {
-		return
-	}
-	pool.closed = true
-
-	// drain, but don't wait
-	go pool.drain()
-}
-
-// Fill the connection pool
-func (pool *hostConnPool) fill() {
-	pool.mu.RLock()
-	// avoid filling a closed pool, or concurrent filling
-	if pool.closed || pool.filling {
-		pool.mu.RUnlock()
-		return
-	}
-
-	// determine the filling work to be done
-	startCount := len(pool.conns)
-	fillCount := pool.size - startCount
-
-	// avoid filling a full (or overfull) pool
-	if fillCount <= 0 {
-		pool.mu.RUnlock()
-		return
-	}
-
-	// switch from read to write lock
-	pool.mu.RUnlock()
-	pool.mu.Lock()
-
-	// double check everything since the lock was released
-	startCount = len(pool.conns)
-	fillCount = pool.size - startCount
-	if pool.closed || pool.filling || fillCount <= 0 {
-		// looks like another goroutine already beat this
-		// goroutine to the filling
-		pool.mu.Unlock()
-		return
-	}
-
-	// ok fill the pool
-	pool.filling = true
-
-	// allow others to access the pool while filling
-	pool.mu.Unlock()
-	// only this goroutine should make calls to fill/empty the pool at this
-	// point until after this routine or its subordinates calls
-	// fillingStopped
-
-	// fill only the first connection synchronously
-	if startCount == 0 {
-		err := pool.connect()
-		pool.logConnectErr(err)
-
-		if err != nil {
-			// probably unreachable host
-			go pool.fillingStopped()
-			return
-		}
-
-		// filled one
-		fillCount--
-
-		// connect all connections to this host in sync
-		for fillCount > 0 {
-			err := pool.connect()
-			pool.logConnectErr(err)
-
-			// decrement, even on error
-			fillCount--
-		}
-
-		go pool.fillingStopped()
-		return
-	}
-
-	// fill the rest of the pool asynchronously
-	go func() {
-		for fillCount > 0 {
-			err := pool.connect()
-			pool.logConnectErr(err)
-
-			// decrement, even on error
-			fillCount--
-		}
-
-		// mark the end of filling
-		pool.fillingStopped()
-	}()
-}
-
-func (pool *hostConnPool) logConnectErr(err error) {
-	if opErr, ok := err.(*net.OpError); ok && (opErr.Op == "dial" || opErr.Op == "read") {
-		// connection refused
-		// these are typical during a node outage so avoid log spam.
-	} else if err != nil {
-		// unexpected error
-		log.Printf("error: failed to connect to %s due to error: %v", pool.addr, err)
-	}
-}
-
-// transition back to a not-filling state.
-func (pool *hostConnPool) fillingStopped() {
-	// wait for some time to avoid back-to-back filling
-	// this provides some time between failed attempts
-	// to fill the pool for the host to recover
-	time.Sleep(time.Duration(rand.Int31n(100)+31) * time.Millisecond)
-
-	pool.mu.Lock()
-	pool.filling = false
-	pool.mu.Unlock()
-}
-
-// create a new connection to the host and add it to the pool
-func (pool *hostConnPool) connect() error {
-	// try to connect
-	conn, err := Connect(pool.addr, pool.connCfg, pool)
-	if err != nil {
-		return err
-	}
-
-	if pool.keyspace != "" {
-		// set the keyspace
-		if err := conn.UseKeyspace(pool.keyspace); err != nil {
-			conn.Close()
-			return err
-		}
-	}
-
-	// add the Conn to the pool
-	pool.mu.Lock()
-	defer pool.mu.Unlock()
-
-	if pool.closed {
-		conn.Close()
-		return nil
-	}
-
-	pool.conns = append(pool.conns, conn)
-	pool.policy.SetConns(pool.conns)
-	return nil
-}
-
-// handle any error from a Conn
-func (pool *hostConnPool) HandleError(conn *Conn, err error, closed bool) {
-	if !closed {
-		// still an open connection, so continue using it
-		return
-	}
-
-	pool.mu.Lock()
-	defer pool.mu.Unlock()
-
-	if pool.closed {
-		// pool closed
-		return
-	}
-
-	// find the connection index
-	for i, candidate := range pool.conns {
-		if candidate == conn {
-			// remove the connection, not preserving order
-			pool.conns[i], pool.conns = pool.conns[len(pool.conns)-1], pool.conns[:len(pool.conns)-1]
-
-			// update the policy
-			pool.policy.SetConns(pool.conns)
-
-			// lost a connection, so fill the pool
-			go pool.fill()
-			break
-		}
-	}
-}
-
-// removes and closes all connections from the pool
-func (pool *hostConnPool) drain() {
-	pool.mu.Lock()
-	defer pool.mu.Unlock()
-
-	// empty the pool
-	conns := pool.conns
-	pool.conns = pool.conns[:0]
-
-	// update the policy
-	pool.policy.SetConns(pool.conns)
-
-	// close the connections
-	for _, conn := range conns {
-		conn.Close()
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/doc.go b/vendor/github.com/gocql/gocql/doc.go
deleted file mode 100644
index f661cf65f..000000000
--- a/vendor/github.com/gocql/gocql/doc.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2012-2015 The gocql 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 gocql implements a fast and robust Cassandra driver for the
-// Go programming language.
-package gocql
-
-// TODO(tux21b): write more docs.
diff --git a/vendor/github.com/gocql/gocql/errors.go b/vendor/github.com/gocql/gocql/errors.go
deleted file mode 100644
index 1f959dc07..000000000
--- a/vendor/github.com/gocql/gocql/errors.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package gocql
-
-import "fmt"
-
-const (
-	errServer        = 0x0000
-	errProtocol      = 0x000A
-	errCredentials   = 0x0100
-	errUnavailable   = 0x1000
-	errOverloaded    = 0x1001
-	errBootstrapping = 0x1002
-	errTruncate      = 0x1003
-	errWriteTimeout  = 0x1100
-	errReadTimeout   = 0x1200
-	errSyntax        = 0x2000
-	errUnauthorized  = 0x2100
-	errInvalid       = 0x2200
-	errConfig        = 0x2300
-	errAlreadyExists = 0x2400
-	errUnprepared    = 0x2500
-)
-
-type RequestError interface {
-	Code() int
-	Message() string
-	Error() string
-}
-
-type errorFrame struct {
-	frameHeader
-
-	code    int
-	message string
-}
-
-func (e errorFrame) Code() int {
-	return e.code
-}
-
-func (e errorFrame) Message() string {
-	return e.message
-}
-
-func (e errorFrame) Error() string {
-	return e.Message()
-}
-
-func (e errorFrame) String() string {
-	return fmt.Sprintf("[error code=%x message=%q]", e.code, e.message)
-}
-
-type RequestErrUnavailable struct {
-	errorFrame
-	Consistency Consistency
-	Required    int
-	Alive       int
-}
-
-func (e *RequestErrUnavailable) String() string {
-	return fmt.Sprintf("[request_error_unavailable consistency=%s required=%d alive=%d]", e.Consistency, e.Required, e.Alive)
-}
-
-type RequestErrWriteTimeout struct {
-	errorFrame
-	Consistency Consistency
-	Received    int
-	BlockFor    int
-	WriteType   string
-}
-
-type RequestErrReadTimeout struct {
-	errorFrame
-	Consistency Consistency
-	Received    int
-	BlockFor    int
-	DataPresent byte
-}
-
-type RequestErrAlreadyExists struct {
-	errorFrame
-	Keyspace string
-	Table    string
-}
-
-type RequestErrUnprepared struct {
-	errorFrame
-	StatementId []byte
-}
diff --git a/vendor/github.com/gocql/gocql/errors_test.go b/vendor/github.com/gocql/gocql/errors_test.go
deleted file mode 100644
index 8c4a588df..000000000
--- a/vendor/github.com/gocql/gocql/errors_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"testing"
-)
-
-func TestErrorsParse(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	if err := createTable(session, `CREATE TABLE errors_parse (id int primary key)`); err != nil {
-		t.Fatal("create:", err)
-	}
-
-	if err := createTable(session, `CREATE TABLE errors_parse (id int primary key)`); err == nil {
-		t.Fatal("Should have gotten already exists error from cassandra server.")
-	} else {
-		switch e := err.(type) {
-		case *RequestErrAlreadyExists:
-			if e.Table != "errors_parse" {
-				t.Fatal("Failed to parse error response from cassandra for ErrAlreadyExists.")
-			}
-		default:
-			t.Fatal("Failed to parse error response from cassandra for ErrAlreadyExists.")
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/frame.go b/vendor/github.com/gocql/gocql/frame.go
deleted file mode 100644
index ba1ad2e47..000000000
--- a/vendor/github.com/gocql/gocql/frame.go
+++ /dev/null
@@ -1,1480 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"runtime"
-	"sync"
-	"time"
-)
-
-const (
-	protoDirectionMask = 0x80
-	protoVersionMask   = 0x7F
-	protoVersion1      = 0x01
-	protoVersion2      = 0x02
-	protoVersion3      = 0x03
-
-	maxFrameSize = 256 * 1024 * 1024
-)
-
-type protoVersion byte
-
-func (p protoVersion) request() bool {
-	return p&protoDirectionMask == 0x00
-}
-
-func (p protoVersion) response() bool {
-	return p&protoDirectionMask == 0x80
-}
-
-func (p protoVersion) version() byte {
-	return byte(p) & protoVersionMask
-}
-
-func (p protoVersion) String() string {
-	dir := "REQ"
-	if p.response() {
-		dir = "RESP"
-	}
-
-	return fmt.Sprintf("[version=%d direction=%s]", p.version(), dir)
-}
-
-type frameOp byte
-
-const (
-	// header ops
-	opError         frameOp = 0x00
-	opStartup               = 0x01
-	opReady                 = 0x02
-	opAuthenticate          = 0x03
-	opOptions               = 0x05
-	opSupported             = 0x06
-	opQuery                 = 0x07
-	opResult                = 0x08
-	opPrepare               = 0x09
-	opExecute               = 0x0A
-	opRegister              = 0x0B
-	opEvent                 = 0x0C
-	opBatch                 = 0x0D
-	opAuthChallenge         = 0x0E
-	opAuthResponse          = 0x0F
-	opAuthSuccess           = 0x10
-)
-
-func (f frameOp) String() string {
-	switch f {
-	case opError:
-		return "ERROR"
-	case opStartup:
-		return "STARTUP"
-	case opReady:
-		return "READY"
-	case opAuthenticate:
-		return "AUTHENTICATE"
-	case opOptions:
-		return "OPTIONS"
-	case opSupported:
-		return "SUPPORTED"
-	case opQuery:
-		return "QUERY"
-	case opResult:
-		return "RESULT"
-	case opPrepare:
-		return "PREPARE"
-	case opExecute:
-		return "EXECUTE"
-	case opRegister:
-		return "REGISTER"
-	case opEvent:
-		return "EVENT"
-	case opBatch:
-		return "BATCH"
-	case opAuthChallenge:
-		return "AUTH_CHALLENGE"
-	case opAuthResponse:
-		return "AUTH_RESPONSE"
-	case opAuthSuccess:
-		return "AUTH_SUCCESS"
-	default:
-		return fmt.Sprintf("UNKNOWN_OP_%d", f)
-	}
-}
-
-const (
-	// result kind
-	resultKindVoid          = 1
-	resultKindRows          = 2
-	resultKindKeyspace      = 3
-	resultKindPrepared      = 4
-	resultKindSchemaChanged = 5
-
-	// rows flags
-	flagGlobalTableSpec int = 0x01
-	flagHasMorePages        = 0x02
-	flagNoMetaData          = 0x04
-
-	// query flags
-	flagValues                byte = 0x01
-	flagSkipMetaData               = 0x02
-	flagPageSize                   = 0x04
-	flagWithPagingState            = 0x08
-	flagWithSerialConsistency      = 0x10
-	flagDefaultTimestamp           = 0x20
-	flagWithNameValues             = 0x40
-
-	// header flags
-	flagCompress byte = 0x01
-	flagTracing       = 0x02
-)
-
-type Consistency uint16
-
-const (
-	Any         Consistency = 0x00
-	One         Consistency = 0x01
-	Two         Consistency = 0x02
-	Three       Consistency = 0x03
-	Quorum      Consistency = 0x04
-	All         Consistency = 0x05
-	LocalQuorum Consistency = 0x06
-	EachQuorum  Consistency = 0x07
-	LocalOne    Consistency = 0x0A
-)
-
-func (c Consistency) String() string {
-	switch c {
-	case Any:
-		return "ANY"
-	case One:
-		return "ONE"
-	case Two:
-		return "TWO"
-	case Three:
-		return "THREE"
-	case Quorum:
-		return "QUORUM"
-	case All:
-		return "ALL"
-	case LocalQuorum:
-		return "LOCAL_QUORUM"
-	case EachQuorum:
-		return "EACH_QUORUM"
-	case LocalOne:
-		return "LOCAL_ONE"
-	default:
-		return fmt.Sprintf("UNKNOWN_CONS_0x%x", uint16(c))
-	}
-}
-
-type SerialConsistency uint16
-
-const (
-	Serial      SerialConsistency = 0x08
-	LocalSerial SerialConsistency = 0x09
-)
-
-func (s SerialConsistency) String() string {
-	switch s {
-	case Serial:
-		return "SERIAL"
-	case LocalSerial:
-		return "LOCAL_SERIAL"
-	default:
-		return fmt.Sprintf("UNKNOWN_SERIAL_CONS_0x%x", uint16(s))
-	}
-}
-
-const (
-	apacheCassandraTypePrefix = "org.apache.cassandra.db.marshal."
-)
-
-var (
-	ErrFrameTooBig = errors.New("frame length is bigger than the maximum alowed")
-)
-
-func writeInt(p []byte, n int32) {
-	p[0] = byte(n >> 24)
-	p[1] = byte(n >> 16)
-	p[2] = byte(n >> 8)
-	p[3] = byte(n)
-}
-
-func readInt(p []byte) int32 {
-	return int32(p[0])<<24 | int32(p[1])<<16 | int32(p[2])<<8 | int32(p[3])
-}
-
-func writeShort(p []byte, n uint16) {
-	p[0] = byte(n >> 8)
-	p[1] = byte(n)
-}
-
-func readShort(p []byte) uint16 {
-	return uint16(p[0])<<8 | uint16(p[1])
-}
-
-type frameHeader struct {
-	version protoVersion
-	flags   byte
-	stream  int
-	op      frameOp
-	length  int
-}
-
-func (f frameHeader) String() string {
-	return fmt.Sprintf("[header version=%s flags=0x%x stream=%d op=%s length=%d]", f.version, f.flags, f.stream, f.op, f.length)
-}
-
-func (f frameHeader) Header() frameHeader {
-	return f
-}
-
-const defaultBufSize = 128
-
-var framerPool = sync.Pool{
-	New: func() interface{} {
-		return &framer{
-			wbuf:       make([]byte, defaultBufSize),
-			readBuffer: make([]byte, defaultBufSize),
-		}
-	},
-}
-
-// a framer is responsible for reading, writing and parsing frames on a single stream
-type framer struct {
-	r io.Reader
-	w io.Writer
-
-	proto byte
-	// flags are for outgoing flags, enabling compression and tracing etc
-	flags    byte
-	compres  Compressor
-	headSize int
-	// if this frame was read then the header will be here
-	header *frameHeader
-
-	// if tracing flag is set this is not nil
-	traceID []byte
-
-	// holds a ref to the whole byte slice for rbuf so that it can be reset to
-	// 0 after a read.
-	readBuffer []byte
-
-	rbuf []byte
-	wbuf []byte
-}
-
-func newFramer(r io.Reader, w io.Writer, compressor Compressor, version byte) *framer {
-	f := framerPool.Get().(*framer)
-	var flags byte
-	if compressor != nil {
-		flags |= flagCompress
-	}
-
-	version &= protoVersionMask
-
-	headSize := 8
-	if version > protoVersion2 {
-		headSize = 9
-	}
-
-	f.compres = compressor
-	f.proto = version
-	f.flags = flags
-	f.headSize = headSize
-
-	f.r = r
-	f.rbuf = f.readBuffer[:0]
-
-	f.w = w
-	f.wbuf = f.wbuf[:0]
-
-	f.header = nil
-	f.traceID = nil
-
-	return f
-}
-
-type frame interface {
-	Header() frameHeader
-}
-
-func readHeader(r io.Reader, p []byte) (head frameHeader, err error) {
-	_, err = io.ReadFull(r, p)
-	if err != nil {
-		return
-	}
-
-	version := p[0] & protoVersionMask
-
-	if version < protoVersion1 || version > protoVersion3 {
-		err = fmt.Errorf("invalid version: %x", version)
-		return
-	}
-
-	head.version = protoVersion(p[0])
-	head.flags = p[1]
-
-	if version > protoVersion2 {
-		if len(p) < 9 {
-			return frameHeader{}, fmt.Errorf("not enough bytes to read header require 9 got: %d", len(p))
-		}
-
-		head.stream = int(int16(p[2])<<8 | int16(p[3]))
-		head.op = frameOp(p[4])
-		head.length = int(readInt(p[5:]))
-	} else {
-		if len(p) < 8 {
-			return frameHeader{}, fmt.Errorf("not enough bytes to read header require 8 got: %d", len(p))
-		}
-
-		head.stream = int(int8(p[2]))
-		head.op = frameOp(p[3])
-		head.length = int(readInt(p[4:]))
-	}
-
-	return
-}
-
-// explicitly enables tracing for the framers outgoing requests
-func (f *framer) trace() {
-	f.flags |= flagTracing
-}
-
-// reads a frame form the wire into the framers buffer
-func (f *framer) readFrame(head *frameHeader) error {
-	if head.length < 0 {
-		return fmt.Errorf("frame body length can not be less than 0: %d", head.length)
-	} else if head.length > maxFrameSize {
-		// need to free up the connection to be used again
-		_, err := io.CopyN(ioutil.Discard, f.r, int64(head.length))
-		if err != nil {
-			return fmt.Errorf("error whilst trying to discard frame with invalid length: %v", err)
-		}
-		return ErrFrameTooBig
-	}
-
-	if cap(f.readBuffer) >= head.length {
-		f.rbuf = f.readBuffer[:head.length]
-	} else {
-		f.readBuffer = make([]byte, head.length)
-		f.rbuf = f.readBuffer
-	}
-
-	// assume the underlying reader takes care of timeouts and retries
-	_, err := io.ReadFull(f.r, f.rbuf)
-	if err != nil {
-		return err
-	}
-
-	if head.flags&flagCompress == flagCompress {
-		if f.compres == nil {
-			return NewErrProtocol("no compressor available with compressed frame body")
-		}
-
-		f.rbuf, err = f.compres.Decode(f.rbuf)
-		if err != nil {
-			return err
-		}
-	}
-
-	f.header = head
-	return nil
-}
-
-func (f *framer) parseFrame() (frame frame, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			if _, ok := r.(runtime.Error); ok {
-				panic(r)
-			}
-			err = r.(error)
-		}
-	}()
-
-	if f.header.version.request() {
-		return nil, NewErrProtocol("got a request frame from server: %v", f.header.version)
-	}
-
-	if f.header.flags&flagTracing == flagTracing {
-		f.readTrace()
-	}
-
-	// asumes that the frame body has been read into rbuf
-	switch f.header.op {
-	case opError:
-		frame = f.parseErrorFrame()
-	case opReady:
-		frame = f.parseReadyFrame()
-	case opResult:
-		frame, err = f.parseResultFrame()
-	case opSupported:
-		frame = f.parseSupportedFrame()
-	case opAuthenticate:
-		frame = f.parseAuthenticateFrame()
-	case opAuthChallenge:
-		frame = f.parseAuthChallengeFrame()
-	case opAuthSuccess:
-		frame = f.parseAuthSuccessFrame()
-	default:
-		return nil, NewErrProtocol("unknown op in frame header: %s", f.header.op)
-	}
-
-	return
-}
-
-func (f *framer) parseErrorFrame() frame {
-	code := f.readInt()
-	msg := f.readString()
-
-	errD := errorFrame{
-		frameHeader: *f.header,
-		code:        code,
-		message:     msg,
-	}
-
-	switch code {
-	case errUnavailable:
-		cl := f.readConsistency()
-		required := f.readInt()
-		alive := f.readInt()
-		return &RequestErrUnavailable{
-			errorFrame:  errD,
-			Consistency: cl,
-			Required:    required,
-			Alive:       alive,
-		}
-	case errWriteTimeout:
-		cl := f.readConsistency()
-		received := f.readInt()
-		blockfor := f.readInt()
-		writeType := f.readString()
-		return &RequestErrWriteTimeout{
-			errorFrame:  errD,
-			Consistency: cl,
-			Received:    received,
-			BlockFor:    blockfor,
-			WriteType:   writeType,
-		}
-	case errReadTimeout:
-		cl := f.readConsistency()
-		received := f.readInt()
-		blockfor := f.readInt()
-		dataPresent := f.readByte()
-		return &RequestErrReadTimeout{
-			errorFrame:  errD,
-			Consistency: cl,
-			Received:    received,
-			BlockFor:    blockfor,
-			DataPresent: dataPresent,
-		}
-	case errAlreadyExists:
-		ks := f.readString()
-		table := f.readString()
-		return &RequestErrAlreadyExists{
-			errorFrame: errD,
-			Keyspace:   ks,
-			Table:      table,
-		}
-	case errUnprepared:
-		stmtId := f.readShortBytes()
-		return &RequestErrUnprepared{
-			errorFrame:  errD,
-			StatementId: stmtId,
-		}
-	default:
-		return &errD
-	}
-}
-
-func (f *framer) writeHeader(flags byte, op frameOp, stream int) {
-	f.wbuf = f.wbuf[:0]
-	f.wbuf = append(f.wbuf,
-		f.proto,
-		flags,
-	)
-
-	if f.proto > protoVersion2 {
-		f.wbuf = append(f.wbuf,
-			byte(stream>>8),
-			byte(stream),
-		)
-	} else {
-		f.wbuf = append(f.wbuf,
-			byte(stream),
-		)
-	}
-
-	// pad out length
-	f.wbuf = append(f.wbuf,
-		byte(op),
-		0,
-		0,
-		0,
-		0,
-	)
-}
-
-func (f *framer) setLength(length int) {
-	p := 4
-	if f.proto > protoVersion2 {
-		p = 5
-	}
-
-	f.wbuf[p+0] = byte(length >> 24)
-	f.wbuf[p+1] = byte(length >> 16)
-	f.wbuf[p+2] = byte(length >> 8)
-	f.wbuf[p+3] = byte(length)
-}
-
-func (f *framer) finishWrite() error {
-	if len(f.wbuf) > maxFrameSize {
-		// huge app frame, lets remove it so it doesnt bloat the heap
-		f.wbuf = make([]byte, defaultBufSize)
-		return ErrFrameTooBig
-	}
-
-	if f.wbuf[1]&flagCompress == flagCompress {
-		if f.compres == nil {
-			panic("compress flag set with no compressor")
-		}
-
-		// TODO: only compress frames which are big enough
-		compressed, err := f.compres.Encode(f.wbuf[f.headSize:])
-		if err != nil {
-			return err
-		}
-
-		f.wbuf = append(f.wbuf[:f.headSize], compressed...)
-	}
-	length := len(f.wbuf) - f.headSize
-	f.setLength(length)
-
-	_, err := f.w.Write(f.wbuf)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (f *framer) readTrace() {
-	f.traceID = f.readUUID().Bytes()
-}
-
-type readyFrame struct {
-	frameHeader
-}
-
-func (f *framer) parseReadyFrame() frame {
-	return &readyFrame{
-		frameHeader: *f.header,
-	}
-}
-
-type supportedFrame struct {
-	frameHeader
-
-	supported map[string][]string
-}
-
-// TODO: if we move the body buffer onto the frameHeader then we only need a single
-// framer, and can move the methods onto the header.
-func (f *framer) parseSupportedFrame() frame {
-	return &supportedFrame{
-		frameHeader: *f.header,
-
-		supported: f.readStringMultiMap(),
-	}
-}
-
-type writeStartupFrame struct {
-	opts map[string]string
-}
-
-func (w *writeStartupFrame) writeFrame(framer *framer, streamID int) error {
-	return framer.writeStartupFrame(streamID, w.opts)
-}
-
-func (f *framer) writeStartupFrame(streamID int, options map[string]string) error {
-	f.writeHeader(f.flags&^flagCompress, opStartup, streamID)
-	f.writeStringMap(options)
-
-	return f.finishWrite()
-}
-
-type writePrepareFrame struct {
-	statement string
-}
-
-func (w *writePrepareFrame) writeFrame(framer *framer, streamID int) error {
-	return framer.writePrepareFrame(streamID, w.statement)
-}
-
-func (f *framer) writePrepareFrame(stream int, statement string) error {
-	f.writeHeader(f.flags, opPrepare, stream)
-	f.writeLongString(statement)
-	return f.finishWrite()
-}
-
-func (f *framer) readTypeInfo() TypeInfo {
-	// TODO: factor this out so the same code paths can be used to parse custom
-	// types and other types, as much of the logic will be duplicated.
-	id := f.readShort()
-
-	simple := NativeType{
-		proto: f.proto,
-		typ:   Type(id),
-	}
-
-	if simple.typ == TypeCustom {
-		simple.custom = f.readString()
-		if cassType := getApacheCassandraType(simple.custom); cassType != TypeCustom {
-			simple.typ = cassType
-		}
-	}
-
-	switch simple.typ {
-	case TypeTuple:
-		n := f.readShort()
-		tuple := TupleTypeInfo{
-			NativeType: simple,
-			Elems:      make([]TypeInfo, n),
-		}
-
-		for i := 0; i < int(n); i++ {
-			tuple.Elems[i] = f.readTypeInfo()
-		}
-
-		return tuple
-
-	case TypeUDT:
-		udt := UDTTypeInfo{
-			NativeType: simple,
-		}
-		udt.KeySpace = f.readString()
-		udt.Name = f.readString()
-
-		n := f.readShort()
-		udt.Elements = make([]UDTField, n)
-		for i := 0; i < int(n); i++ {
-			field := &udt.Elements[i]
-			field.Name = f.readString()
-			field.Type = f.readTypeInfo()
-		}
-
-		return udt
-	case TypeMap, TypeList, TypeSet:
-		collection := CollectionType{
-			NativeType: simple,
-		}
-
-		if simple.typ == TypeMap {
-			collection.Key = f.readTypeInfo()
-		}
-
-		collection.Elem = f.readTypeInfo()
-
-		return collection
-	}
-
-	return simple
-}
-
-type resultMetadata struct {
-	flags int
-
-	// only if flagPageState
-	pagingState []byte
-
-	columns []ColumnInfo
-
-	// this is a count of the total number of columns which can be scanned,
-	// it is at minimum len(columns) but may be larger, for instance when a column
-	// is a UDT or tuple.
-	actualColCount int
-}
-
-func (r resultMetadata) String() string {
-	return fmt.Sprintf("[metadata flags=0x%x paging_state=% X columns=%v]", r.flags, r.pagingState, r.columns)
-}
-
-func (f *framer) readCol(col *ColumnInfo, meta *resultMetadata, globalSpec bool, keyspace, table string) {
-	if !globalSpec {
-		col.Keyspace = f.readString()
-		col.Table = f.readString()
-	} else {
-		col.Keyspace = keyspace
-		col.Table = table
-	}
-
-	col.Name = f.readString()
-	col.TypeInfo = f.readTypeInfo()
-	switch v := col.TypeInfo.(type) {
-	// maybe also UDT
-	case TupleTypeInfo:
-		// -1 because we already included the tuple column
-		meta.actualColCount += len(v.Elems) - 1
-	}
-}
-
-func (f *framer) parseResultMetadata() resultMetadata {
-	meta := resultMetadata{
-		flags: f.readInt(),
-	}
-
-	colCount := f.readInt()
-	if colCount < 0 {
-		panic(fmt.Errorf("received negative column count: %d", colCount))
-	}
-	meta.actualColCount = colCount
-
-	if meta.flags&flagHasMorePages == flagHasMorePages {
-		meta.pagingState = f.readBytes()
-	}
-
-	if meta.flags&flagNoMetaData == flagNoMetaData {
-		return meta
-	}
-
-	var keyspace, table string
-	globalSpec := meta.flags&flagGlobalTableSpec == flagGlobalTableSpec
-	if globalSpec {
-		keyspace = f.readString()
-		table = f.readString()
-	}
-
-	var cols []ColumnInfo
-	if colCount < 1000 {
-		// preallocate columninfo to avoid excess copying
-		cols = make([]ColumnInfo, colCount)
-		for i := 0; i < colCount; i++ {
-			f.readCol(&cols[i], &meta, globalSpec, keyspace, table)
-		}
-
-	} else {
-		// use append, huge number of columns usually indicates a corrupt frame or
-		// just a huge row.
-		for i := 0; i < colCount; i++ {
-			var col ColumnInfo
-			f.readCol(&col, &meta, globalSpec, keyspace, table)
-			cols = append(cols, col)
-		}
-	}
-
-	meta.columns = cols
-
-	return meta
-}
-
-type resultVoidFrame struct {
-	frameHeader
-}
-
-func (f *resultVoidFrame) String() string {
-	return "[result_void]"
-}
-
-func (f *framer) parseResultFrame() (frame, error) {
-	kind := f.readInt()
-
-	switch kind {
-	case resultKindVoid:
-		return &resultVoidFrame{frameHeader: *f.header}, nil
-	case resultKindRows:
-		return f.parseResultRows(), nil
-	case resultKindKeyspace:
-		return f.parseResultSetKeyspace(), nil
-	case resultKindPrepared:
-		return f.parseResultPrepared(), nil
-	case resultKindSchemaChanged:
-		return f.parseResultSchemaChange(), nil
-	}
-
-	return nil, NewErrProtocol("unknown result kind: %x", kind)
-}
-
-type resultRowsFrame struct {
-	frameHeader
-
-	meta resultMetadata
-	rows [][][]byte
-}
-
-func (f *resultRowsFrame) String() string {
-	return fmt.Sprintf("[result_rows meta=%v]", f.meta)
-}
-
-func (f *framer) parseResultRows() frame {
-	meta := f.parseResultMetadata()
-
-	numRows := f.readInt()
-	if numRows < 0 {
-		panic(fmt.Errorf("invalid row_count in result frame: %d", numRows))
-	}
-
-	colCount := len(meta.columns)
-
-	rows := make([][][]byte, numRows)
-	for i := 0; i < numRows; i++ {
-		rows[i] = make([][]byte, colCount)
-		for j := 0; j < colCount; j++ {
-			rows[i][j] = f.readBytes()
-		}
-	}
-
-	return &resultRowsFrame{
-		frameHeader: *f.header,
-		meta:        meta,
-		rows:        rows,
-	}
-}
-
-type resultKeyspaceFrame struct {
-	frameHeader
-	keyspace string
-}
-
-func (r *resultKeyspaceFrame) String() string {
-	return fmt.Sprintf("[result_keyspace keyspace=%s]", r.keyspace)
-}
-
-func (f *framer) parseResultSetKeyspace() frame {
-	return &resultKeyspaceFrame{
-		frameHeader: *f.header,
-		keyspace:    f.readString(),
-	}
-}
-
-type resultPreparedFrame struct {
-	frameHeader
-
-	preparedID []byte
-	reqMeta    resultMetadata
-	respMeta   resultMetadata
-}
-
-func (f *framer) parseResultPrepared() frame {
-	frame := &resultPreparedFrame{
-		frameHeader: *f.header,
-		preparedID:  f.readShortBytes(),
-		reqMeta:     f.parseResultMetadata(),
-	}
-
-	if f.proto < protoVersion2 {
-		return frame
-	}
-
-	frame.respMeta = f.parseResultMetadata()
-
-	return frame
-}
-
-type resultSchemaChangeFrame struct {
-	frameHeader
-
-	change   string
-	keyspace string
-	table    string
-}
-
-func (s *resultSchemaChangeFrame) String() string {
-	return fmt.Sprintf("[result_schema_change change=%s keyspace=%s table=%s]", s.change, s.keyspace, s.table)
-}
-
-func (f *framer) parseResultSchemaChange() frame {
-	frame := &resultSchemaChangeFrame{
-		frameHeader: *f.header,
-	}
-
-	if f.proto < protoVersion3 {
-		frame.change = f.readString()
-		frame.keyspace = f.readString()
-		frame.table = f.readString()
-	} else {
-		// TODO: improve type representation of this
-		frame.change = f.readString()
-		target := f.readString()
-		switch target {
-		case "KEYSPACE":
-			frame.keyspace = f.readString()
-		case "TABLE", "TYPE":
-			frame.keyspace = f.readString()
-			frame.table = f.readString()
-		}
-	}
-
-	return frame
-}
-
-type authenticateFrame struct {
-	frameHeader
-
-	class string
-}
-
-func (a *authenticateFrame) String() string {
-	return fmt.Sprintf("[authenticate class=%q]", a.class)
-}
-
-func (f *framer) parseAuthenticateFrame() frame {
-	return &authenticateFrame{
-		frameHeader: *f.header,
-		class:       f.readString(),
-	}
-}
-
-type authSuccessFrame struct {
-	frameHeader
-
-	data []byte
-}
-
-func (a *authSuccessFrame) String() string {
-	return fmt.Sprintf("[auth_success data=%q]", a.data)
-}
-
-func (f *framer) parseAuthSuccessFrame() frame {
-	return &authSuccessFrame{
-		frameHeader: *f.header,
-		data:        f.readBytes(),
-	}
-}
-
-type authChallengeFrame struct {
-	frameHeader
-
-	data []byte
-}
-
-func (a *authChallengeFrame) String() string {
-	return fmt.Sprintf("[auth_challenge data=%q]", a.data)
-}
-
-func (f *framer) parseAuthChallengeFrame() frame {
-	return &authChallengeFrame{
-		frameHeader: *f.header,
-		data:        f.readBytes(),
-	}
-}
-
-type writeAuthResponseFrame struct {
-	data []byte
-}
-
-func (a *writeAuthResponseFrame) String() string {
-	return fmt.Sprintf("[auth_response data=%q]", a.data)
-}
-
-func (a *writeAuthResponseFrame) writeFrame(framer *framer, streamID int) error {
-	return framer.writeAuthResponseFrame(streamID, a.data)
-}
-
-func (f *framer) writeAuthResponseFrame(streamID int, data []byte) error {
-	f.writeHeader(f.flags, opAuthResponse, streamID)
-	f.writeBytes(data)
-	return f.finishWrite()
-}
-
-type queryValues struct {
-	value []byte
-	// optional name, will set With names for values flag
-	name string
-}
-
-type queryParams struct {
-	consistency Consistency
-	// v2+
-	skipMeta          bool
-	values            []queryValues
-	pageSize          int
-	pagingState       []byte
-	serialConsistency SerialConsistency
-	// v3+
-	defaultTimestamp bool
-}
-
-func (q queryParams) String() string {
-	return fmt.Sprintf("[query_params consistency=%v skip_meta=%v page_size=%d paging_state=%q serial_consistency=%v default_timestamp=%v values=%v]",
-		q.consistency, q.skipMeta, q.pageSize, q.pagingState, q.serialConsistency, q.defaultTimestamp, q.values)
-}
-
-func (f *framer) writeQueryParams(opts *queryParams) {
-	f.writeConsistency(opts.consistency)
-
-	if f.proto == protoVersion1 {
-		return
-	}
-
-	var flags byte
-	if len(opts.values) > 0 {
-		flags |= flagValues
-	}
-	if opts.skipMeta {
-		flags |= flagSkipMetaData
-	}
-	if opts.pageSize > 0 {
-		flags |= flagPageSize
-	}
-	if len(opts.pagingState) > 0 {
-		flags |= flagWithPagingState
-	}
-	if opts.serialConsistency > 0 {
-		flags |= flagWithSerialConsistency
-	}
-
-	names := false
-
-	// protoV3 specific things
-	if f.proto > protoVersion2 {
-		if opts.defaultTimestamp {
-			flags |= flagDefaultTimestamp
-		}
-
-		if len(opts.values) > 0 && opts.values[0].name != "" {
-			flags |= flagWithNameValues
-			names = true
-		}
-	}
-
-	f.writeByte(flags)
-
-	if n := len(opts.values); n > 0 {
-		f.writeShort(uint16(n))
-		for i := 0; i < n; i++ {
-			if names {
-				f.writeString(opts.values[i].name)
-			}
-			f.writeBytes(opts.values[i].value)
-		}
-	}
-
-	if opts.pageSize > 0 {
-		f.writeInt(int32(opts.pageSize))
-	}
-
-	if len(opts.pagingState) > 0 {
-		f.writeBytes(opts.pagingState)
-	}
-
-	if opts.serialConsistency > 0 {
-		f.writeConsistency(Consistency(opts.serialConsistency))
-	}
-
-	if f.proto > protoVersion2 && opts.defaultTimestamp {
-		// timestamp in microseconds
-		ts := time.Now().UnixNano() / 1000
-		f.writeLong(ts)
-	}
-}
-
-type writeQueryFrame struct {
-	statement string
-	params    queryParams
-}
-
-func (w *writeQueryFrame) String() string {
-	return fmt.Sprintf("[query statement=%q params=%v]", w.statement, w.params)
-}
-
-func (w *writeQueryFrame) writeFrame(framer *framer, streamID int) error {
-	return framer.writeQueryFrame(streamID, w.statement, &w.params)
-}
-
-func (f *framer) writeQueryFrame(streamID int, statement string, params *queryParams) error {
-	f.writeHeader(f.flags, opQuery, streamID)
-	f.writeLongString(statement)
-	f.writeQueryParams(params)
-
-	return f.finishWrite()
-}
-
-type frameWriter interface {
-	writeFrame(framer *framer, streamID int) error
-}
-
-type writeExecuteFrame struct {
-	preparedID []byte
-	params     queryParams
-}
-
-func (e *writeExecuteFrame) String() string {
-	return fmt.Sprintf("[execute id=% X params=%v]", e.preparedID, &e.params)
-}
-
-func (e *writeExecuteFrame) writeFrame(fr *framer, streamID int) error {
-	return fr.writeExecuteFrame(streamID, e.preparedID, &e.params)
-}
-
-func (f *framer) writeExecuteFrame(streamID int, preparedID []byte, params *queryParams) error {
-	f.writeHeader(f.flags, opExecute, streamID)
-	f.writeShortBytes(preparedID)
-	if f.proto > protoVersion1 {
-		f.writeQueryParams(params)
-	} else {
-		n := len(params.values)
-		f.writeShort(uint16(n))
-		for i := 0; i < n; i++ {
-			f.writeBytes(params.values[i].value)
-		}
-		f.writeConsistency(params.consistency)
-	}
-
-	return f.finishWrite()
-}
-
-// TODO: can we replace BatchStatemt with batchStatement? As they prety much
-// duplicate each other
-type batchStatment struct {
-	preparedID []byte
-	statement  string
-	values     []queryValues
-}
-
-type writeBatchFrame struct {
-	typ         BatchType
-	statements  []batchStatment
-	consistency Consistency
-
-	// v3+
-	serialConsistency SerialConsistency
-	defaultTimestamp  bool
-}
-
-func (w *writeBatchFrame) writeFrame(framer *framer, streamID int) error {
-	return framer.writeBatchFrame(streamID, w)
-}
-
-func (f *framer) writeBatchFrame(streamID int, w *writeBatchFrame) error {
-	f.writeHeader(f.flags, opBatch, streamID)
-	f.writeByte(byte(w.typ))
-
-	n := len(w.statements)
-	f.writeShort(uint16(n))
-
-	var flags byte
-
-	for i := 0; i < n; i++ {
-		b := &w.statements[i]
-		if len(b.preparedID) == 0 {
-			f.writeByte(0)
-			f.writeLongString(b.statement)
-		} else {
-			f.writeByte(1)
-			f.writeShortBytes(b.preparedID)
-		}
-
-		f.writeShort(uint16(len(b.values)))
-		for j := range b.values {
-			col := &b.values[j]
-			if f.proto > protoVersion2 && col.name != "" {
-				// TODO: move this check into the caller and set a flag on writeBatchFrame
-				// to indicate using named values
-				flags |= flagWithNameValues
-				f.writeString(col.name)
-			}
-			f.writeBytes(col.value)
-		}
-	}
-
-	f.writeConsistency(w.consistency)
-
-	if f.proto > protoVersion2 {
-		if w.serialConsistency > 0 {
-			flags |= flagWithSerialConsistency
-		}
-		if w.defaultTimestamp {
-			flags |= flagDefaultTimestamp
-		}
-
-		f.writeByte(flags)
-
-		if w.serialConsistency > 0 {
-			f.writeConsistency(Consistency(w.serialConsistency))
-		}
-		if w.defaultTimestamp {
-			now := time.Now().UnixNano() / 1000
-			f.writeLong(now)
-		}
-	}
-
-	return f.finishWrite()
-}
-
-func (f *framer) readByte() byte {
-	if len(f.rbuf) < 1 {
-		panic(fmt.Errorf("not enough bytes in buffer to read byte require 1 got: %d", len(f.rbuf)))
-	}
-
-	b := f.rbuf[0]
-	f.rbuf = f.rbuf[1:]
-	return b
-}
-
-func (f *framer) readInt() (n int) {
-	if len(f.rbuf) < 4 {
-		panic(fmt.Errorf("not enough bytes in buffer to read int require 4 got: %d", len(f.rbuf)))
-	}
-
-	n = int(int32(f.rbuf[0])<<24 | int32(f.rbuf[1])<<16 | int32(f.rbuf[2])<<8 | int32(f.rbuf[3]))
-	f.rbuf = f.rbuf[4:]
-	return
-}
-
-func (f *framer) readShort() (n uint16) {
-	if len(f.rbuf) < 2 {
-		panic(fmt.Errorf("not enough bytes in buffer to read short require 2 got: %d", len(f.rbuf)))
-	}
-	n = uint16(f.rbuf[0])<<8 | uint16(f.rbuf[1])
-	f.rbuf = f.rbuf[2:]
-	return
-}
-
-func (f *framer) readLong() (n int64) {
-	if len(f.rbuf) < 8 {
-		panic(fmt.Errorf("not enough bytes in buffer to read long require 8 got: %d", len(f.rbuf)))
-	}
-	n = int64(f.rbuf[0])<<56 | int64(f.rbuf[1])<<48 | int64(f.rbuf[2])<<40 | int64(f.rbuf[3])<<32 |
-		int64(f.rbuf[4])<<24 | int64(f.rbuf[5])<<16 | int64(f.rbuf[6])<<8 | int64(f.rbuf[7])
-	f.rbuf = f.rbuf[8:]
-	return
-}
-
-func (f *framer) readString() (s string) {
-	size := f.readShort()
-
-	if len(f.rbuf) < int(size) {
-		panic(fmt.Errorf("not enough bytes in buffer to read string require %d got: %d", size, len(f.rbuf)))
-	}
-
-	s = string(f.rbuf[:size])
-	f.rbuf = f.rbuf[size:]
-	return
-}
-
-func (f *framer) readLongString() (s string) {
-	size := f.readInt()
-
-	if len(f.rbuf) < size {
-		panic(fmt.Errorf("not enough bytes in buffer to read long string require %d got: %d", size, len(f.rbuf)))
-	}
-
-	s = string(f.rbuf[:size])
-	f.rbuf = f.rbuf[size:]
-	return
-}
-
-func (f *framer) readUUID() *UUID {
-	if len(f.rbuf) < 16 {
-		panic(fmt.Errorf("not enough bytes in buffer to read uuid require %d got: %d", 16, len(f.rbuf)))
-	}
-
-	// TODO: how to handle this error, if it is a uuid, then sureley, problems?
-	u, _ := UUIDFromBytes(f.rbuf[:16])
-	f.rbuf = f.rbuf[16:]
-	return &u
-}
-
-func (f *framer) readStringList() []string {
-	size := f.readShort()
-
-	l := make([]string, size)
-	for i := 0; i < int(size); i++ {
-		l[i] = f.readString()
-	}
-
-	return l
-}
-
-func (f *framer) readBytes() []byte {
-	size := f.readInt()
-	if size < 0 {
-		return nil
-	}
-
-	if len(f.rbuf) < size {
-		panic(fmt.Errorf("not enough bytes in buffer to read bytes require %d got: %d", size, len(f.rbuf)))
-	}
-
-	// we cant make assumptions about the length of the life of the supplied byte
-	// slice so we defensivly copy it out of the underlying buffer. This has the
-	// downside of increasing allocs per read but will provide much greater memory
-	// safety. The allocs can hopefully be improved in the future.
-	// TODO: dont copy into a new slice
-	l := make([]byte, size)
-	copy(l, f.rbuf[:size])
-	f.rbuf = f.rbuf[size:]
-
-	return l
-}
-
-func (f *framer) readShortBytes() []byte {
-	size := f.readShort()
-	if len(f.rbuf) < int(size) {
-		panic(fmt.Errorf("not enough bytes in buffer to read short bytes: require %d got %d", size, len(f.rbuf)))
-	}
-
-	l := make([]byte, size)
-	copy(l, f.rbuf[:size])
-	f.rbuf = f.rbuf[size:]
-
-	return l
-}
-
-func (f *framer) readInet() (net.IP, int) {
-	if len(f.rbuf) < 1 {
-		panic(fmt.Errorf("not enough bytes in buffer to read inet size require %d got: %d", 1, len(f.rbuf)))
-	}
-
-	size := f.rbuf[0]
-	f.rbuf = f.rbuf[1:]
-
-	if !(size == 4 || size == 16) {
-		panic(fmt.Errorf("invalid IP size: %d", size))
-	}
-
-	if len(f.rbuf) < 1 {
-		panic(fmt.Errorf("not enough bytes in buffer to read inet require %d got: %d", size, len(f.rbuf)))
-	}
-
-	ip := make([]byte, size)
-	copy(ip, f.rbuf[:size])
-	f.rbuf = f.rbuf[size:]
-
-	port := f.readInt()
-	return net.IP(ip), port
-}
-
-func (f *framer) readConsistency() Consistency {
-	return Consistency(f.readShort())
-}
-
-func (f *framer) readStringMap() map[string]string {
-	size := f.readShort()
-	m := make(map[string]string)
-
-	for i := 0; i < int(size); i++ {
-		k := f.readString()
-		v := f.readString()
-		m[k] = v
-	}
-
-	return m
-}
-
-func (f *framer) readStringMultiMap() map[string][]string {
-	size := f.readShort()
-	m := make(map[string][]string)
-
-	for i := 0; i < int(size); i++ {
-		k := f.readString()
-		v := f.readStringList()
-		m[k] = v
-	}
-
-	return m
-}
-
-func (f *framer) writeByte(b byte) {
-	f.wbuf = append(f.wbuf, b)
-}
-
-// these are protocol level binary types
-func (f *framer) writeInt(n int32) {
-	f.wbuf = append(f.wbuf,
-		byte(n>>24),
-		byte(n>>16),
-		byte(n>>8),
-		byte(n),
-	)
-}
-
-func (f *framer) writeShort(n uint16) {
-	f.wbuf = append(f.wbuf,
-		byte(n>>8),
-		byte(n),
-	)
-}
-
-func (f *framer) writeLong(n int64) {
-	f.wbuf = append(f.wbuf,
-		byte(n>>56),
-		byte(n>>48),
-		byte(n>>40),
-		byte(n>>32),
-		byte(n>>24),
-		byte(n>>16),
-		byte(n>>8),
-		byte(n),
-	)
-}
-
-func (f *framer) writeString(s string) {
-	f.writeShort(uint16(len(s)))
-	f.wbuf = append(f.wbuf, s...)
-}
-
-func (f *framer) writeLongString(s string) {
-	f.writeInt(int32(len(s)))
-	f.wbuf = append(f.wbuf, s...)
-}
-
-func (f *framer) writeUUID(u *UUID) {
-	f.wbuf = append(f.wbuf, u[:]...)
-}
-
-func (f *framer) writeStringList(l []string) {
-	f.writeShort(uint16(len(l)))
-	for _, s := range l {
-		f.writeString(s)
-	}
-}
-
-func (f *framer) writeBytes(p []byte) {
-	// TODO: handle null case correctly,
-	//     [bytes]        A [int] n, followed by n bytes if n >= 0. If n < 0,
-	//					  no byte should follow and the value represented is `null`.
-	if p == nil {
-		f.writeInt(-1)
-	} else {
-		f.writeInt(int32(len(p)))
-		f.wbuf = append(f.wbuf, p...)
-	}
-}
-
-func (f *framer) writeShortBytes(p []byte) {
-	f.writeShort(uint16(len(p)))
-	f.wbuf = append(f.wbuf, p...)
-}
-
-func (f *framer) writeInet(ip net.IP, port int) {
-	f.wbuf = append(f.wbuf,
-		byte(len(ip)),
-	)
-
-	f.wbuf = append(f.wbuf,
-		[]byte(ip)...,
-	)
-
-	f.writeInt(int32(port))
-}
-
-func (f *framer) writeConsistency(cons Consistency) {
-	f.writeShort(uint16(cons))
-}
-
-func (f *framer) writeStringMap(m map[string]string) {
-	f.writeShort(uint16(len(m)))
-	for k, v := range m {
-		f.writeString(k)
-		f.writeString(v)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/frame_test.go b/vendor/github.com/gocql/gocql/frame_test.go
deleted file mode 100644
index 87dcfb9a7..000000000
--- a/vendor/github.com/gocql/gocql/frame_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package gocql
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestFuzzBugs(t *testing.T) {
-	// these inputs are found using go-fuzz (https://github.com/dvyukov/go-fuzz)
-	// and should cause a panic unless fixed.
-	tests := [][]byte{
-		[]byte("00000\xa0000"),
-		[]byte("\x8000\x0e\x00\x00\x00\x000"),
-		[]byte("\x8000\x00\x00\x00\x00\t0000000000"),
-		[]byte("\xa0\xff\x01\xae\xefqE\xf2\x1a"),
-		[]byte("\x8200\b\x00\x00\x00c\x00\x00\x00\x02000\x01\x00\x00\x00\x03" +
-			"\x00\n0000000000\x00\x14000000" +
-			"00000000000000\x00\x020000" +
-			"\x00\a000000000\x00\x050000000" +
-			"\xff0000000000000000000" +
-			"0000000"),
-		[]byte("\x82\xe600\x00\x00\x00\x000"),
-		[]byte("\x8200\b\x00\x00\x00\b0\x00\x00\x00\x040000"),
-		[]byte("\x8200\x00\x00\x00\x00\x100\x00\x00\x12\x00\x00\x0000000" +
-			"00000"),
-		[]byte("\x83000\b\x00\x00\x00\x14\x00\x00\x00\x020000000" +
-			"000000000"),
-		[]byte("\x83000\b\x00\x00\x000\x00\x00\x00\x04\x00\x1000000" +
-			"00000000000000e00000" +
-			"000\x800000000000000000" +
-			"0000000000000"),
-	}
-
-	for i, test := range tests {
-		t.Logf("test %d input: %q", i, test)
-
-		var bw bytes.Buffer
-
-		r := bytes.NewReader(test)
-		head, err := readHeader(r, make([]byte, 9))
-		if err != nil {
-			continue
-		}
-
-		framer := newFramer(r, &bw, nil, byte(head.version))
-		err = framer.readFrame(&head)
-		if err != nil {
-			continue
-		}
-
-		_, err = framer.parseFrame()
-		if err != nil {
-			continue
-		}
-
-		t.Errorf("(%d) expected to fail for input %q", i, test)
-	}
-}
-
-func TestFrameWriteTooLong(t *testing.T) {
-	w := &bytes.Buffer{}
-	framer := newFramer(nil, w, nil, 2)
-
-	framer.writeHeader(0, opStartup, 1)
-	framer.writeBytes(make([]byte, maxFrameSize+1))
-	err := framer.finishWrite()
-	if err != ErrFrameTooBig {
-		t.Fatalf("expected to get %v got %v", ErrFrameTooBig, err)
-	}
-}
-
-func TestFrameReadTooLong(t *testing.T) {
-	r := &bytes.Buffer{}
-	r.Write(make([]byte, maxFrameSize+1))
-	// write a new header right after this frame to verify that we can read it
-	r.Write([]byte{0x02, 0x00, 0x00, opReady, 0x00, 0x00, 0x00, 0x00})
-
-	framer := newFramer(r, nil, nil, 2)
-
-	head := frameHeader{
-		version: 2,
-		op:      opReady,
-		length:  r.Len() - 8,
-	}
-
-	err := framer.readFrame(&head)
-	if err != ErrFrameTooBig {
-		t.Fatalf("expected to get %v got %v", ErrFrameTooBig, err)
-	}
-
-	head, err = readHeader(r, make([]byte, 8))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if head.op != opReady {
-		t.Fatalf("expected to get header %v got %v", opReady, head.op)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/fuzz.go b/vendor/github.com/gocql/gocql/fuzz.go
deleted file mode 100644
index 3606f9381..000000000
--- a/vendor/github.com/gocql/gocql/fuzz.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build gofuzz
-
-package gocql
-
-import "bytes"
-
-func Fuzz(data []byte) int {
-	var bw bytes.Buffer
-
-	r := bytes.NewReader(data)
-
-	head, err := readHeader(r, make([]byte, 9))
-	if err != nil {
-		return 0
-	}
-
-	framer := newFramer(r, &bw, nil, byte(head.version))
-	err = framer.readFrame(&head)
-	if err != nil {
-		return 0
-	}
-
-	frame, err := framer.parseFrame()
-	if err != nil {
-		return 0
-	}
-
-	if frame != nil {
-		return 1
-	}
-
-	return 2
-}
diff --git a/vendor/github.com/gocql/gocql/helpers.go b/vendor/github.com/gocql/gocql/helpers.go
deleted file mode 100644
index 8e1ca0a4b..000000000
--- a/vendor/github.com/gocql/gocql/helpers.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"math/big"
-	"reflect"
-	"strings"
-	"time"
-
-	"gopkg.in/inf.v0"
-)
-
-type RowData struct {
-	Columns []string
-	Values  []interface{}
-}
-
-func goType(t TypeInfo) reflect.Type {
-	switch t.Type() {
-	case TypeVarchar, TypeAscii, TypeInet:
-		return reflect.TypeOf(*new(string))
-	case TypeBigInt, TypeCounter:
-		return reflect.TypeOf(*new(int64))
-	case TypeTimestamp:
-		return reflect.TypeOf(*new(time.Time))
-	case TypeBlob:
-		return reflect.TypeOf(*new([]byte))
-	case TypeBoolean:
-		return reflect.TypeOf(*new(bool))
-	case TypeFloat:
-		return reflect.TypeOf(*new(float32))
-	case TypeDouble:
-		return reflect.TypeOf(*new(float64))
-	case TypeInt:
-		return reflect.TypeOf(*new(int))
-	case TypeDecimal:
-		return reflect.TypeOf(*new(*inf.Dec))
-	case TypeUUID, TypeTimeUUID:
-		return reflect.TypeOf(*new(UUID))
-	case TypeList, TypeSet:
-		return reflect.SliceOf(goType(t.(CollectionType).Elem))
-	case TypeMap:
-		return reflect.MapOf(goType(t.(CollectionType).Key), goType(t.(CollectionType).Elem))
-	case TypeVarint:
-		return reflect.TypeOf(*new(*big.Int))
-	case TypeTuple:
-		// what can we do here? all there is to do is to make a list of interface{}
-		tuple := t.(TupleTypeInfo)
-		return reflect.TypeOf(make([]interface{}, len(tuple.Elems)))
-	default:
-		return nil
-	}
-}
-
-func dereference(i interface{}) interface{} {
-	return reflect.Indirect(reflect.ValueOf(i)).Interface()
-}
-
-func getApacheCassandraType(class string) Type {
-	switch strings.TrimPrefix(class, apacheCassandraTypePrefix) {
-	case "AsciiType":
-		return TypeAscii
-	case "LongType":
-		return TypeBigInt
-	case "BytesType":
-		return TypeBlob
-	case "BooleanType":
-		return TypeBoolean
-	case "CounterColumnType":
-		return TypeCounter
-	case "DecimalType":
-		return TypeDecimal
-	case "DoubleType":
-		return TypeDouble
-	case "FloatType":
-		return TypeFloat
-	case "Int32Type":
-		return TypeInt
-	case "DateType", "TimestampType":
-		return TypeTimestamp
-	case "UUIDType":
-		return TypeUUID
-	case "UTF8Type":
-		return TypeVarchar
-	case "IntegerType":
-		return TypeVarint
-	case "TimeUUIDType":
-		return TypeTimeUUID
-	case "InetAddressType":
-		return TypeInet
-	case "MapType":
-		return TypeMap
-	case "ListType":
-		return TypeList
-	case "SetType":
-		return TypeSet
-	case "TupleType":
-		return TypeTuple
-	default:
-		return TypeCustom
-	}
-}
-
-func (r *RowData) rowMap(m map[string]interface{}) {
-	for i, column := range r.Columns {
-		val := dereference(r.Values[i])
-		if valVal := reflect.ValueOf(val); valVal.Kind() == reflect.Slice {
-			valCopy := reflect.MakeSlice(valVal.Type(), valVal.Len(), valVal.Cap())
-			reflect.Copy(valCopy, valVal)
-			m[column] = valCopy.Interface()
-		} else {
-			m[column] = val
-		}
-	}
-}
-
-func (iter *Iter) RowData() (RowData, error) {
-	if iter.err != nil {
-		return RowData{}, iter.err
-	}
-	columns := make([]string, 0)
-	values := make([]interface{}, 0)
-	for _, column := range iter.Columns() {
-		val := column.TypeInfo.New()
-		columns = append(columns, column.Name)
-		values = append(values, val)
-	}
-	rowData := RowData{
-		Columns: columns,
-		Values:  values,
-	}
-	return rowData, nil
-}
-
-// SliceMap is a helper function to make the API easier to use
-// returns the data from the query in the form of []map[string]interface{}
-func (iter *Iter) SliceMap() ([]map[string]interface{}, error) {
-	if iter.err != nil {
-		return nil, iter.err
-	}
-
-	// Not checking for the error because we just did
-	rowData, _ := iter.RowData()
-	dataToReturn := make([]map[string]interface{}, 0)
-	for iter.Scan(rowData.Values...) {
-		m := make(map[string]interface{})
-		rowData.rowMap(m)
-		dataToReturn = append(dataToReturn, m)
-	}
-	if iter.err != nil {
-		return nil, iter.err
-	}
-	return dataToReturn, nil
-}
-
-// MapScan takes a map[string]interface{} and populates it with a row
-// That is returned from cassandra.
-func (iter *Iter) MapScan(m map[string]interface{}) bool {
-	if iter.err != nil {
-		return false
-	}
-
-	// Not checking for the error because we just did
-	rowData, _ := iter.RowData()
-
-	for i, col := range rowData.Columns {
-		if dest, ok := m[col]; ok {
-			rowData.Values[i] = dest
-		}
-	}
-
-	if iter.Scan(rowData.Values...) {
-		rowData.rowMap(m)
-		return true
-	}
-	return false
-}
diff --git a/vendor/github.com/gocql/gocql/host_source.go b/vendor/github.com/gocql/gocql/host_source.go
deleted file mode 100644
index 801b6f914..000000000
--- a/vendor/github.com/gocql/gocql/host_source.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package gocql
-
-import (
-	"log"
-	"net"
-	"time"
-)
-
-type HostInfo struct {
-	Peer       string
-	DataCenter string
-	Rack       string
-	HostId     string
-	Tokens     []string
-}
-
-// Polls system.peers at a specific interval to find new hosts
-type ringDescriber struct {
-	dcFilter        string
-	rackFilter      string
-	prevHosts       []HostInfo
-	prevPartitioner string
-	session         *Session
-	closeChan       chan bool
-}
-
-func (r *ringDescriber) GetHosts() (
-	hosts []HostInfo,
-	partitioner string,
-	err error,
-) {
-	// we need conn to be the same because we need to query system.peers and system.local
-	// on the same node to get the whole cluster
-	conn := r.session.Pool.Pick(nil)
-	if conn == nil {
-		return r.prevHosts, r.prevPartitioner, nil
-	}
-
-	query := r.session.Query("SELECT data_center, rack, host_id, tokens, partitioner FROM system.local")
-	iter := conn.executeQuery(query)
-
-	host := HostInfo{}
-	iter.Scan(&host.DataCenter, &host.Rack, &host.HostId, &host.Tokens, &partitioner)
-
-	if err = iter.Close(); err != nil {
-		return nil, "", err
-	}
-
-	addr, _, err := net.SplitHostPort(conn.Address())
-	if err != nil {
-		// this should not happen, ever, as this is the address that was dialed by conn, here
-		// a panic makes sense, please report a bug if it occurs.
-		panic(err)
-	}
-
-	host.Peer = addr
-
-	hosts = []HostInfo{host}
-
-	query = r.session.Query("SELECT peer, data_center, rack, host_id, tokens FROM system.peers")
-	iter = conn.executeQuery(query)
-
-	host = HostInfo{}
-	for iter.Scan(&host.Peer, &host.DataCenter, &host.Rack, &host.HostId, &host.Tokens) {
-		if r.matchFilter(&host) {
-			hosts = append(hosts, host)
-		}
-		host = HostInfo{}
-	}
-
-	if err = iter.Close(); err != nil {
-		return nil, "", err
-	}
-
-	r.prevHosts = hosts
-	r.prevPartitioner = partitioner
-
-	return hosts, partitioner, nil
-}
-
-func (r *ringDescriber) matchFilter(host *HostInfo) bool {
-
-	if r.dcFilter != "" && r.dcFilter != host.DataCenter {
-		return false
-	}
-
-	if r.rackFilter != "" && r.rackFilter != host.Rack {
-		return false
-	}
-
-	return true
-}
-
-func (h *ringDescriber) run(sleep time.Duration) {
-	if sleep == 0 {
-		sleep = 30 * time.Second
-	}
-
-	for {
-		select {
-		case <-time.After(sleep):
-			// if we have 0 hosts this will return the previous list of hosts to
-			// attempt to reconnect to the cluster otherwise we would never find
-			// downed hosts again, could possibly have an optimisation to only
-			// try to add new hosts if GetHosts didnt error and the hosts didnt change.
-			hosts, partitioner, err := h.GetHosts()
-			if err != nil {
-				log.Println("RingDescriber: unable to get ring topology:", err)
-			} else {
-				h.session.Pool.SetHosts(hosts)
-				if v, ok := h.session.Pool.(SetPartitioner); ok {
-					v.SetPartitioner(partitioner)
-				}
-			}
-		case <-h.closeChan:
-			return
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/integration.sh b/vendor/github.com/gocql/gocql/integration.sh
deleted file mode 100644
index 543b7d1e5..000000000
--- a/vendor/github.com/gocql/gocql/integration.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-
-set -e
-
-function run_tests() {
-	local clusterSize=3
-	local version=$1
-	local auth=$2
-
-	if [ "$auth" = true ]; then
-		clusterSize=1
-	fi
-
-	local keypath="$(pwd)/testdata/pki"
-
-	local conf=(
-	    "client_encryption_options.enabled: true"
-	    "client_encryption_options.keystore: $keypath/.keystore"
-	    "client_encryption_options.keystore_password: cassandra"
-	    "client_encryption_options.require_client_auth: true"
-	    "client_encryption_options.truststore: $keypath/.truststore"
-	    "client_encryption_options.truststore_password: cassandra"
-	    "concurrent_reads: 2"
-	    "concurrent_writes: 2"
-	    "rpc_server_type: sync"
-	    "rpc_min_threads: 2"
-	    "rpc_max_threads: 2"
-	    "write_request_timeout_in_ms: 5000"
-	    "read_request_timeout_in_ms: 5000"
-	)
-
-	ccm remove test || true
-
-	ccm create test -v binary:$version -n $clusterSize -d --vnodes --jvm_arg="-Xmx256m -XX:NewSize=100m"
-    ccm updateconf "${conf[@]}"
-
-    if [ "$auth" = true ]
-	then
-		ccm updateconf 'authenticator: PasswordAuthenticator' 'authorizer: CassandraAuthorizer'
-		rm -rf $HOME/.ccm/test/node1/data/system_auth
-	fi
-
-	ccm start -v
-	ccm status
-	ccm node1 nodetool status
-
-	local proto=2
-	if [[ $version == 1.2.* ]]; then
-		proto=1
-	elif [[ $version == 2.1.* ]]; then
-		proto=3
-	fi
-
-	if [ "$auth" = true ]
-	then
-    	sleep 30s
-    	go test -v . -timeout 15s -run=TestAuthentication -tags integration -runssl -runauth -proto=$proto -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=1000ms
-	else
-
-		go test -timeout 5m -tags integration -cover -v -runssl -proto=$proto -rf=3 -cluster=$(ccm liveset) -clusterSize=$clusterSize -autowait=2000ms -compressor=snappy ./... | tee results.txt
-
-		if [ ${PIPESTATUS[0]} -ne 0 ]; then
-			echo "--- FAIL: ccm status follows:"
-			ccm status
-			ccm node1 nodetool status
-			ccm node1 showlog > status.log
-			cat status.log
-			echo "--- FAIL: Received a non-zero exit code from the go test execution, please investigate this"
-			exit 1
-		fi
-
-		cover=`cat results.txt | grep coverage: | grep -o "[0-9]\{1,3\}" | head -n 1`
-
-		if [[ $cover -lt "55" ]]; then
-			echo "--- FAIL: expected coverage of at least 60 %, but coverage was $cover %"
-			exit 1
-		fi
-	fi
-
-	ccm remove
-}
-
-run_tests $1 $2
diff --git a/vendor/github.com/gocql/gocql/marshal.go b/vendor/github.com/gocql/gocql/marshal.go
deleted file mode 100644
index 4fcb22aab..000000000
--- a/vendor/github.com/gocql/gocql/marshal.go
+++ /dev/null
@@ -1,1624 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"math"
-	"math/big"
-	"net"
-	"reflect"
-	"strconv"
-	"strings"
-	"time"
-
-	"gopkg.in/inf.v0"
-)
-
-var (
-	bigOne = big.NewInt(1)
-)
-
-var (
-	ErrorUDTUnavailable = errors.New("UDT are not available on protocols less than 3, please update config")
-)
-
-// Marshaler is the interface implemented by objects that can marshal
-// themselves into values understood by Cassandra.
-type Marshaler interface {
-	MarshalCQL(info TypeInfo) ([]byte, error)
-}
-
-// Unmarshaler is the interface implemented by objects that can unmarshal
-// a Cassandra specific description of themselves.
-type Unmarshaler interface {
-	UnmarshalCQL(info TypeInfo, data []byte) error
-}
-
-// Marshal returns the CQL encoding of the value for the Cassandra
-// internal type described by the info parameter.
-func Marshal(info TypeInfo, value interface{}) ([]byte, error) {
-	if value == nil {
-		return nil, nil
-	}
-	if info.Version() < protoVersion1 {
-		panic("protocol version not set")
-	}
-
-	if valueRef := reflect.ValueOf(value); valueRef.Kind() == reflect.Ptr {
-		if valueRef.IsNil() {
-			return nil, nil
-		} else if v, ok := value.(Marshaler); ok {
-			return v.MarshalCQL(info)
-		} else {
-			return Marshal(info, valueRef.Elem().Interface())
-		}
-	}
-
-	if v, ok := value.(Marshaler); ok {
-		return v.MarshalCQL(info)
-	}
-
-	switch info.Type() {
-	case TypeVarchar, TypeAscii, TypeBlob:
-		return marshalVarchar(info, value)
-	case TypeBoolean:
-		return marshalBool(info, value)
-	case TypeInt:
-		return marshalInt(info, value)
-	case TypeBigInt, TypeCounter:
-		return marshalBigInt(info, value)
-	case TypeFloat:
-		return marshalFloat(info, value)
-	case TypeDouble:
-		return marshalDouble(info, value)
-	case TypeDecimal:
-		return marshalDecimal(info, value)
-	case TypeTimestamp:
-		return marshalTimestamp(info, value)
-	case TypeList, TypeSet:
-		return marshalList(info, value)
-	case TypeMap:
-		return marshalMap(info, value)
-	case TypeUUID, TypeTimeUUID:
-		return marshalUUID(info, value)
-	case TypeVarint:
-		return marshalVarint(info, value)
-	case TypeInet:
-		return marshalInet(info, value)
-	case TypeUDT:
-		return marshalUDT(info, value)
-	}
-
-	// detect protocol 2 UDT
-	if strings.HasPrefix(info.Custom(), "org.apache.cassandra.db.marshal.UserType") && info.Version() < 3 {
-		return nil, ErrorUDTUnavailable
-	}
-
-	// TODO(tux21b): add the remaining types
-	return nil, fmt.Errorf("can not marshal %T into %s", value, info)
-}
-
-// Unmarshal parses the CQL encoded data based on the info parameter that
-// describes the Cassandra internal data type and stores the result in the
-// value pointed by value.
-func Unmarshal(info TypeInfo, data []byte, value interface{}) error {
-	if v, ok := value.(Unmarshaler); ok {
-		return v.UnmarshalCQL(info, data)
-	}
-	if isNullableValue(value) {
-		return unmarshalNullable(info, data, value)
-	}
-
-	switch info.Type() {
-	case TypeVarchar, TypeAscii, TypeBlob:
-		return unmarshalVarchar(info, data, value)
-	case TypeBoolean:
-		return unmarshalBool(info, data, value)
-	case TypeInt:
-		return unmarshalInt(info, data, value)
-	case TypeBigInt, TypeCounter:
-		return unmarshalBigInt(info, data, value)
-	case TypeVarint:
-		return unmarshalVarint(info, data, value)
-	case TypeFloat:
-		return unmarshalFloat(info, data, value)
-	case TypeDouble:
-		return unmarshalDouble(info, data, value)
-	case TypeDecimal:
-		return unmarshalDecimal(info, data, value)
-	case TypeTimestamp:
-		return unmarshalTimestamp(info, data, value)
-	case TypeList, TypeSet:
-		return unmarshalList(info, data, value)
-	case TypeMap:
-		return unmarshalMap(info, data, value)
-	case TypeTimeUUID:
-		return unmarshalTimeUUID(info, data, value)
-	case TypeUUID:
-		return unmarshalUUID(info, data, value)
-	case TypeInet:
-		return unmarshalInet(info, data, value)
-	case TypeTuple:
-		return unmarshalTuple(info, data, value)
-	case TypeUDT:
-		return unmarshalUDT(info, data, value)
-	}
-
-	// detect protocol 2 UDT
-	if strings.HasPrefix(info.Custom(), "org.apache.cassandra.db.marshal.UserType") && info.Version() < 3 {
-		return ErrorUDTUnavailable
-	}
-
-	// TODO(tux21b): add the remaining types
-	return fmt.Errorf("can not unmarshal %s into %T", info, value)
-}
-
-func isNullableValue(value interface{}) bool {
-	v := reflect.ValueOf(value)
-	return v.Kind() == reflect.Ptr && v.Type().Elem().Kind() == reflect.Ptr
-}
-
-func isNullData(info TypeInfo, data []byte) bool {
-	return len(data) == 0
-}
-
-func unmarshalNullable(info TypeInfo, data []byte, value interface{}) error {
-	valueRef := reflect.ValueOf(value)
-
-	if isNullData(info, data) {
-		nilValue := reflect.Zero(valueRef.Type().Elem())
-		valueRef.Elem().Set(nilValue)
-		return nil
-	}
-
-	newValue := reflect.New(valueRef.Type().Elem().Elem())
-	valueRef.Elem().Set(newValue)
-	return Unmarshal(info, data, newValue.Interface())
-}
-
-func marshalVarchar(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case string:
-		return []byte(v), nil
-	case []byte:
-		return v, nil
-	}
-	rv := reflect.ValueOf(value)
-	t := rv.Type()
-	k := t.Kind()
-	switch {
-	case k == reflect.String:
-		return []byte(rv.String()), nil
-	case k == reflect.Slice && t.Elem().Kind() == reflect.Uint8:
-		return rv.Bytes(), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalVarchar(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *string:
-		*v = string(data)
-		return nil
-	case *[]byte:
-		var dataCopy []byte
-		if data != nil {
-			dataCopy = make([]byte, len(data))
-			copy(dataCopy, data)
-		}
-		*v = dataCopy
-		return nil
-	}
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	t := rv.Type()
-	k := t.Kind()
-	switch {
-	case k == reflect.String:
-		rv.SetString(string(data))
-		return nil
-	case k == reflect.Slice && t.Elem().Kind() == reflect.Uint8:
-		var dataCopy []byte
-		if data != nil {
-			dataCopy = make([]byte, len(data))
-			copy(dataCopy, data)
-		}
-		rv.SetBytes(dataCopy)
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func marshalInt(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case int:
-		if v > math.MaxInt32 || v < math.MinInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case uint:
-		if v > math.MaxInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case int64:
-		if v > math.MaxInt32 || v < math.MinInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case uint64:
-		if v > math.MaxInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case int32:
-		return encInt(v), nil
-	case uint32:
-		if v > math.MaxInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case int16:
-		return encInt(int32(v)), nil
-	case uint16:
-		return encInt(int32(v)), nil
-	case int8:
-		return encInt(int32(v)), nil
-	case uint8:
-		return encInt(int32(v)), nil
-	case string:
-		i, err := strconv.ParseInt(value.(string), 10, 32)
-		if err != nil {
-			return nil, marshalErrorf("can not marshal string to int: %s", err)
-		}
-		return encInt(int32(i)), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Int, reflect.Int64, reflect.Int32, reflect.Int16, reflect.Int8:
-		v := rv.Int()
-		if v > math.MaxInt32 || v < math.MinInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	case reflect.Uint, reflect.Uint64, reflect.Uint32, reflect.Uint16, reflect.Uint8:
-		v := rv.Uint()
-		if v > math.MaxInt32 {
-			return nil, marshalErrorf("marshal int: value %d out of range", v)
-		}
-		return encInt(int32(v)), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func encInt(x int32) []byte {
-	return []byte{byte(x >> 24), byte(x >> 16), byte(x >> 8), byte(x)}
-}
-
-func decInt(x []byte) int32 {
-	if len(x) != 4 {
-		return 0
-	}
-	return int32(x[0])<<24 | int32(x[1])<<16 | int32(x[2])<<8 | int32(x[3])
-}
-
-func marshalBigInt(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case int:
-		return encBigInt(int64(v)), nil
-	case uint:
-		if uint64(v) > math.MaxInt64 {
-			return nil, marshalErrorf("marshal bigint: value %d out of range", v)
-		}
-		return encBigInt(int64(v)), nil
-	case int64:
-		return encBigInt(v), nil
-	case uint64:
-		if v > math.MaxInt64 {
-			return nil, marshalErrorf("marshal bigint: value %d out of range", v)
-		}
-		return encBigInt(int64(v)), nil
-	case int32:
-		return encBigInt(int64(v)), nil
-	case uint32:
-		return encBigInt(int64(v)), nil
-	case int16:
-		return encBigInt(int64(v)), nil
-	case uint16:
-		return encBigInt(int64(v)), nil
-	case int8:
-		return encBigInt(int64(v)), nil
-	case uint8:
-		return encBigInt(int64(v)), nil
-	case big.Int:
-		return encBigInt2C(&v), nil
-	case string:
-		i, err := strconv.ParseInt(value.(string), 10, 64)
-		if err != nil {
-			return nil, marshalErrorf("can not marshal string to bigint: %s", err)
-		}
-		return encBigInt(i), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Int, reflect.Int64, reflect.Int32, reflect.Int16, reflect.Int8:
-		v := rv.Int()
-		return encBigInt(v), nil
-	case reflect.Uint, reflect.Uint64, reflect.Uint32, reflect.Uint16, reflect.Uint8:
-		v := rv.Uint()
-		if v > math.MaxInt64 {
-			return nil, marshalErrorf("marshal bigint: value %d out of range", v)
-		}
-		return encBigInt(int64(v)), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func encBigInt(x int64) []byte {
-	return []byte{byte(x >> 56), byte(x >> 48), byte(x >> 40), byte(x >> 32),
-		byte(x >> 24), byte(x >> 16), byte(x >> 8), byte(x)}
-}
-
-func bytesToInt64(data []byte) (ret int64) {
-	for i := range data {
-		ret |= int64(data[i]) << (8 * uint(len(data)-i-1))
-	}
-	return ret
-}
-
-func unmarshalBigInt(info TypeInfo, data []byte, value interface{}) error {
-	return unmarshalIntlike(info, decBigInt(data), data, value)
-}
-
-func unmarshalInt(info TypeInfo, data []byte, value interface{}) error {
-	return unmarshalIntlike(info, int64(decInt(data)), data, value)
-}
-
-func unmarshalVarint(info TypeInfo, data []byte, value interface{}) error {
-	switch value.(type) {
-	case *big.Int:
-		return unmarshalIntlike(info, 0, data, value)
-	}
-
-	if len(data) > 8 {
-		return unmarshalErrorf("unmarshal int: varint value %v out of range for %T (use big.Int)", data, value)
-	}
-
-	int64Val := bytesToInt64(data)
-	if len(data) < 8 && data[0]&0x80 > 0 {
-		int64Val -= (1 << uint(len(data)*8))
-	}
-	return unmarshalIntlike(info, int64Val, data, value)
-}
-
-func marshalVarint(info TypeInfo, value interface{}) ([]byte, error) {
-	var (
-		retBytes []byte
-		err      error
-	)
-
-	switch v := value.(type) {
-	case uint64:
-		if v > uint64(math.MaxInt64) {
-			retBytes = make([]byte, 9)
-			binary.BigEndian.PutUint64(retBytes[1:], v)
-		} else {
-			retBytes = make([]byte, 8)
-			binary.BigEndian.PutUint64(retBytes, v)
-		}
-	default:
-		retBytes, err = marshalBigInt(info, value)
-	}
-
-	if err == nil {
-		// trim down to most significant byte
-		i := 0
-		for ; i < len(retBytes)-1; i++ {
-			b0 := retBytes[i]
-			if b0 != 0 && b0 != 0xFF {
-				break
-			}
-
-			b1 := retBytes[i+1]
-			if b0 == 0 && b1 != 0 {
-				if b1&0x80 == 0 {
-					i++
-				}
-				break
-			}
-
-			if b0 == 0xFF && b1 != 0xFF {
-				if b1&0x80 > 0 {
-					i++
-				}
-				break
-			}
-		}
-		retBytes = retBytes[i:]
-	}
-
-	return retBytes, err
-}
-
-func unmarshalIntlike(info TypeInfo, int64Val int64, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case *int:
-		if ^uint(0) == math.MaxUint32 && (int64Val < math.MinInt32 || int64Val > math.MaxInt32) {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = int(int64Val)
-		return nil
-	case *uint:
-		if int64Val < 0 || (^uint(0) == math.MaxUint32 && int64Val > math.MaxUint32) {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = uint(int64Val)
-		return nil
-	case *int64:
-		*v = int64Val
-		return nil
-	case *uint64:
-		if int64Val < 0 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = uint64(int64Val)
-		return nil
-	case *int32:
-		if int64Val < math.MinInt32 || int64Val > math.MaxInt32 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = int32(int64Val)
-		return nil
-	case *uint32:
-		if int64Val < 0 || int64Val > math.MaxUint32 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = uint32(int64Val)
-		return nil
-	case *int16:
-		if int64Val < math.MinInt16 || int64Val > math.MaxInt16 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = int16(int64Val)
-		return nil
-	case *uint16:
-		if int64Val < 0 || int64Val > math.MaxUint16 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = uint16(int64Val)
-		return nil
-	case *int8:
-		if int64Val < math.MinInt8 || int64Val > math.MaxInt8 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = int8(int64Val)
-		return nil
-	case *uint8:
-		if int64Val < 0 || int64Val > math.MaxUint8 {
-			return unmarshalErrorf("unmarshal int: value %d out of range for %T", int64Val, *v)
-		}
-		*v = uint8(int64Val)
-		return nil
-	case *big.Int:
-		decBigInt2C(data, v)
-		return nil
-	case *string:
-		*v = strconv.FormatInt(int64Val, 10)
-		return nil
-	}
-
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-
-	switch rv.Type().Kind() {
-	case reflect.Int:
-		if ^uint(0) == math.MaxUint32 && (int64Val < math.MinInt32 || int64Val > math.MaxInt32) {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetInt(int64Val)
-		return nil
-	case reflect.Int64:
-		rv.SetInt(int64Val)
-		return nil
-	case reflect.Int32:
-		if int64Val < math.MinInt32 || int64Val > math.MaxInt32 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetInt(int64Val)
-		return nil
-	case reflect.Int16:
-		if int64Val < math.MinInt16 || int64Val > math.MaxInt16 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetInt(int64Val)
-		return nil
-	case reflect.Int8:
-		if int64Val < math.MinInt8 || int64Val > math.MaxInt8 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetInt(int64Val)
-		return nil
-	case reflect.Uint:
-		if int64Val < 0 || (^uint(0) == math.MaxUint32 && int64Val > math.MaxUint32) {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetUint(uint64(int64Val))
-		return nil
-	case reflect.Uint64:
-		if int64Val < 0 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetUint(uint64(int64Val))
-		return nil
-	case reflect.Uint32:
-		if int64Val < 0 || int64Val > math.MaxUint32 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetUint(uint64(int64Val))
-		return nil
-	case reflect.Uint16:
-		if int64Val < 0 || int64Val > math.MaxUint16 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetUint(uint64(int64Val))
-		return nil
-	case reflect.Uint8:
-		if int64Val < 0 || int64Val > math.MaxUint8 {
-			return unmarshalErrorf("unmarshal int: value %d out of range", int64Val)
-		}
-		rv.SetUint(uint64(int64Val))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func decBigInt(data []byte) int64 {
-	if len(data) != 8 {
-		return 0
-	}
-	return int64(data[0])<<56 | int64(data[1])<<48 |
-		int64(data[2])<<40 | int64(data[3])<<32 |
-		int64(data[4])<<24 | int64(data[5])<<16 |
-		int64(data[6])<<8 | int64(data[7])
-}
-
-func marshalBool(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case bool:
-		return encBool(v), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Bool:
-		return encBool(rv.Bool()), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func encBool(v bool) []byte {
-	if v {
-		return []byte{1}
-	}
-	return []byte{0}
-}
-
-func unmarshalBool(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *bool:
-		*v = decBool(data)
-		return nil
-	}
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	switch rv.Type().Kind() {
-	case reflect.Bool:
-		rv.SetBool(decBool(data))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func decBool(v []byte) bool {
-	if len(v) == 0 {
-		return false
-	}
-	return v[0] != 0
-}
-
-func marshalFloat(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case float32:
-		return encInt(int32(math.Float32bits(v))), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Float32:
-		return encInt(int32(math.Float32bits(float32(rv.Float())))), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalFloat(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *float32:
-		*v = math.Float32frombits(uint32(decInt(data)))
-		return nil
-	}
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	switch rv.Type().Kind() {
-	case reflect.Float32:
-		rv.SetFloat(float64(math.Float32frombits(uint32(decInt(data)))))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func marshalDouble(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case float64:
-		return encBigInt(int64(math.Float64bits(v))), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Float64:
-		return encBigInt(int64(math.Float64bits(rv.Float()))), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalDouble(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *float64:
-		*v = math.Float64frombits(uint64(decBigInt(data)))
-		return nil
-	}
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	switch rv.Type().Kind() {
-	case reflect.Float64:
-		rv.SetFloat(math.Float64frombits(uint64(decBigInt(data))))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func marshalDecimal(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case inf.Dec:
-		unscaled := encBigInt2C(v.UnscaledBig())
-		if unscaled == nil {
-			return nil, marshalErrorf("can not marshal %T into %s", value, info)
-		}
-
-		buf := make([]byte, 4+len(unscaled))
-		copy(buf[0:4], encInt(int32(v.Scale())))
-		copy(buf[4:], unscaled)
-		return buf, nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalDecimal(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *inf.Dec:
-		scale := decInt(data[0:4])
-		unscaled := decBigInt2C(data[4:], nil)
-		*v = *inf.NewDecBig(unscaled, inf.Scale(scale))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-// decBigInt2C sets the value of n to the big-endian two's complement
-// value stored in the given data. If data[0]&80 != 0, the number
-// is negative. If data is empty, the result will be 0.
-func decBigInt2C(data []byte, n *big.Int) *big.Int {
-	if n == nil {
-		n = new(big.Int)
-	}
-	n.SetBytes(data)
-	if len(data) > 0 && data[0]&0x80 > 0 {
-		n.Sub(n, new(big.Int).Lsh(bigOne, uint(len(data))*8))
-	}
-	return n
-}
-
-// encBigInt2C returns the big-endian two's complement
-// form of n.
-func encBigInt2C(n *big.Int) []byte {
-	switch n.Sign() {
-	case 0:
-		return []byte{0}
-	case 1:
-		b := n.Bytes()
-		if b[0]&0x80 > 0 {
-			b = append([]byte{0}, b...)
-		}
-		return b
-	case -1:
-		length := uint(n.BitLen()/8+1) * 8
-		b := new(big.Int).Add(n, new(big.Int).Lsh(bigOne, length)).Bytes()
-		// When the most significant bit is on a byte
-		// boundary, we can get some extra significant
-		// bits, so strip them off when that happens.
-		if len(b) >= 2 && b[0] == 0xff && b[1]&0x80 != 0 {
-			b = b[1:]
-		}
-		return b
-	}
-	return nil
-}
-
-func marshalTimestamp(info TypeInfo, value interface{}) ([]byte, error) {
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case int64:
-		return encBigInt(v), nil
-	case time.Time:
-		if v.IsZero() {
-			return []byte{}, nil
-		}
-		x := int64(v.UTC().Unix()*1e3) + int64(v.UTC().Nanosecond()/1e6)
-		return encBigInt(x), nil
-	}
-	rv := reflect.ValueOf(value)
-	switch rv.Type().Kind() {
-	case reflect.Int64:
-		return encBigInt(rv.Int()), nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalTimestamp(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *int64:
-		*v = decBigInt(data)
-		return nil
-	case *time.Time:
-		if len(data) == 0 {
-			return nil
-		}
-		x := decBigInt(data)
-		sec := x / 1000
-		nsec := (x - sec*1000) * 1000000
-		*v = time.Unix(sec, nsec).In(time.UTC)
-		return nil
-	}
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	switch rv.Type().Kind() {
-	case reflect.Int64:
-		rv.SetInt(decBigInt(data))
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func writeCollectionSize(info CollectionType, n int, buf *bytes.Buffer) error {
-	if info.proto > protoVersion2 {
-		if n > math.MaxInt32 {
-			return marshalErrorf("marshal: collection too large")
-		}
-
-		buf.WriteByte(byte(n >> 24))
-		buf.WriteByte(byte(n >> 16))
-		buf.WriteByte(byte(n >> 8))
-		buf.WriteByte(byte(n))
-	} else {
-		if n > math.MaxUint16 {
-			return marshalErrorf("marshal: collection too large")
-		}
-
-		buf.WriteByte(byte(n >> 8))
-		buf.WriteByte(byte(n))
-	}
-
-	return nil
-}
-
-func marshalList(info TypeInfo, value interface{}) ([]byte, error) {
-	listInfo, ok := info.(CollectionType)
-	if !ok {
-		return nil, marshalErrorf("marshal: can not marshal non collection type into list")
-	}
-
-	rv := reflect.ValueOf(value)
-	t := rv.Type()
-	k := t.Kind()
-	switch k {
-	case reflect.Slice, reflect.Array:
-		if k == reflect.Slice && rv.IsNil() {
-			return nil, nil
-		}
-		buf := &bytes.Buffer{}
-		n := rv.Len()
-
-		if err := writeCollectionSize(listInfo, n, buf); err != nil {
-			return nil, err
-		}
-
-		for i := 0; i < n; i++ {
-			item, err := Marshal(listInfo.Elem, rv.Index(i).Interface())
-			if err != nil {
-				return nil, err
-			}
-			if err := writeCollectionSize(listInfo, len(item), buf); err != nil {
-				return nil, err
-			}
-			buf.Write(item)
-		}
-		return buf.Bytes(), nil
-	case reflect.Map:
-		elem := t.Elem()
-		if elem.Kind() == reflect.Struct && elem.NumField() == 0 {
-			rkeys := rv.MapKeys()
-			keys := make([]interface{}, len(rkeys))
-			for i := 0; i < len(keys); i++ {
-				keys[i] = rkeys[i].Interface()
-			}
-			return marshalList(listInfo, keys)
-		}
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func readCollectionSize(info CollectionType, data []byte) (size, read int) {
-	if info.proto > protoVersion2 {
-		size = int(data[0])<<24 | int(data[1])<<16 | int(data[2])<<8 | int(data[3])
-		read = 4
-	} else {
-		size = int(data[0])<<8 | int(data[1])
-		read = 2
-	}
-	return
-}
-
-func unmarshalList(info TypeInfo, data []byte, value interface{}) error {
-	listInfo, ok := info.(CollectionType)
-	if !ok {
-		return unmarshalErrorf("unmarshal: can not unmarshal none collection type into list")
-	}
-
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	t := rv.Type()
-	k := t.Kind()
-
-	switch k {
-	case reflect.Slice, reflect.Array:
-		if data == nil {
-			if k == reflect.Array {
-				return unmarshalErrorf("unmarshal list: can not store nil in array value")
-			}
-			rv.Set(reflect.Zero(t))
-			return nil
-		}
-		if len(data) < 2 {
-			return unmarshalErrorf("unmarshal list: unexpected eof")
-		}
-		n, p := readCollectionSize(listInfo, data)
-		data = data[p:]
-		if k == reflect.Array {
-			if rv.Len() != n {
-				return unmarshalErrorf("unmarshal list: array with wrong size")
-			}
-		} else {
-			rv.Set(reflect.MakeSlice(t, n, n))
-		}
-		for i := 0; i < n; i++ {
-			if len(data) < 2 {
-				return unmarshalErrorf("unmarshal list: unexpected eof")
-			}
-			m, p := readCollectionSize(listInfo, data)
-			data = data[p:]
-			if err := Unmarshal(listInfo.Elem, data[:m], rv.Index(i).Addr().Interface()); err != nil {
-				return err
-			}
-			data = data[m:]
-		}
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-}
-
-func marshalMap(info TypeInfo, value interface{}) ([]byte, error) {
-	mapInfo, ok := info.(CollectionType)
-	if !ok {
-		return nil, marshalErrorf("marshal: can not marshal none collection type into map")
-	}
-
-	rv := reflect.ValueOf(value)
-	t := rv.Type()
-	if t.Kind() != reflect.Map {
-		return nil, marshalErrorf("can not marshal %T into %s", value, info)
-	}
-	if rv.IsNil() {
-		return nil, nil
-	}
-	buf := &bytes.Buffer{}
-	n := rv.Len()
-
-	if err := writeCollectionSize(mapInfo, n, buf); err != nil {
-		return nil, err
-	}
-
-	keys := rv.MapKeys()
-	for _, key := range keys {
-		item, err := Marshal(mapInfo.Key, key.Interface())
-		if err != nil {
-			return nil, err
-		}
-		if err := writeCollectionSize(mapInfo, len(item), buf); err != nil {
-			return nil, err
-		}
-		buf.Write(item)
-
-		item, err = Marshal(mapInfo.Elem, rv.MapIndex(key).Interface())
-		if err != nil {
-			return nil, err
-		}
-		if err := writeCollectionSize(mapInfo, len(item), buf); err != nil {
-			return nil, err
-		}
-		buf.Write(item)
-	}
-	return buf.Bytes(), nil
-}
-
-func unmarshalMap(info TypeInfo, data []byte, value interface{}) error {
-	mapInfo, ok := info.(CollectionType)
-	if !ok {
-		return unmarshalErrorf("unmarshal: can not unmarshal none collection type into map")
-	}
-
-	rv := reflect.ValueOf(value)
-	if rv.Kind() != reflect.Ptr {
-		return unmarshalErrorf("can not unmarshal into non-pointer %T", value)
-	}
-	rv = rv.Elem()
-	t := rv.Type()
-	if t.Kind() != reflect.Map {
-		return unmarshalErrorf("can not unmarshal %s into %T", info, value)
-	}
-	if data == nil {
-		rv.Set(reflect.Zero(t))
-		return nil
-	}
-	rv.Set(reflect.MakeMap(t))
-	if len(data) < 2 {
-		return unmarshalErrorf("unmarshal map: unexpected eof")
-	}
-	n, p := readCollectionSize(mapInfo, data)
-	data = data[p:]
-	for i := 0; i < n; i++ {
-		if len(data) < 2 {
-			return unmarshalErrorf("unmarshal list: unexpected eof")
-		}
-		m, p := readCollectionSize(mapInfo, data)
-		data = data[p:]
-		key := reflect.New(t.Key())
-		if err := Unmarshal(mapInfo.Key, data[:m], key.Interface()); err != nil {
-			return err
-		}
-		data = data[m:]
-
-		m, p = readCollectionSize(mapInfo, data)
-		data = data[p:]
-		val := reflect.New(t.Elem())
-		if err := Unmarshal(mapInfo.Elem, data[:m], val.Interface()); err != nil {
-			return err
-		}
-		data = data[m:]
-
-		rv.SetMapIndex(key.Elem(), val.Elem())
-	}
-	return nil
-}
-
-func marshalUUID(info TypeInfo, value interface{}) ([]byte, error) {
-	switch val := value.(type) {
-	case UUID:
-		return val.Bytes(), nil
-	case []byte:
-		if len(val) == 16 {
-			return val, nil
-		}
-	case string:
-		b, err := ParseUUID(val)
-		if err != nil {
-			return nil, err
-		}
-		return b[:], nil
-	}
-	return nil, marshalErrorf("can not marshal %T into %s", value, info)
-}
-
-func unmarshalUUID(info TypeInfo, data []byte, value interface{}) error {
-	if data == nil || len(data) == 0 {
-		switch v := value.(type) {
-		case *string:
-			*v = ""
-		case *[]byte:
-			*v = nil
-		case *UUID:
-			*v = UUID{}
-		default:
-			return unmarshalErrorf("can not unmarshal X %s into %T", info, value)
-		}
-
-		return nil
-	}
-
-	u, err := UUIDFromBytes(data)
-	if err != nil {
-		return unmarshalErrorf("Unable to parse UUID: %s", err)
-	}
-
-	switch v := value.(type) {
-	case *string:
-		*v = u.String()
-		return nil
-	case *[]byte:
-		*v = u[:]
-		return nil
-	case *UUID:
-		*v = u
-		return nil
-	}
-	return unmarshalErrorf("can not unmarshal X %s into %T", info, value)
-}
-
-func unmarshalTimeUUID(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *time.Time:
-		id, err := UUIDFromBytes(data)
-		if err != nil {
-			return err
-		} else if id.Version() != 1 {
-			return unmarshalErrorf("invalid timeuuid")
-		}
-		*v = id.Time()
-		return nil
-	default:
-		return unmarshalUUID(info, data, value)
-	}
-}
-
-func marshalInet(info TypeInfo, value interface{}) ([]byte, error) {
-	// we return either the 4 or 16 byte representation of an
-	// ip address here otherwise the db value will be prefixed
-	// with the remaining byte values e.g. ::ffff:127.0.0.1 and not 127.0.0.1
-	switch val := value.(type) {
-	case net.IP:
-		t := val.To4()
-		if t == nil {
-			return val.To16(), nil
-		}
-		return t, nil
-	case string:
-		b := net.ParseIP(val)
-		if b != nil {
-			t := b.To4()
-			if t == nil {
-				return b.To16(), nil
-			}
-			return t, nil
-		}
-		return nil, marshalErrorf("cannot marshal. invalid ip string %s", val)
-	}
-	return nil, marshalErrorf("cannot marshal %T into %s", value, info)
-}
-
-func unmarshalInet(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case *net.IP:
-		ip := net.IP(data)
-		if v4 := ip.To4(); v4 != nil {
-			*v = v4
-			return nil
-		}
-		*v = ip
-		return nil
-	case *string:
-		if len(data) == 0 {
-			*v = ""
-			return nil
-		}
-		ip := net.IP(data)
-		if v4 := ip.To4(); v4 != nil {
-			*v = v4.String()
-			return nil
-		}
-		*v = ip.String()
-		return nil
-	}
-	return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
-}
-
-// currently only support unmarshal into a list of values, this makes it possible
-// to support tuples without changing the query API. In the future this can be extend
-// to allow unmarshalling into custom tuple types.
-func unmarshalTuple(info TypeInfo, data []byte, value interface{}) error {
-	if v, ok := value.(Unmarshaler); ok {
-		return v.UnmarshalCQL(info, data)
-	}
-
-	tuple := info.(TupleTypeInfo)
-	switch v := value.(type) {
-	case []interface{}:
-		for i, elem := range tuple.Elems {
-			// each element inside data is a [bytes]
-			size := readInt(data)
-			data = data[4:]
-
-			err := Unmarshal(elem, data[:size], v[i])
-			if err != nil {
-				return err
-			}
-			data = data[size:]
-		}
-
-		return nil
-	}
-
-	return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
-}
-
-// UDTMarshaler is an interface which should be implemented by users wishing to
-// handle encoding UDT types to sent to Cassandra. Note: due to current implentations
-// methods defined for this interface must be value receivers not pointer receivers.
-type UDTMarshaler interface {
-	// MarshalUDT will be called for each field in the the UDT returned by Cassandra,
-	// the implementor should marshal the type to return by for example calling
-	// Marshal.
-	MarshalUDT(name string, info TypeInfo) ([]byte, error)
-}
-
-// UDTUnmarshaler should be implemented by users wanting to implement custom
-// UDT unmarshaling.
-type UDTUnmarshaler interface {
-	// UnmarshalUDT will be called for each field in the UDT return by Cassandra,
-	// the implementor should unmarshal the data into the value of their chosing,
-	// for example by calling Unmarshal.
-	UnmarshalUDT(name string, info TypeInfo, data []byte) error
-}
-
-func marshalUDT(info TypeInfo, value interface{}) ([]byte, error) {
-	udt := info.(UDTTypeInfo)
-
-	switch v := value.(type) {
-	case Marshaler:
-		return v.MarshalCQL(info)
-	case UDTMarshaler:
-		var buf []byte
-		for _, e := range udt.Elements {
-			data, err := v.MarshalUDT(e.Name, e.Type)
-			if err != nil {
-				return nil, err
-			}
-
-			n := len(data)
-			buf = append(buf, byte(n>>24),
-				byte(n>>16),
-				byte(n>>8),
-				byte(n))
-
-			buf = append(buf, data...)
-		}
-
-		return buf, nil
-	case map[string]interface{}:
-		var buf []byte
-		for _, e := range udt.Elements {
-			val, ok := v[e.Name]
-			if !ok {
-				return nil, marshalErrorf("missing UDT field in map: %s", e.Name)
-			}
-
-			data, err := Marshal(e.Type, val)
-			if err != nil {
-				return nil, err
-			}
-
-			n := len(data)
-			buf = append(buf, byte(n>>24),
-				byte(n>>16),
-				byte(n>>8),
-				byte(n))
-
-			buf = append(buf, data...)
-		}
-
-		return buf, nil
-	}
-
-	k := reflect.ValueOf(value)
-	if k.Kind() == reflect.Ptr {
-		if k.IsNil() {
-			return nil, marshalErrorf("cannot marshal %T into %s", value, info)
-		}
-		k = k.Elem()
-	}
-
-	if k.Kind() != reflect.Struct || !k.IsValid() {
-		return nil, marshalErrorf("cannot marshal %T into %s", value, info)
-	}
-
-	fields := make(map[string]reflect.Value)
-	t := reflect.TypeOf(value)
-	for i := 0; i < t.NumField(); i++ {
-		sf := t.Field(i)
-
-		if tag := sf.Tag.Get("cql"); tag != "" {
-			fields[tag] = k.Field(i)
-		}
-	}
-
-	var buf []byte
-	for _, e := range udt.Elements {
-		f, ok := fields[e.Name]
-		if !ok {
-			f = k.FieldByName(e.Name)
-		}
-
-		if !f.IsValid() {
-			return nil, marshalErrorf("cannot marshal %T into %s", value, info)
-		} else if f.Kind() == reflect.Ptr {
-			f = f.Elem()
-		}
-
-		data, err := Marshal(e.Type, f.Interface())
-		if err != nil {
-			return nil, err
-		}
-
-		n := len(data)
-		buf = append(buf, byte(n>>24),
-			byte(n>>16),
-			byte(n>>8),
-			byte(n))
-
-		buf = append(buf, data...)
-	}
-
-	return buf, nil
-
-}
-
-func unmarshalUDT(info TypeInfo, data []byte, value interface{}) error {
-	switch v := value.(type) {
-	case Unmarshaler:
-		return v.UnmarshalCQL(info, data)
-	case UDTUnmarshaler:
-		udt := info.(UDTTypeInfo)
-
-		for _, e := range udt.Elements {
-			size := readInt(data[:4])
-			data = data[4:]
-
-			var err error
-			if size < 0 {
-				err = v.UnmarshalUDT(e.Name, e.Type, nil)
-			} else {
-				err = v.UnmarshalUDT(e.Name, e.Type, data[:size])
-				data = data[size:]
-			}
-
-			if err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}
-
-	k := reflect.ValueOf(value).Elem()
-	if k.Kind() != reflect.Struct || !k.IsValid() {
-		return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
-	}
-
-	fields := make(map[string]reflect.Value)
-	t := k.Type()
-	for i := 0; i < t.NumField(); i++ {
-		sf := t.Field(i)
-
-		if tag := sf.Tag.Get("cql"); tag != "" {
-			fields[tag] = k.Field(i)
-		}
-	}
-
-	if len(data) == 0 {
-		if k.CanSet() {
-			k.Set(reflect.Zero(k.Type()))
-		}
-
-		return nil
-	}
-
-	udt := info.(UDTTypeInfo)
-	for _, e := range udt.Elements {
-		size := readInt(data[:4])
-		data = data[4:]
-
-		var err error
-		if size >= 0 {
-			f, ok := fields[e.Name]
-			if !ok {
-				f = k.FieldByName(e.Name)
-			}
-
-			if !f.IsValid() || !f.CanAddr() {
-				return unmarshalErrorf("cannot unmarshal %s into %T", info, value)
-			}
-
-			fk := f.Addr().Interface()
-			if err := Unmarshal(e.Type, data[:size], fk); err != nil {
-				return err
-			}
-			data = data[size:]
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// TypeInfo describes a Cassandra specific data type.
-type TypeInfo interface {
-	Type() Type
-	Version() byte
-	Custom() string
-
-	// New creates a pointer to an empty version of whatever type
-	// is referenced by the TypeInfo receiver
-	New() interface{}
-}
-
-type NativeType struct {
-	proto  byte
-	typ    Type
-	custom string // only used for TypeCustom
-}
-
-func (t NativeType) New() interface{} {
-	return reflect.New(goType(t)).Interface()
-}
-
-func (s NativeType) Type() Type {
-	return s.typ
-}
-
-func (s NativeType) Version() byte {
-	return s.proto
-}
-
-func (s NativeType) Custom() string {
-	return s.custom
-}
-
-func (s NativeType) String() string {
-	switch s.typ {
-	case TypeCustom:
-		return fmt.Sprintf("%s(%s)", s.typ, s.custom)
-	default:
-		return s.typ.String()
-	}
-}
-
-type CollectionType struct {
-	NativeType
-	Key  TypeInfo // only used for TypeMap
-	Elem TypeInfo // only used for TypeMap, TypeList and TypeSet
-}
-
-func (t CollectionType) New() interface{} {
-	return reflect.New(goType(t)).Interface()
-}
-
-func (c CollectionType) String() string {
-	switch c.typ {
-	case TypeMap:
-		return fmt.Sprintf("%s(%s, %s)", c.typ, c.Key, c.Elem)
-	case TypeList, TypeSet:
-		return fmt.Sprintf("%s(%s)", c.typ, c.Elem)
-	case TypeCustom:
-		return fmt.Sprintf("%s(%s)", c.typ, c.custom)
-	default:
-		return c.typ.String()
-	}
-}
-
-type TupleTypeInfo struct {
-	NativeType
-	Elems []TypeInfo
-}
-
-type UDTField struct {
-	Name string
-	Type TypeInfo
-}
-
-type UDTTypeInfo struct {
-	NativeType
-	KeySpace string
-	Name     string
-	Elements []UDTField
-}
-
-func (u UDTTypeInfo) String() string {
-	buf := &bytes.Buffer{}
-
-	fmt.Fprintf(buf, "%s.%s{", u.KeySpace, u.Name)
-	first := true
-	for _, e := range u.Elements {
-		if !first {
-			fmt.Fprint(buf, ",")
-		} else {
-			first = false
-		}
-
-		fmt.Fprintf(buf, "%s=%v", e.Name, e.Type)
-	}
-	fmt.Fprint(buf, "}")
-
-	return buf.String()
-}
-
-// String returns a human readable name for the Cassandra datatype
-// described by t.
-// Type is the identifier of a Cassandra internal datatype.
-type Type int
-
-const (
-	TypeCustom    Type = 0x0000
-	TypeAscii          = 0x0001
-	TypeBigInt         = 0x0002
-	TypeBlob           = 0x0003
-	TypeBoolean        = 0x0004
-	TypeCounter        = 0x0005
-	TypeDecimal        = 0x0006
-	TypeDouble         = 0x0007
-	TypeFloat          = 0x0008
-	TypeInt            = 0x0009
-	TypeTimestamp      = 0x000B
-	TypeUUID           = 0x000C
-	TypeVarchar        = 0x000D
-	TypeVarint         = 0x000E
-	TypeTimeUUID       = 0x000F
-	TypeInet           = 0x0010
-	TypeList           = 0x0020
-	TypeMap            = 0x0021
-	TypeSet            = 0x0022
-	TypeUDT            = 0x0030
-	TypeTuple          = 0x0031
-)
-
-// String returns the name of the identifier.
-func (t Type) String() string {
-	switch t {
-	case TypeCustom:
-		return "custom"
-	case TypeAscii:
-		return "ascii"
-	case TypeBigInt:
-		return "bigint"
-	case TypeBlob:
-		return "blob"
-	case TypeBoolean:
-		return "boolean"
-	case TypeCounter:
-		return "counter"
-	case TypeDecimal:
-		return "decimal"
-	case TypeDouble:
-		return "double"
-	case TypeFloat:
-		return "float"
-	case TypeInt:
-		return "int"
-	case TypeTimestamp:
-		return "timestamp"
-	case TypeUUID:
-		return "uuid"
-	case TypeVarchar:
-		return "varchar"
-	case TypeTimeUUID:
-		return "timeuuid"
-	case TypeInet:
-		return "inet"
-	case TypeList:
-		return "list"
-	case TypeMap:
-		return "map"
-	case TypeSet:
-		return "set"
-	case TypeVarint:
-		return "varint"
-	case TypeTuple:
-		return "tuple"
-	default:
-		return fmt.Sprintf("unknown_type_%d", t)
-	}
-}
-
-type MarshalError string
-
-func (m MarshalError) Error() string {
-	return string(m)
-}
-
-func marshalErrorf(format string, args ...interface{}) MarshalError {
-	return MarshalError(fmt.Sprintf(format, args...))
-}
-
-type UnmarshalError string
-
-func (m UnmarshalError) Error() string {
-	return string(m)
-}
-
-func unmarshalErrorf(format string, args ...interface{}) UnmarshalError {
-	return UnmarshalError(fmt.Sprintf(format, args...))
-}
diff --git a/vendor/github.com/gocql/gocql/marshal_test.go b/vendor/github.com/gocql/gocql/marshal_test.go
deleted file mode 100644
index e0493a99b..000000000
--- a/vendor/github.com/gocql/gocql/marshal_test.go
+++ /dev/null
@@ -1,862 +0,0 @@
-// +build all unit
-
-package gocql
-
-import (
-	"bytes"
-	"math"
-	"math/big"
-	"net"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"gopkg.in/inf.v0"
-)
-
-var marshalTests = []struct {
-	Info  TypeInfo
-	Data  []byte
-	Value interface{}
-}{
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("hello world"),
-		[]byte("hello world"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("hello world"),
-		"hello world",
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte(nil),
-		[]byte(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("hello world"),
-		MyString("hello world"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("HELLO WORLD"),
-		CustomString("hello world"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBlob},
-		[]byte("hello\x00"),
-		[]byte("hello\x00"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBlob},
-		[]byte(nil),
-		[]byte(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimeUUID},
-		[]byte{0x3d, 0xcd, 0x98, 0x0, 0xf3, 0xd9, 0x11, 0xbf, 0x86, 0xd4, 0xb8, 0xe8, 0x56, 0x2c, 0xc, 0xd0},
-		func() UUID {
-			x, _ := UUIDFromBytes([]byte{0x3d, 0xcd, 0x98, 0x0, 0xf3, 0xd9, 0x11, 0xbf, 0x86, 0xd4, 0xb8, 0xe8, 0x56, 0x2c, 0xc, 0xd0})
-			return x
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x00\x00\x00\x00"),
-		0,
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x01\x02\x03\x04"),
-		int(16909060),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x80\x00\x00\x00"),
-		int32(math.MinInt32),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x7f\xff\xff\xff"),
-		int32(math.MaxInt32),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x00\x00\x00\x00"),
-		"0",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x01\x02\x03\x04"),
-		"16909060",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x80\x00\x00\x00"),
-		"-2147483648", // math.MinInt32
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x7f\xff\xff\xff"),
-		"2147483647", // math.MaxInt32
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x00\x00\x00\x00\x00\x00\x00\x00"),
-		0,
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x01\x02\x03\x04\x05\x06\x07\x08"),
-		72623859790382856,
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x80\x00\x00\x00\x00\x00\x00\x00"),
-		int64(math.MinInt64),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x7f\xff\xff\xff\xff\xff\xff\xff"),
-		int64(math.MaxInt64),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x00\x00\x00\x00\x00\x00\x00\x00"),
-		"0",
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x01\x02\x03\x04\x05\x06\x07\x08"),
-		"72623859790382856",
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x80\x00\x00\x00\x00\x00\x00\x00"),
-		"-9223372036854775808", // math.MinInt64
-	},
-	{
-		NativeType{proto: 2, typ: TypeBigInt},
-		[]byte("\x7f\xff\xff\xff\xff\xff\xff\xff"),
-		"9223372036854775807", // math.MaxInt64
-	},
-	{
-		NativeType{proto: 2, typ: TypeBoolean},
-		[]byte("\x00"),
-		false,
-	},
-	{
-		NativeType{proto: 2, typ: TypeBoolean},
-		[]byte("\x01"),
-		true,
-	},
-	{
-		NativeType{proto: 2, typ: TypeFloat},
-		[]byte("\x40\x49\x0f\xdb"),
-		float32(3.14159265),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDouble},
-		[]byte("\x40\x09\x21\xfb\x53\xc8\xd4\xf1"),
-		float64(3.14159265),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x00\x00"),
-		inf.NewDec(0, 0),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x00\x64"),
-		inf.NewDec(100, 0),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x02\x19"),
-		decimalize("0.25"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x13\xD5\a;\x20\x14\xA2\x91"),
-		decimalize("-0.0012095473475870063"), // From the iconara/cql-rb test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x13*\xF8\xC4\xDF\xEB]o"),
-		decimalize("0.0012095473475870063"), // From the iconara/cql-rb test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x12\xF2\xD8\x02\xB6R\x7F\x99\xEE\x98#\x99\xA9V"),
-		decimalize("-1042342234234.123423435647768234"), // From the iconara/cql-rb test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\r\nJ\x04\"^\x91\x04\x8a\xb1\x18\xfe"),
-		decimalize("1243878957943.1234124191998"), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x06\xe5\xde]\x98Y"),
-		decimalize("-112233.441191"), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x14\x00\xfa\xce"),
-		decimalize("0.00000000000000064206"), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\x00\x00\x00\x14\xff\x052"),
-		decimalize("-0.00000000000000064206"), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeDecimal},
-		[]byte("\xff\xff\xff\x9c\x00\xfa\xce"),
-		inf.NewDec(64206, -100), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimestamp},
-		[]byte("\x00\x00\x01\x40\x77\x16\xe1\xb8"),
-		time.Date(2013, time.August, 13, 9, 52, 3, 0, time.UTC),
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimestamp},
-		[]byte("\x00\x00\x01\x40\x77\x16\xe1\xb8"),
-		int64(1376387523000),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeList},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x02\x00\x04\x00\x00\x00\x01\x00\x04\x00\x00\x00\x02"),
-		[]int{1, 2},
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeList},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x02\x00\x04\x00\x00\x00\x01\x00\x04\x00\x00\x00\x02"),
-		[2]int{1, 2},
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeSet},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x02\x00\x04\x00\x00\x00\x01\x00\x04\x00\x00\x00\x02"),
-		[]int{1, 2},
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeSet},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte(nil),
-		[]int(nil),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeMap},
-			Key:        NativeType{proto: 2, typ: TypeVarchar},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x01\x00\x03foo\x00\x04\x00\x00\x00\x01"),
-		map[string]int{"foo": 1},
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeMap},
-			Key:        NativeType{proto: 2, typ: TypeVarchar},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte(nil),
-		map[string]int(nil),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeList},
-			Elem:       NativeType{proto: 2, typ: TypeVarchar},
-		},
-		bytes.Join([][]byte{
-			[]byte("\x00\x01\xFF\xFF"),
-			bytes.Repeat([]byte("X"), 65535)}, []byte("")),
-		[]string{strings.Repeat("X", 65535)},
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeMap},
-			Key:        NativeType{proto: 2, typ: TypeVarchar},
-			Elem:       NativeType{proto: 2, typ: TypeVarchar},
-		},
-		bytes.Join([][]byte{
-			[]byte("\x00\x01\xFF\xFF"),
-			bytes.Repeat([]byte("X"), 65535),
-			[]byte("\xFF\xFF"),
-			bytes.Repeat([]byte("Y"), 65535)}, []byte("")),
-		map[string]string{
-			strings.Repeat("X", 65535): strings.Repeat("Y", 65535),
-		},
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("\x00"),
-		0,
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("\x37\xE2\x3C\xEC"),
-		int32(937573612),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("\x37\xE2\x3C\xEC"),
-		big.NewInt(937573612),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("\x03\x9EV \x15\f\x03\x9DK\x18\xCDI\\$?\a["),
-		bigintize("1231312312331283012830129382342342412123"), // From the iconara/cql-rb test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("\xC9v\x8D:\x86"),
-		big.NewInt(-234234234234), // From the iconara/cql-rb test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarint},
-		[]byte("f\x1e\xfd\xf2\xe3\xb1\x9f|\x04_\x15"),
-		bigintize("123456789123456789123456789"), // From the datastax/python-driver test suite
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\x7F\x00\x00\x01"),
-		net.ParseIP("127.0.0.1").To4(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\xFF\xFF\xFF\xFF"),
-		net.ParseIP("255.255.255.255").To4(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\x7F\x00\x00\x01"),
-		"127.0.0.1",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\xFF\xFF\xFF\xFF"),
-		"255.255.255.255",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\x21\xDA\x00\xd3\x00\x00\x2f\x3b\x02\xaa\x00\xff\xfe\x28\x9c\x5a"),
-		"21da:d3:0:2f3b:2aa:ff:fe28:9c5a",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"),
-		"fe80::202:b3ff:fe1e:8329",
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\x21\xDA\x00\xd3\x00\x00\x2f\x3b\x02\xaa\x00\xff\xfe\x28\x9c\x5a"),
-		net.ParseIP("21da:d3:0:2f3b:2aa:ff:fe28:9c5a"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\xfe\x80\x00\x00\x00\x00\x00\x00\x02\x02\xb3\xff\xfe\x1e\x83\x29"),
-		net.ParseIP("fe80::202:b3ff:fe1e:8329"),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte(nil),
-		nil,
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("nullable string"),
-		func() *string {
-			value := "nullable string"
-			return &value
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte{},
-		(*string)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte("\x7f\xff\xff\xff"),
-		func() *int {
-			var value int = math.MaxInt32
-			return &value
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInt},
-		[]byte(nil),
-		(*int)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimeUUID},
-		[]byte{0x3d, 0xcd, 0x98, 0x0, 0xf3, 0xd9, 0x11, 0xbf, 0x86, 0xd4, 0xb8, 0xe8, 0x56, 0x2c, 0xc, 0xd0},
-		&UUID{0x3d, 0xcd, 0x98, 0x0, 0xf3, 0xd9, 0x11, 0xbf, 0x86, 0xd4, 0xb8, 0xe8, 0x56, 0x2c, 0xc, 0xd0},
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimeUUID},
-		[]byte{},
-		(*UUID)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimestamp},
-		[]byte("\x00\x00\x01\x40\x77\x16\xe1\xb8"),
-		func() *time.Time {
-			t := time.Date(2013, time.August, 13, 9, 52, 3, 0, time.UTC)
-			return &t
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeTimestamp},
-		[]byte(nil),
-		(*time.Time)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBoolean},
-		[]byte("\x00"),
-		func() *bool {
-			b := false
-			return &b
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBoolean},
-		[]byte("\x01"),
-		func() *bool {
-			b := true
-			return &b
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeBoolean},
-		[]byte(nil),
-		(*bool)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeFloat},
-		[]byte("\x40\x49\x0f\xdb"),
-		func() *float32 {
-			f := float32(3.14159265)
-			return &f
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeFloat},
-		[]byte(nil),
-		(*float32)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDouble},
-		[]byte("\x40\x09\x21\xfb\x53\xc8\xd4\xf1"),
-		func() *float64 {
-			d := float64(3.14159265)
-			return &d
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeDouble},
-		[]byte(nil),
-		(*float64)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte("\x7F\x00\x00\x01"),
-		func() *net.IP {
-			ip := net.ParseIP("127.0.0.1").To4()
-			return &ip
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeInet},
-		[]byte(nil),
-		(*net.IP)(nil),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeList},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x02\x00\x04\x00\x00\x00\x01\x00\x04\x00\x00\x00\x02"),
-		func() *[]int {
-			l := []int{1, 2}
-			return &l
-		}(),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeList},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte(nil),
-		(*[]int)(nil),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeMap},
-			Key:        NativeType{proto: 2, typ: TypeVarchar},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte("\x00\x01\x00\x03foo\x00\x04\x00\x00\x00\x01"),
-		func() *map[string]int {
-			m := map[string]int{"foo": 1}
-			return &m
-		}(),
-	},
-	{
-		CollectionType{
-			NativeType: NativeType{proto: 2, typ: TypeMap},
-			Key:        NativeType{proto: 2, typ: TypeVarchar},
-			Elem:       NativeType{proto: 2, typ: TypeInt},
-		},
-		[]byte(nil),
-		(*map[string]int)(nil),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte("HELLO WORLD"),
-		func() *CustomString {
-			customString := CustomString("hello world")
-			return &customString
-		}(),
-	},
-	{
-		NativeType{proto: 2, typ: TypeVarchar},
-		[]byte(nil),
-		(*CustomString)(nil),
-	},
-}
-
-func decimalize(s string) *inf.Dec {
-	i, _ := new(inf.Dec).SetString(s)
-	return i
-}
-
-func bigintize(s string) *big.Int {
-	i, _ := new(big.Int).SetString(s, 10)
-	return i
-}
-
-func TestMarshal(t *testing.T) {
-	for i, test := range marshalTests {
-		data, err := Marshal(test.Info, test.Value)
-		if err != nil {
-			t.Errorf("marshalTest[%d]: %v", i, err)
-			continue
-		}
-		if !bytes.Equal(data, test.Data) {
-			t.Errorf("marshalTest[%d]: expected %q, got %q (%#v)", i, test.Data, data, test.Value)
-		}
-	}
-}
-
-func TestUnmarshal(t *testing.T) {
-	for i, test := range marshalTests {
-		if test.Value != nil {
-			v := reflect.New(reflect.TypeOf(test.Value))
-			err := Unmarshal(test.Info, test.Data, v.Interface())
-			if err != nil {
-				t.Errorf("unmarshalTest[%d]: %v", i, err)
-				continue
-			}
-			if !reflect.DeepEqual(v.Elem().Interface(), test.Value) {
-				t.Errorf("unmarshalTest[%d]: expected %#v, got %#v.", i, test.Value, v.Elem().Interface())
-			}
-		} else {
-			if err := Unmarshal(test.Info, test.Data, test.Value); nil == err {
-				t.Errorf("unmarshalTest[%d]: %#v not return error.", i, test.Value)
-			}
-		}
-	}
-}
-
-func TestMarshalVarint(t *testing.T) {
-	varintTests := []struct {
-		Value       interface{}
-		Marshaled   []byte
-		Unmarshaled *big.Int
-	}{
-		{
-			Value:       int8(0),
-			Marshaled:   []byte("\x00"),
-			Unmarshaled: big.NewInt(0),
-		},
-		{
-			Value:       uint8(255),
-			Marshaled:   []byte("\x00\xFF"),
-			Unmarshaled: big.NewInt(255),
-		},
-		{
-			Value:       int8(-1),
-			Marshaled:   []byte("\xFF"),
-			Unmarshaled: big.NewInt(-1),
-		},
-		{
-			Value:       big.NewInt(math.MaxInt32),
-			Marshaled:   []byte("\x7F\xFF\xFF\xFF"),
-			Unmarshaled: big.NewInt(math.MaxInt32),
-		},
-		{
-			Value:       big.NewInt(int64(math.MaxInt32) + 1),
-			Marshaled:   []byte("\x00\x80\x00\x00\x00"),
-			Unmarshaled: big.NewInt(int64(math.MaxInt32) + 1),
-		},
-		{
-			Value:       big.NewInt(math.MinInt32),
-			Marshaled:   []byte("\x80\x00\x00\x00"),
-			Unmarshaled: big.NewInt(math.MinInt32),
-		},
-		{
-			Value:       big.NewInt(int64(math.MinInt32) - 1),
-			Marshaled:   []byte("\xFF\x7F\xFF\xFF\xFF"),
-			Unmarshaled: big.NewInt(int64(math.MinInt32) - 1),
-		},
-		{
-			Value:       math.MinInt64,
-			Marshaled:   []byte("\x80\x00\x00\x00\x00\x00\x00\x00"),
-			Unmarshaled: big.NewInt(math.MinInt64),
-		},
-		{
-			Value:       uint64(math.MaxInt64) + 1,
-			Marshaled:   []byte("\x00\x80\x00\x00\x00\x00\x00\x00\x00"),
-			Unmarshaled: bigintize("9223372036854775808"),
-		},
-		{
-			Value:       bigintize("2361183241434822606848"), // 2**71
-			Marshaled:   []byte("\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00"),
-			Unmarshaled: bigintize("2361183241434822606848"),
-		},
-		{
-			Value:       bigintize("-9223372036854775809"), // -2**63 - 1
-			Marshaled:   []byte("\xFF\x7F\xFF\xFF\xFF\xFF\xFF\xFF\xFF"),
-			Unmarshaled: bigintize("-9223372036854775809"),
-		},
-	}
-
-	for i, test := range varintTests {
-		data, err := Marshal(NativeType{proto: 2, typ: TypeVarint}, test.Value)
-		if err != nil {
-			t.Errorf("error marshaling varint: %v (test #%d)", err, i)
-		}
-
-		if !bytes.Equal(test.Marshaled, data) {
-			t.Errorf("marshaled varint mismatch: expected %v, got %v (test #%d)", test.Marshaled, data, i)
-		}
-
-		binder := new(big.Int)
-		err = Unmarshal(NativeType{proto: 2, typ: TypeVarint}, test.Marshaled, binder)
-		if err != nil {
-			t.Errorf("error unmarshaling varint: %v (test #%d)", err, i)
-		}
-
-		if test.Unmarshaled.Cmp(binder) != 0 {
-			t.Errorf("unmarshaled varint mismatch: expected %v, got %v (test #%d)", test.Unmarshaled, binder, i)
-		}
-	}
-}
-
-func equalStringSlice(leftList, rightList []string) bool {
-	if len(leftList) != len(rightList) {
-		return false
-	}
-	for index := range leftList {
-		if rightList[index] != leftList[index] {
-			return false
-		}
-	}
-	return true
-}
-
-func TestMarshalList(t *testing.T) {
-	typeInfo := CollectionType{
-		NativeType: NativeType{proto: 2, typ: TypeList},
-		Elem:       NativeType{proto: 2, typ: TypeVarchar},
-	}
-
-	sourceLists := [][]string{
-		[]string{"valueA"},
-		[]string{"valueA", "valueB"},
-		[]string{"valueB"},
-	}
-
-	listDatas := [][]byte{}
-
-	for _, list := range sourceLists {
-		listData, marshalErr := Marshal(typeInfo, list)
-		if nil != marshalErr {
-			t.Errorf("Error marshal %+v of type %+v: %s", list, typeInfo, marshalErr)
-		}
-		listDatas = append(listDatas, listData)
-	}
-
-	outputLists := [][]string{}
-
-	var outputList []string
-
-	for _, listData := range listDatas {
-		if unmarshalErr := Unmarshal(typeInfo, listData, &outputList); nil != unmarshalErr {
-			t.Error(unmarshalErr)
-		}
-		outputLists = append(outputLists, outputList)
-	}
-
-	for index, sourceList := range sourceLists {
-		outputList := outputLists[index]
-		if !equalStringSlice(sourceList, outputList) {
-			t.Errorf("Lists %+v not equal to lists %+v, but should", sourceList, outputList)
-		}
-	}
-}
-
-type CustomString string
-
-func (c CustomString) MarshalCQL(info TypeInfo) ([]byte, error) {
-	return []byte(strings.ToUpper(string(c))), nil
-}
-func (c *CustomString) UnmarshalCQL(info TypeInfo, data []byte) error {
-	*c = CustomString(strings.ToLower(string(data)))
-	return nil
-}
-
-type MyString string
-
-type MyInt int
-
-var typeLookupTest = []struct {
-	TypeName     string
-	ExpectedType Type
-}{
-	{"AsciiType", TypeAscii},
-	{"LongType", TypeBigInt},
-	{"BytesType", TypeBlob},
-	{"BooleanType", TypeBoolean},
-	{"CounterColumnType", TypeCounter},
-	{"DecimalType", TypeDecimal},
-	{"DoubleType", TypeDouble},
-	{"FloatType", TypeFloat},
-	{"Int32Type", TypeInt},
-	{"DateType", TypeTimestamp},
-	{"TimestampType", TypeTimestamp},
-	{"UUIDType", TypeUUID},
-	{"UTF8Type", TypeVarchar},
-	{"IntegerType", TypeVarint},
-	{"TimeUUIDType", TypeTimeUUID},
-	{"InetAddressType", TypeInet},
-	{"MapType", TypeMap},
-	{"ListType", TypeList},
-	{"SetType", TypeSet},
-	{"unknown", TypeCustom},
-}
-
-func testType(t *testing.T, cassType string, expectedType Type) {
-	if computedType := getApacheCassandraType(apacheCassandraTypePrefix + cassType); computedType != expectedType {
-		t.Errorf("Cassandra custom type lookup for %s failed. Expected %s, got %s.", cassType, expectedType.String(), computedType.String())
-	}
-}
-
-func TestLookupCassType(t *testing.T) {
-	for _, lookupTest := range typeLookupTest {
-		testType(t, lookupTest.TypeName, lookupTest.ExpectedType)
-	}
-}
-
-type MyPointerMarshaler struct{}
-
-func (m *MyPointerMarshaler) MarshalCQL(_ TypeInfo) ([]byte, error) {
-	return []byte{42}, nil
-}
-
-func TestMarshalPointer(t *testing.T) {
-	m := &MyPointerMarshaler{}
-	typ := NativeType{proto: 2, typ: TypeInt}
-
-	data, err := Marshal(typ, m)
-
-	if err != nil {
-		t.Errorf("Pointer marshaling failed. Error: %s", err)
-	}
-	if len(data) != 1 || data[0] != 42 {
-		t.Errorf("Pointer marshaling failed. Expected %+v, got %+v", []byte{42}, data)
-	}
-}
-
-func TestMarshalTimestamp(t *testing.T) {
-	var marshalTimestampTests = []struct {
-		Info  TypeInfo
-		Data  []byte
-		Value interface{}
-	}{
-		{
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\x00\x00\x01\x40\x77\x16\xe1\xb8"),
-			time.Date(2013, time.August, 13, 9, 52, 3, 0, time.UTC),
-		},
-		{
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\x00\x00\x01\x40\x77\x16\xe1\xb8"),
-			int64(1376387523000),
-		},
-		{
-			// 9223372036854 is the maximum time representable in ms since the epoch
-			// with int64 if using UnixNano to convert
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\x00\x00\x08\x63\x7b\xd0\x5a\xf6"),
-			time.Date(2262, time.April, 11, 23, 47, 16, 854775807, time.UTC),
-		},
-		{
-			// One nanosecond after causes overflow when using UnixNano
-			// Instead it should resolve to the same time in ms
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\x00\x00\x08\x63\x7b\xd0\x5a\xf6"),
-			time.Date(2262, time.April, 11, 23, 47, 16, 854775808, time.UTC),
-		},
-		{
-			// -9223372036855 is the minimum time representable in ms since the epoch
-			// with int64 if using UnixNano to convert
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\xff\xff\xf7\x9c\x84\x2f\xa5\x09"),
-			time.Date(1677, time.September, 21, 00, 12, 43, 145224192, time.UTC),
-		},
-		{
-			// One nanosecond earlier causes overflow when using UnixNano
-			// it should resolve to the same time in ms
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte("\xff\xff\xf7\x9c\x84\x2f\xa5\x09"),
-			time.Date(1677, time.September, 21, 00, 12, 43, 145224191, time.UTC),
-		},
-		{
-			// Store the zero time as a blank slice
-			NativeType{proto: 2, typ: TypeTimestamp},
-			[]byte{},
-			time.Time{},
-		},
-	}
-
-	for i, test := range marshalTimestampTests {
-		t.Log(i, test)
-		data, err := Marshal(test.Info, test.Value)
-		if err != nil {
-			t.Errorf("marshalTest[%d]: %v", i, err)
-			continue
-		}
-		if !bytes.Equal(data, test.Data) {
-			t.Errorf("marshalTest[%d]: expected %x (%v), got %x (%v) for time %s", i,
-				test.Data, decBigInt(test.Data), data, decBigInt(data), test.Value)
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/metadata.go b/vendor/github.com/gocql/gocql/metadata.go
deleted file mode 100644
index 131684b7d..000000000
--- a/vendor/github.com/gocql/gocql/metadata.go
+++ /dev/null
@@ -1,875 +0,0 @@
-// Copyright (c) 2015 The gocql 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 gocql
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"log"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-// schema metadata for a keyspace
-type KeyspaceMetadata struct {
-	Name            string
-	DurableWrites   bool
-	StrategyClass   string
-	StrategyOptions map[string]interface{}
-	Tables          map[string]*TableMetadata
-}
-
-// schema metadata for a table (a.k.a. column family)
-type TableMetadata struct {
-	Keyspace          string
-	Name              string
-	KeyValidator      string
-	Comparator        string
-	DefaultValidator  string
-	KeyAliases        []string
-	ColumnAliases     []string
-	ValueAlias        string
-	PartitionKey      []*ColumnMetadata
-	ClusteringColumns []*ColumnMetadata
-	Columns           map[string]*ColumnMetadata
-	OrderedColumns    []string
-}
-
-// schema metadata for a column
-type ColumnMetadata struct {
-	Keyspace       string
-	Table          string
-	Name           string
-	ComponentIndex int
-	Kind           string
-	Validator      string
-	Type           TypeInfo
-	Order          ColumnOrder
-	Index          ColumnIndexMetadata
-}
-
-// the ordering of the column with regard to its comparator
-type ColumnOrder bool
-
-const (
-	ASC  ColumnOrder = false
-	DESC             = true
-)
-
-type ColumnIndexMetadata struct {
-	Name    string
-	Type    string
-	Options map[string]interface{}
-}
-
-// Column kind values
-const (
-	PARTITION_KEY  = "partition_key"
-	CLUSTERING_KEY = "clustering_key"
-	REGULAR        = "regular"
-	COMPACT_VALUE  = "compact_value"
-)
-
-// default alias values
-const (
-	DEFAULT_KEY_ALIAS    = "key"
-	DEFAULT_COLUMN_ALIAS = "column"
-	DEFAULT_VALUE_ALIAS  = "value"
-)
-
-// queries the cluster for schema information for a specific keyspace
-type schemaDescriber struct {
-	session *Session
-	mu      sync.Mutex
-
-	cache map[string]*KeyspaceMetadata
-}
-
-// creates a session bound schema describer which will query and cache
-// keyspace metadata
-func newSchemaDescriber(session *Session) *schemaDescriber {
-	return &schemaDescriber{
-		session: session,
-		cache:   map[string]*KeyspaceMetadata{},
-	}
-}
-
-// returns the cached KeyspaceMetadata held by the describer for the named
-// keyspace.
-func (s *schemaDescriber) getSchema(keyspaceName string) (*KeyspaceMetadata, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	// TODO handle schema change events
-
-	metadata, found := s.cache[keyspaceName]
-	if !found {
-		// refresh the cache for this keyspace
-		err := s.refreshSchema(keyspaceName)
-		if err != nil {
-			return nil, err
-		}
-
-		metadata = s.cache[keyspaceName]
-	}
-
-	return metadata, nil
-}
-
-// forcibly updates the current KeyspaceMetadata held by the schema describer
-// for a given named keyspace.
-func (s *schemaDescriber) refreshSchema(keyspaceName string) error {
-	var err error
-
-	// query the system keyspace for schema data
-	// TODO retrieve concurrently
-	keyspace, err := getKeyspaceMetadata(s.session, keyspaceName)
-	if err != nil {
-		return err
-	}
-	tables, err := getTableMetadata(s.session, keyspaceName)
-	if err != nil {
-		return err
-	}
-	columns, err := getColumnMetadata(s.session, keyspaceName)
-	if err != nil {
-		return err
-	}
-
-	// organize the schema data
-	compileMetadata(s.session.cfg.ProtoVersion, keyspace, tables, columns)
-
-	// update the cache
-	s.cache[keyspaceName] = keyspace
-
-	return nil
-}
-
-// "compiles" derived information about keyspace, table, and column metadata
-// for a keyspace from the basic queried metadata objects returned by
-// getKeyspaceMetadata, getTableMetadata, and getColumnMetadata respectively;
-// Links the metadata objects together and derives the column composition of
-// the partition key and clustering key for a table.
-func compileMetadata(
-	protoVersion int,
-	keyspace *KeyspaceMetadata,
-	tables []TableMetadata,
-	columns []ColumnMetadata,
-) {
-	keyspace.Tables = make(map[string]*TableMetadata)
-	for i := range tables {
-		tables[i].Columns = make(map[string]*ColumnMetadata)
-
-		keyspace.Tables[tables[i].Name] = &tables[i]
-	}
-
-	// add columns from the schema data
-	for i := range columns {
-		// decode the validator for TypeInfo and order
-		validatorParsed := parseType(columns[i].Validator)
-		columns[i].Type = validatorParsed.types[0]
-		columns[i].Order = ASC
-		if validatorParsed.reversed[0] {
-			columns[i].Order = DESC
-		}
-
-		table := keyspace.Tables[columns[i].Table]
-		table.Columns[columns[i].Name] = &columns[i]
-		table.OrderedColumns = append(table.OrderedColumns, columns[i].Name)
-	}
-
-	if protoVersion == 1 {
-		compileV1Metadata(tables)
-	} else {
-		compileV2Metadata(tables)
-	}
-}
-
-// Compiles derived information from TableMetadata which have had
-// ColumnMetadata added already. V1 protocol does not return as much
-// column metadata as V2+ (because V1 doesn't support the "type" column in the
-// system.schema_columns table) so determining PartitionKey and ClusterColumns
-// is more complex.
-func compileV1Metadata(tables []TableMetadata) {
-	for i := range tables {
-		table := &tables[i]
-
-		// decode the key validator
-		keyValidatorParsed := parseType(table.KeyValidator)
-		// decode the comparator
-		comparatorParsed := parseType(table.Comparator)
-
-		// the partition key length is the same as the number of types in the
-		// key validator
-		table.PartitionKey = make([]*ColumnMetadata, len(keyValidatorParsed.types))
-
-		// V1 protocol only returns "regular" columns from
-		// system.schema_columns (there is no type field for columns)
-		// so the alias information is used to
-		// create the partition key and clustering columns
-
-		// construct the partition key from the alias
-		for i := range table.PartitionKey {
-			var alias string
-			if len(table.KeyAliases) > i {
-				alias = table.KeyAliases[i]
-			} else if i == 0 {
-				alias = DEFAULT_KEY_ALIAS
-			} else {
-				alias = DEFAULT_KEY_ALIAS + strconv.Itoa(i+1)
-			}
-
-			column := &ColumnMetadata{
-				Keyspace:       table.Keyspace,
-				Table:          table.Name,
-				Name:           alias,
-				Type:           keyValidatorParsed.types[i],
-				Kind:           PARTITION_KEY,
-				ComponentIndex: i,
-			}
-
-			table.PartitionKey[i] = column
-			table.Columns[alias] = column
-		}
-
-		// determine the number of clustering columns
-		size := len(comparatorParsed.types)
-		if comparatorParsed.isComposite {
-			if len(comparatorParsed.collections) != 0 ||
-				(len(table.ColumnAliases) == size-1 &&
-					comparatorParsed.types[size-1].Type() == TypeVarchar) {
-				size = size - 1
-			}
-		} else {
-			if !(len(table.ColumnAliases) != 0 || len(table.Columns) == 0) {
-				size = 0
-			}
-		}
-
-		table.ClusteringColumns = make([]*ColumnMetadata, size)
-
-		for i := range table.ClusteringColumns {
-			var alias string
-			if len(table.ColumnAliases) > i {
-				alias = table.ColumnAliases[i]
-			} else if i == 0 {
-				alias = DEFAULT_COLUMN_ALIAS
-			} else {
-				alias = DEFAULT_COLUMN_ALIAS + strconv.Itoa(i+1)
-			}
-
-			order := ASC
-			if comparatorParsed.reversed[i] {
-				order = DESC
-			}
-
-			column := &ColumnMetadata{
-				Keyspace:       table.Keyspace,
-				Table:          table.Name,
-				Name:           alias,
-				Type:           comparatorParsed.types[i],
-				Order:          order,
-				Kind:           CLUSTERING_KEY,
-				ComponentIndex: i,
-			}
-
-			table.ClusteringColumns[i] = column
-			table.Columns[alias] = column
-		}
-
-		if size != len(comparatorParsed.types)-1 {
-			alias := DEFAULT_VALUE_ALIAS
-			if len(table.ValueAlias) > 0 {
-				alias = table.ValueAlias
-			}
-			// decode the default validator
-			defaultValidatorParsed := parseType(table.DefaultValidator)
-			column := &ColumnMetadata{
-				Keyspace: table.Keyspace,
-				Table:    table.Name,
-				Name:     alias,
-				Type:     defaultValidatorParsed.types[0],
-				Kind:     REGULAR,
-			}
-			table.Columns[alias] = column
-		}
-	}
-}
-
-// The simpler compile case for V2+ protocol
-func compileV2Metadata(tables []TableMetadata) {
-	for i := range tables {
-		table := &tables[i]
-
-		keyValidatorParsed := parseType(table.KeyValidator)
-		table.PartitionKey = make([]*ColumnMetadata, len(keyValidatorParsed.types))
-
-		clusteringColumnCount := componentColumnCountOfType(table.Columns, CLUSTERING_KEY)
-		table.ClusteringColumns = make([]*ColumnMetadata, clusteringColumnCount)
-
-		for _, columnName := range table.OrderedColumns {
-			column := table.Columns[columnName]
-			if column.Kind == PARTITION_KEY {
-				table.PartitionKey[column.ComponentIndex] = column
-			} else if column.Kind == CLUSTERING_KEY {
-				table.ClusteringColumns[column.ComponentIndex] = column
-			}
-		}
-
-	}
-}
-
-// returns the count of coluns with the given "kind" value.
-func componentColumnCountOfType(columns map[string]*ColumnMetadata, kind string) int {
-	maxComponentIndex := -1
-	for _, column := range columns {
-		if column.Kind == kind && column.ComponentIndex > maxComponentIndex {
-			maxComponentIndex = column.ComponentIndex
-		}
-	}
-	return maxComponentIndex + 1
-}
-
-// query only for the keyspace metadata for the specified keyspace from system.schema_keyspace
-func getKeyspaceMetadata(
-	session *Session,
-	keyspaceName string,
-) (*KeyspaceMetadata, error) {
-	query := session.Query(
-		`
-		SELECT durable_writes, strategy_class, strategy_options
-		FROM system.schema_keyspaces
-		WHERE keyspace_name = ?
-		`,
-		keyspaceName,
-	)
-	// Set a routing key to avoid GetRoutingKey from computing the routing key
-	// TODO use a separate connection (pool) for system keyspace queries.
-	query.RoutingKey([]byte{})
-
-	keyspace := &KeyspaceMetadata{Name: keyspaceName}
-	var strategyOptionsJSON []byte
-
-	err := query.Scan(
-		&keyspace.DurableWrites,
-		&keyspace.StrategyClass,
-		&strategyOptionsJSON,
-	)
-	if err != nil {
-		return nil, fmt.Errorf("Error querying keyspace schema: %v", err)
-	}
-
-	err = json.Unmarshal(strategyOptionsJSON, &keyspace.StrategyOptions)
-	if err != nil {
-		return nil, fmt.Errorf(
-			"Invalid JSON value '%s' as strategy_options for in keyspace '%s': %v",
-			strategyOptionsJSON, keyspace.Name, err,
-		)
-	}
-
-	return keyspace, nil
-}
-
-// query for only the table metadata in the specified keyspace from system.schema_columnfamilies
-func getTableMetadata(
-	session *Session,
-	keyspaceName string,
-) ([]TableMetadata, error) {
-	query := session.Query(
-		`
-		SELECT
-			columnfamily_name,
-			key_validator,
-			comparator,
-			default_validator,
-			key_aliases,
-			column_aliases,
-			value_alias
-		FROM system.schema_columnfamilies
-		WHERE keyspace_name = ?
-		`,
-		keyspaceName,
-	)
-	// Set a routing key to avoid GetRoutingKey from computing the routing key
-	// TODO use a separate connection (pool) for system keyspace queries.
-	query.RoutingKey([]byte{})
-	iter := query.Iter()
-
-	tables := []TableMetadata{}
-	table := TableMetadata{Keyspace: keyspaceName}
-
-	var keyAliasesJSON []byte
-	var columnAliasesJSON []byte
-	for iter.Scan(
-		&table.Name,
-		&table.KeyValidator,
-		&table.Comparator,
-		&table.DefaultValidator,
-		&keyAliasesJSON,
-		&columnAliasesJSON,
-		&table.ValueAlias,
-	) {
-		var err error
-
-		// decode the key aliases
-		if keyAliasesJSON != nil {
-			table.KeyAliases = []string{}
-			err = json.Unmarshal(keyAliasesJSON, &table.KeyAliases)
-			if err != nil {
-				iter.Close()
-				return nil, fmt.Errorf(
-					"Invalid JSON value '%s' as key_aliases for in table '%s': %v",
-					keyAliasesJSON, table.Name, err,
-				)
-			}
-		}
-
-		// decode the column aliases
-		if columnAliasesJSON != nil {
-			table.ColumnAliases = []string{}
-			err = json.Unmarshal(columnAliasesJSON, &table.ColumnAliases)
-			if err != nil {
-				iter.Close()
-				return nil, fmt.Errorf(
-					"Invalid JSON value '%s' as column_aliases for in table '%s': %v",
-					columnAliasesJSON, table.Name, err,
-				)
-			}
-		}
-
-		tables = append(tables, table)
-		table = TableMetadata{Keyspace: keyspaceName}
-	}
-
-	err := iter.Close()
-	if err != nil && err != ErrNotFound {
-		return nil, fmt.Errorf("Error querying table schema: %v", err)
-	}
-
-	return tables, nil
-}
-
-// query for only the column metadata in the specified keyspace from system.schema_columns
-func getColumnMetadata(
-	session *Session,
-	keyspaceName string,
-) ([]ColumnMetadata, error) {
-	// Deal with differences in protocol versions
-	var stmt string
-	var scan func(*Iter, *ColumnMetadata, *[]byte) bool
-	if session.cfg.ProtoVersion == 1 {
-		// V1 does not support the type column, and all returned rows are
-		// of kind "regular".
-		stmt = `
-			SELECT
-				columnfamily_name,
-				column_name,
-				component_index,
-				validator,
-				index_name,
-				index_type,
-				index_options
-			FROM system.schema_columns
-			WHERE keyspace_name = ?
-			`
-		scan = func(
-			iter *Iter,
-			column *ColumnMetadata,
-			indexOptionsJSON *[]byte,
-		) bool {
-			// all columns returned by V1 are regular
-			column.Kind = REGULAR
-			return iter.Scan(
-				&column.Table,
-				&column.Name,
-				&column.ComponentIndex,
-				&column.Validator,
-				&column.Index.Name,
-				&column.Index.Type,
-				&indexOptionsJSON,
-			)
-		}
-	} else {
-		// V2+ supports the type column
-		stmt = `
-			SELECT
-				columnfamily_name,
-				column_name,
-				component_index,
-				validator,
-				index_name,
-				index_type,
-				index_options,
-				type
-			FROM system.schema_columns
-			WHERE keyspace_name = ?
-			`
-		scan = func(
-			iter *Iter,
-			column *ColumnMetadata,
-			indexOptionsJSON *[]byte,
-		) bool {
-			return iter.Scan(
-				&column.Table,
-				&column.Name,
-				&column.ComponentIndex,
-				&column.Validator,
-				&column.Index.Name,
-				&column.Index.Type,
-				&indexOptionsJSON,
-				&column.Kind,
-			)
-		}
-	}
-
-	// get the columns metadata
-	columns := []ColumnMetadata{}
-	column := ColumnMetadata{Keyspace: keyspaceName}
-
-	var indexOptionsJSON []byte
-
-	query := session.Query(stmt, keyspaceName)
-	// Set a routing key to avoid GetRoutingKey from computing the routing key
-	// TODO use a separate connection (pool) for system keyspace queries.
-	query.RoutingKey([]byte{})
-	iter := query.Iter()
-
-	for scan(iter, &column, &indexOptionsJSON) {
-		var err error
-
-		// decode the index options
-		if indexOptionsJSON != nil {
-			err = json.Unmarshal(indexOptionsJSON, &column.Index.Options)
-			if err != nil {
-				iter.Close()
-				return nil, fmt.Errorf(
-					"Invalid JSON value '%s' as index_options for column '%s' in table '%s': %v",
-					indexOptionsJSON,
-					column.Name,
-					column.Table,
-					err,
-				)
-			}
-		}
-
-		columns = append(columns, column)
-		column = ColumnMetadata{Keyspace: keyspaceName}
-	}
-
-	err := iter.Close()
-	if err != nil && err != ErrNotFound {
-		return nil, fmt.Errorf("Error querying column schema: %v", err)
-	}
-
-	return columns, nil
-}
-
-// type definition parser state
-type typeParser struct {
-	input string
-	index int
-}
-
-// the type definition parser result
-type typeParserResult struct {
-	isComposite bool
-	types       []TypeInfo
-	reversed    []bool
-	collections map[string]TypeInfo
-}
-
-// Parse the type definition used for validator and comparator schema data
-func parseType(def string) typeParserResult {
-	parser := &typeParser{input: def}
-	return parser.parse()
-}
-
-const (
-	REVERSED_TYPE   = "org.apache.cassandra.db.marshal.ReversedType"
-	COMPOSITE_TYPE  = "org.apache.cassandra.db.marshal.CompositeType"
-	COLLECTION_TYPE = "org.apache.cassandra.db.marshal.ColumnToCollectionType"
-	LIST_TYPE       = "org.apache.cassandra.db.marshal.ListType"
-	SET_TYPE        = "org.apache.cassandra.db.marshal.SetType"
-	MAP_TYPE        = "org.apache.cassandra.db.marshal.MapType"
-)
-
-// represents a class specification in the type def AST
-type typeParserClassNode struct {
-	name   string
-	params []typeParserParamNode
-	// this is the segment of the input string that defined this node
-	input string
-}
-
-// represents a class parameter in the type def AST
-type typeParserParamNode struct {
-	name  *string
-	class typeParserClassNode
-}
-
-func (t *typeParser) parse() typeParserResult {
-	// parse the AST
-	ast, ok := t.parseClassNode()
-	if !ok {
-		// treat this is a custom type
-		return typeParserResult{
-			isComposite: false,
-			types: []TypeInfo{
-				NativeType{
-					typ:    TypeCustom,
-					custom: t.input,
-				},
-			},
-			reversed:    []bool{false},
-			collections: nil,
-		}
-	}
-
-	// interpret the AST
-	if strings.HasPrefix(ast.name, COMPOSITE_TYPE) {
-		count := len(ast.params)
-
-		// look for a collections param
-		last := ast.params[count-1]
-		collections := map[string]TypeInfo{}
-		if strings.HasPrefix(last.class.name, COLLECTION_TYPE) {
-			count--
-
-			for _, param := range last.class.params {
-				// decode the name
-				var name string
-				decoded, err := hex.DecodeString(*param.name)
-				if err != nil {
-					log.Printf(
-						"Error parsing type '%s', contains collection name '%s' with an invalid format: %v",
-						t.input,
-						*param.name,
-						err,
-					)
-					// just use the provided name
-					name = *param.name
-				} else {
-					name = string(decoded)
-				}
-				collections[name] = param.class.asTypeInfo()
-			}
-		}
-
-		types := make([]TypeInfo, count)
-		reversed := make([]bool, count)
-
-		for i, param := range ast.params[:count] {
-			class := param.class
-			reversed[i] = strings.HasPrefix(class.name, REVERSED_TYPE)
-			if reversed[i] {
-				class = class.params[0].class
-			}
-			types[i] = class.asTypeInfo()
-		}
-
-		return typeParserResult{
-			isComposite: true,
-			types:       types,
-			reversed:    reversed,
-			collections: collections,
-		}
-	} else {
-		// not composite, so one type
-		class := *ast
-		reversed := strings.HasPrefix(class.name, REVERSED_TYPE)
-		if reversed {
-			class = class.params[0].class
-		}
-		typeInfo := class.asTypeInfo()
-
-		return typeParserResult{
-			isComposite: false,
-			types:       []TypeInfo{typeInfo},
-			reversed:    []bool{reversed},
-		}
-	}
-}
-
-func (class *typeParserClassNode) asTypeInfo() TypeInfo {
-	if strings.HasPrefix(class.name, LIST_TYPE) {
-		elem := class.params[0].class.asTypeInfo()
-		return CollectionType{
-			NativeType: NativeType{
-				typ: TypeList,
-			},
-			Elem: elem,
-		}
-	}
-	if strings.HasPrefix(class.name, SET_TYPE) {
-		elem := class.params[0].class.asTypeInfo()
-		return CollectionType{
-			NativeType: NativeType{
-				typ: TypeSet,
-			},
-			Elem: elem,
-		}
-	}
-	if strings.HasPrefix(class.name, MAP_TYPE) {
-		key := class.params[0].class.asTypeInfo()
-		elem := class.params[1].class.asTypeInfo()
-		return CollectionType{
-			NativeType: NativeType{
-				typ: TypeMap,
-			},
-			Key:  key,
-			Elem: elem,
-		}
-	}
-
-	// must be a simple type or custom type
-	info := NativeType{typ: getApacheCassandraType(class.name)}
-	if info.typ == TypeCustom {
-		// add the entire class definition
-		info.custom = class.input
-	}
-	return info
-}
-
-// CLASS := ID [ PARAMS ]
-func (t *typeParser) parseClassNode() (node *typeParserClassNode, ok bool) {
-	t.skipWhitespace()
-
-	startIndex := t.index
-
-	name, ok := t.nextIdentifier()
-	if !ok {
-		return nil, false
-	}
-
-	params, ok := t.parseParamNodes()
-	if !ok {
-		return nil, false
-	}
-
-	endIndex := t.index
-
-	node = &typeParserClassNode{
-		name:   name,
-		params: params,
-		input:  t.input[startIndex:endIndex],
-	}
-	return node, true
-}
-
-// PARAMS := "(" PARAM { "," PARAM } ")"
-// PARAM := [ PARAM_NAME ":" ] CLASS
-// PARAM_NAME := ID
-func (t *typeParser) parseParamNodes() (params []typeParserParamNode, ok bool) {
-	t.skipWhitespace()
-
-	// the params are optional
-	if t.index == len(t.input) || t.input[t.index] != '(' {
-		return nil, true
-	}
-
-	params = []typeParserParamNode{}
-
-	// consume the '('
-	t.index++
-
-	t.skipWhitespace()
-
-	for t.input[t.index] != ')' {
-		// look for a named param, but if no colon, then we want to backup
-		backupIndex := t.index
-
-		// name will be a hex encoded version of a utf-8 string
-		name, ok := t.nextIdentifier()
-		if !ok {
-			return nil, false
-		}
-		hasName := true
-
-		// TODO handle '=>' used for DynamicCompositeType
-
-		t.skipWhitespace()
-
-		if t.input[t.index] == ':' {
-			// there is a name for this parameter
-
-			// consume the ':'
-			t.index++
-
-			t.skipWhitespace()
-		} else {
-			// no name, backup
-			hasName = false
-			t.index = backupIndex
-		}
-
-		// parse the next full parameter
-		classNode, ok := t.parseClassNode()
-		if !ok {
-			return nil, false
-		}
-
-		if hasName {
-			params = append(
-				params,
-				typeParserParamNode{name: &name, class: *classNode},
-			)
-		} else {
-			params = append(
-				params,
-				typeParserParamNode{class: *classNode},
-			)
-		}
-
-		t.skipWhitespace()
-
-		if t.input[t.index] == ',' {
-			// consume the comma
-			t.index++
-
-			t.skipWhitespace()
-		}
-	}
-
-	// consume the ')'
-	t.index++
-
-	return params, true
-}
-
-func (t *typeParser) skipWhitespace() {
-	for t.index < len(t.input) && isWhitespaceChar(t.input[t.index]) {
-		t.index++
-	}
-}
-
-func isWhitespaceChar(c byte) bool {
-	return c == ' ' || c == '\n' || c == '\t'
-}
-
-// ID := LETTER { LETTER }
-// LETTER := "0"..."9" | "a"..."z" | "A"..."Z" | "-" | "+" | "." | "_" | "&"
-func (t *typeParser) nextIdentifier() (id string, found bool) {
-	startIndex := t.index
-	for t.index < len(t.input) && isIdentifierChar(t.input[t.index]) {
-		t.index++
-	}
-	if startIndex == t.index {
-		return "", false
-	}
-	return t.input[startIndex:t.index], true
-}
-
-func isIdentifierChar(c byte) bool {
-	return (c >= '0' && c <= '9') ||
-		(c >= 'a' && c <= 'z') ||
-		(c >= 'A' && c <= 'Z') ||
-		c == '-' ||
-		c == '+' ||
-		c == '.' ||
-		c == '_' ||
-		c == '&'
-}
diff --git a/vendor/github.com/gocql/gocql/metadata_test.go b/vendor/github.com/gocql/gocql/metadata_test.go
deleted file mode 100644
index 7ce9c7ce6..000000000
--- a/vendor/github.com/gocql/gocql/metadata_test.go
+++ /dev/null
@@ -1,815 +0,0 @@
-// Copyright (c) 2015 The gocql 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 gocql
-
-import (
-	"strconv"
-	"testing"
-)
-
-// Tests V1 and V2 metadata "compilation" from example data which might be returned
-// from metadata schema queries (see getKeyspaceMetadata, getTableMetadata, and getColumnMetadata)
-func TestCompileMetadata(t *testing.T) {
-	// V1 tests - these are all based on real examples from the integration test ccm cluster
-	keyspace := &KeyspaceMetadata{
-		Name: "V1Keyspace",
-	}
-	tables := []TableMetadata{
-		TableMetadata{
-			// This table, found in the system keyspace, has no key aliases or column aliases
-			Keyspace:         "V1Keyspace",
-			Name:             "Schema",
-			KeyValidator:     "org.apache.cassandra.db.marshal.BytesType",
-			Comparator:       "org.apache.cassandra.db.marshal.UTF8Type",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{},
-			ColumnAliases:    []string{},
-			ValueAlias:       "",
-		},
-		TableMetadata{
-			// This table, found in the system keyspace, has key aliases, column aliases, and a value alias.
-			Keyspace:         "V1Keyspace",
-			Name:             "hints",
-			KeyValidator:     "org.apache.cassandra.db.marshal.UUIDType",
-			Comparator:       "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.TimeUUIDType,org.apache.cassandra.db.marshal.Int32Type)",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{"target_id"},
-			ColumnAliases:    []string{"hint_id", "message_version"},
-			ValueAlias:       "mutation",
-		},
-		TableMetadata{
-			// This table, found in the system keyspace, has a comparator with collections, but no column aliases
-			Keyspace:         "V1Keyspace",
-			Name:             "peers",
-			KeyValidator:     "org.apache.cassandra.db.marshal.InetAddressType",
-			Comparator:       "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.ColumnToCollectionType(746f6b656e73:org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.UTF8Type)))",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{"peer"},
-			ColumnAliases:    []string{},
-			ValueAlias:       "",
-		},
-		TableMetadata{
-			// This table, found in the system keyspace, has a column alias, but not a composite comparator
-			Keyspace:         "V1Keyspace",
-			Name:             "IndexInfo",
-			KeyValidator:     "org.apache.cassandra.db.marshal.UTF8Type",
-			Comparator:       "org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type)",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{"table_name"},
-			ColumnAliases:    []string{"index_name"},
-			ValueAlias:       "",
-		},
-		TableMetadata{
-			// This table, found in the gocql_test keyspace following an integration test run, has a composite comparator with collections as well as a column alias
-			Keyspace:         "V1Keyspace",
-			Name:             "wiki_page",
-			KeyValidator:     "org.apache.cassandra.db.marshal.UTF8Type",
-			Comparator:       "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.TimeUUIDType,org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.ColumnToCollectionType(74616773:org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.UTF8Type),6174746163686d656e7473:org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.BytesType)))",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{"title"},
-			ColumnAliases:    []string{"revid"},
-			ValueAlias:       "",
-		},
-		TableMetadata{
-			// This is a made up example with multiple unnamed aliases
-			Keyspace:         "V1Keyspace",
-			Name:             "no_names",
-			KeyValidator:     "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.UUIDType,org.apache.cassandra.db.marshal.UUIDType)",
-			Comparator:       "org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.Int32Type)",
-			DefaultValidator: "org.apache.cassandra.db.marshal.BytesType",
-			KeyAliases:       []string{},
-			ColumnAliases:    []string{},
-			ValueAlias:       "",
-		},
-	}
-	columns := []ColumnMetadata{
-		// Here are the regular columns from the peers table for testing regular columns
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "data_center", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "host_id", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UUIDType"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "rack", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "release_version", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "rpc_address", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.InetAddressType"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "schema_version", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UUIDType"},
-		ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "tokens", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.UTF8Type)"},
-	}
-	compileMetadata(1, keyspace, tables, columns)
-	assertKeyspaceMetadata(
-		t,
-		keyspace,
-		&KeyspaceMetadata{
-			Name: "V1Keyspace",
-			Tables: map[string]*TableMetadata{
-				"Schema": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "key",
-							Type: NativeType{typ: TypeBlob},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{},
-					Columns: map[string]*ColumnMetadata{
-						"key": &ColumnMetadata{
-							Name: "key",
-							Type: NativeType{typ: TypeBlob},
-							Kind: PARTITION_KEY,
-						},
-					},
-				},
-				"hints": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "target_id",
-							Type: NativeType{typ: TypeUUID},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name:  "hint_id",
-							Type:  NativeType{typ: TypeTimeUUID},
-							Order: ASC,
-						},
-						&ColumnMetadata{
-							Name:  "message_version",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-						},
-					},
-					Columns: map[string]*ColumnMetadata{
-						"target_id": &ColumnMetadata{
-							Name: "target_id",
-							Type: NativeType{typ: TypeUUID},
-							Kind: PARTITION_KEY,
-						},
-						"hint_id": &ColumnMetadata{
-							Name:  "hint_id",
-							Type:  NativeType{typ: TypeTimeUUID},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"message_version": &ColumnMetadata{
-							Name:  "message_version",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"mutation": &ColumnMetadata{
-							Name: "mutation",
-							Type: NativeType{typ: TypeBlob},
-							Kind: REGULAR,
-						},
-					},
-				},
-				"peers": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "peer",
-							Type: NativeType{typ: TypeInet},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{},
-					Columns: map[string]*ColumnMetadata{
-						"peer": &ColumnMetadata{
-							Name: "peer",
-							Type: NativeType{typ: TypeInet},
-							Kind: PARTITION_KEY,
-						},
-						"data_center":     &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "data_center", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type", Type: NativeType{typ: TypeVarchar}},
-						"host_id":         &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "host_id", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UUIDType", Type: NativeType{typ: TypeUUID}},
-						"rack":            &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "rack", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type", Type: NativeType{typ: TypeVarchar}},
-						"release_version": &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "release_version", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UTF8Type", Type: NativeType{typ: TypeVarchar}},
-						"rpc_address":     &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "rpc_address", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.InetAddressType", Type: NativeType{typ: TypeInet}},
-						"schema_version":  &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "schema_version", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.UUIDType", Type: NativeType{typ: TypeUUID}},
-						"tokens":          &ColumnMetadata{Keyspace: "V1Keyspace", Table: "peers", Kind: REGULAR, Name: "tokens", ComponentIndex: 0, Validator: "org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.UTF8Type)", Type: CollectionType{NativeType: NativeType{typ: TypeSet}}},
-					},
-				},
-				"IndexInfo": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "table_name",
-							Type: NativeType{typ: TypeVarchar},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name:  "index_name",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: DESC,
-						},
-					},
-					Columns: map[string]*ColumnMetadata{
-						"table_name": &ColumnMetadata{
-							Name: "table_name",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: PARTITION_KEY,
-						},
-						"index_name": &ColumnMetadata{
-							Name:  "index_name",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: DESC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"value": &ColumnMetadata{
-							Name: "value",
-							Type: NativeType{typ: TypeBlob},
-							Kind: REGULAR,
-						},
-					},
-				},
-				"wiki_page": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "title",
-							Type: NativeType{typ: TypeVarchar},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name:  "revid",
-							Type:  NativeType{typ: TypeTimeUUID},
-							Order: ASC,
-						},
-					},
-					Columns: map[string]*ColumnMetadata{
-						"title": &ColumnMetadata{
-							Name: "title",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: PARTITION_KEY,
-						},
-						"revid": &ColumnMetadata{
-							Name: "revid",
-							Type: NativeType{typ: TypeTimeUUID},
-							Kind: CLUSTERING_KEY,
-						},
-					},
-				},
-				"no_names": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "key",
-							Type: NativeType{typ: TypeUUID},
-						},
-						&ColumnMetadata{
-							Name: "key2",
-							Type: NativeType{typ: TypeUUID},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name:  "column",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-						},
-						&ColumnMetadata{
-							Name:  "column2",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-						},
-						&ColumnMetadata{
-							Name:  "column3",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-						},
-					},
-					Columns: map[string]*ColumnMetadata{
-						"key": &ColumnMetadata{
-							Name: "key",
-							Type: NativeType{typ: TypeUUID},
-							Kind: PARTITION_KEY,
-						},
-						"key2": &ColumnMetadata{
-							Name: "key2",
-							Type: NativeType{typ: TypeUUID},
-							Kind: PARTITION_KEY,
-						},
-						"column": &ColumnMetadata{
-							Name:  "column",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"column2": &ColumnMetadata{
-							Name:  "column2",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"column3": &ColumnMetadata{
-							Name:  "column3",
-							Type:  NativeType{typ: TypeInt},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"value": &ColumnMetadata{
-							Name: "value",
-							Type: NativeType{typ: TypeBlob},
-							Kind: REGULAR,
-						},
-					},
-				},
-			},
-		},
-	)
-
-	// V2 test - V2+ protocol is simpler so here are some toy examples to verify that the mapping works
-	keyspace = &KeyspaceMetadata{
-		Name: "V2Keyspace",
-	}
-	tables = []TableMetadata{
-		TableMetadata{
-			Keyspace: "V2Keyspace",
-			Name:     "Table1",
-		},
-		TableMetadata{
-			Keyspace: "V2Keyspace",
-			Name:     "Table2",
-		},
-	}
-	columns = []ColumnMetadata{
-		ColumnMetadata{
-			Keyspace:       "V2Keyspace",
-			Table:          "Table1",
-			Name:           "KEY1",
-			Kind:           PARTITION_KEY,
-			ComponentIndex: 0,
-			Validator:      "org.apache.cassandra.db.marshal.UTF8Type",
-		},
-		ColumnMetadata{
-			Keyspace:       "V2Keyspace",
-			Table:          "Table1",
-			Name:           "Key1",
-			Kind:           PARTITION_KEY,
-			ComponentIndex: 0,
-			Validator:      "org.apache.cassandra.db.marshal.UTF8Type",
-		},
-		ColumnMetadata{
-			Keyspace:       "V2Keyspace",
-			Table:          "Table2",
-			Name:           "Column1",
-			Kind:           PARTITION_KEY,
-			ComponentIndex: 0,
-			Validator:      "org.apache.cassandra.db.marshal.UTF8Type",
-		},
-		ColumnMetadata{
-			Keyspace:       "V2Keyspace",
-			Table:          "Table2",
-			Name:           "Column2",
-			Kind:           CLUSTERING_KEY,
-			ComponentIndex: 0,
-			Validator:      "org.apache.cassandra.db.marshal.UTF8Type",
-		},
-		ColumnMetadata{
-			Keyspace:       "V2Keyspace",
-			Table:          "Table2",
-			Name:           "Column3",
-			Kind:           CLUSTERING_KEY,
-			ComponentIndex: 1,
-			Validator:      "org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UTF8Type)",
-		},
-		ColumnMetadata{
-			Keyspace:  "V2Keyspace",
-			Table:     "Table2",
-			Name:      "Column4",
-			Kind:      REGULAR,
-			Validator: "org.apache.cassandra.db.marshal.UTF8Type",
-		},
-	}
-	compileMetadata(2, keyspace, tables, columns)
-	assertKeyspaceMetadata(
-		t,
-		keyspace,
-		&KeyspaceMetadata{
-			Name: "V2Keyspace",
-			Tables: map[string]*TableMetadata{
-				"Table1": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "Key1",
-							Type: NativeType{typ: TypeVarchar},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{},
-					Columns: map[string]*ColumnMetadata{
-						"KEY1": &ColumnMetadata{
-							Name: "KEY1",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: PARTITION_KEY,
-						},
-						"Key1": &ColumnMetadata{
-							Name: "Key1",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: PARTITION_KEY,
-						},
-					},
-				},
-				"Table2": &TableMetadata{
-					PartitionKey: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name: "Column1",
-							Type: NativeType{typ: TypeVarchar},
-						},
-					},
-					ClusteringColumns: []*ColumnMetadata{
-						&ColumnMetadata{
-							Name:  "Column2",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: ASC,
-						},
-						&ColumnMetadata{
-							Name:  "Column3",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: DESC,
-						},
-					},
-					Columns: map[string]*ColumnMetadata{
-						"Column1": &ColumnMetadata{
-							Name: "Column1",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: PARTITION_KEY,
-						},
-						"Column2": &ColumnMetadata{
-							Name:  "Column2",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: ASC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"Column3": &ColumnMetadata{
-							Name:  "Column3",
-							Type:  NativeType{typ: TypeVarchar},
-							Order: DESC,
-							Kind:  CLUSTERING_KEY,
-						},
-						"Column4": &ColumnMetadata{
-							Name: "Column4",
-							Type: NativeType{typ: TypeVarchar},
-							Kind: REGULAR,
-						},
-					},
-				},
-			},
-		},
-	)
-}
-
-// Helper function for asserting that actual metadata returned was as expected
-func assertKeyspaceMetadata(t *testing.T, actual, expected *KeyspaceMetadata) {
-	if len(expected.Tables) != len(actual.Tables) {
-		t.Errorf("Expected len(%s.Tables) to be %v but was %v", expected.Name, len(expected.Tables), len(actual.Tables))
-	}
-	for keyT := range expected.Tables {
-		et := expected.Tables[keyT]
-		at, found := actual.Tables[keyT]
-
-		if !found {
-			t.Errorf("Expected %s.Tables[%s] but was not found", expected.Name, keyT)
-		} else {
-			if keyT != at.Name {
-				t.Errorf("Expected %s.Tables[%s].Name to be %v but was %v", expected.Name, keyT, keyT, at.Name)
-			}
-			if len(et.PartitionKey) != len(at.PartitionKey) {
-				t.Errorf("Expected len(%s.Tables[%s].PartitionKey) to be %v but was %v", expected.Name, keyT, len(et.PartitionKey), len(at.PartitionKey))
-			} else {
-				for i := range et.PartitionKey {
-					if et.PartitionKey[i].Name != at.PartitionKey[i].Name {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].Name to be '%v' but was '%v'", expected.Name, keyT, i, et.PartitionKey[i].Name, at.PartitionKey[i].Name)
-					}
-					if expected.Name != at.PartitionKey[i].Keyspace {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].Keyspace to be '%v' but was '%v'", expected.Name, keyT, i, expected.Name, at.PartitionKey[i].Keyspace)
-					}
-					if keyT != at.PartitionKey[i].Table {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].Table to be '%v' but was '%v'", expected.Name, keyT, i, keyT, at.PartitionKey[i].Table)
-					}
-					if et.PartitionKey[i].Type.Type() != at.PartitionKey[i].Type.Type() {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].Type.Type to be %v but was %v", expected.Name, keyT, i, et.PartitionKey[i].Type.Type(), at.PartitionKey[i].Type.Type())
-					}
-					if i != at.PartitionKey[i].ComponentIndex {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].ComponentIndex to be %v but was %v", expected.Name, keyT, i, i, at.PartitionKey[i].ComponentIndex)
-					}
-					if PARTITION_KEY != at.PartitionKey[i].Kind {
-						t.Errorf("Expected %s.Tables[%s].PartitionKey[%d].Kind to be '%v' but was '%v'", expected.Name, keyT, i, PARTITION_KEY, at.PartitionKey[i].Kind)
-					}
-				}
-			}
-			if len(et.ClusteringColumns) != len(at.ClusteringColumns) {
-				t.Errorf("Expected len(%s.Tables[%s].ClusteringColumns) to be %v but was %v", expected.Name, keyT, len(et.ClusteringColumns), len(at.ClusteringColumns))
-			} else {
-				for i := range et.ClusteringColumns {
-					if at.ClusteringColumns[i] == nil {
-						t.Fatalf("Unexpected nil value: %s.Tables[%s].ClusteringColumns[%d]", expected.Name, keyT, i)
-					}
-					if et.ClusteringColumns[i].Name != at.ClusteringColumns[i].Name {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Name to be '%v' but was '%v'", expected.Name, keyT, i, et.ClusteringColumns[i].Name, at.ClusteringColumns[i].Name)
-					}
-					if expected.Name != at.ClusteringColumns[i].Keyspace {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Keyspace to be '%v' but was '%v'", expected.Name, keyT, i, expected.Name, at.ClusteringColumns[i].Keyspace)
-					}
-					if keyT != at.ClusteringColumns[i].Table {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Table to be '%v' but was '%v'", expected.Name, keyT, i, keyT, at.ClusteringColumns[i].Table)
-					}
-					if et.ClusteringColumns[i].Type.Type() != at.ClusteringColumns[i].Type.Type() {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Type.Type to be %v but was %v", expected.Name, keyT, i, et.ClusteringColumns[i].Type.Type(), at.ClusteringColumns[i].Type.Type())
-					}
-					if i != at.ClusteringColumns[i].ComponentIndex {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].ComponentIndex to be %v but was %v", expected.Name, keyT, i, i, at.ClusteringColumns[i].ComponentIndex)
-					}
-					if et.ClusteringColumns[i].Order != at.ClusteringColumns[i].Order {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Order to be %v but was %v", expected.Name, keyT, i, et.ClusteringColumns[i].Order, at.ClusteringColumns[i].Order)
-					}
-					if CLUSTERING_KEY != at.ClusteringColumns[i].Kind {
-						t.Errorf("Expected %s.Tables[%s].ClusteringColumns[%d].Kind to be '%v' but was '%v'", expected.Name, keyT, i, CLUSTERING_KEY, at.ClusteringColumns[i].Kind)
-					}
-				}
-			}
-			if len(et.Columns) != len(at.Columns) {
-				eKeys := make([]string, 0, len(et.Columns))
-				for key := range et.Columns {
-					eKeys = append(eKeys, key)
-				}
-				aKeys := make([]string, 0, len(at.Columns))
-				for key := range at.Columns {
-					aKeys = append(aKeys, key)
-				}
-				t.Errorf("Expected len(%s.Tables[%s].Columns) to be %v (keys:%v) but was %v (keys:%v)", expected.Name, keyT, len(et.Columns), eKeys, len(at.Columns), aKeys)
-			} else {
-				for keyC := range et.Columns {
-					ec := et.Columns[keyC]
-					ac, found := at.Columns[keyC]
-
-					if !found {
-						t.Errorf("Expected %s.Tables[%s].Columns[%s] but was not found", expected.Name, keyT, keyC)
-					} else {
-						if keyC != ac.Name {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Name to be '%v' but was '%v'", expected.Name, keyT, keyC, keyC, at.Name)
-						}
-						if expected.Name != ac.Keyspace {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Keyspace to be '%v' but was '%v'", expected.Name, keyT, keyC, expected.Name, ac.Keyspace)
-						}
-						if keyT != ac.Table {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Table to be '%v' but was '%v'", expected.Name, keyT, keyC, keyT, ac.Table)
-						}
-						if ec.Type.Type() != ac.Type.Type() {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Type.Type to be %v but was %v", expected.Name, keyT, keyC, ec.Type.Type(), ac.Type.Type())
-						}
-						if ec.Order != ac.Order {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Order to be %v but was %v", expected.Name, keyT, keyC, ec.Order, ac.Order)
-						}
-						if ec.Kind != ac.Kind {
-							t.Errorf("Expected %s.Tables[%s].Columns[%s].Kind to be '%v' but was '%v'", expected.Name, keyT, keyC, ec.Kind, ac.Kind)
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-// Tests the cassandra type definition parser
-func TestTypeParser(t *testing.T) {
-	// native type
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.UTF8Type",
-		assertTypeInfo{Type: TypeVarchar},
-	)
-
-	// reversed
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.UUIDType)",
-		assertTypeInfo{Type: TypeUUID, Reversed: true},
-	)
-
-	// set
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.SetType(org.apache.cassandra.db.marshal.Int32Type)",
-		assertTypeInfo{
-			Type: TypeSet,
-			Elem: &assertTypeInfo{Type: TypeInt},
-		},
-	)
-
-	// list
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.ListType(org.apache.cassandra.db.marshal.TimeUUIDType)",
-		assertTypeInfo{
-			Type: TypeList,
-			Elem: &assertTypeInfo{Type: TypeTimeUUID},
-		},
-	)
-
-	// map
-	assertParseNonCompositeType(
-		t,
-		" org.apache.cassandra.db.marshal.MapType( org.apache.cassandra.db.marshal.UUIDType , org.apache.cassandra.db.marshal.BytesType ) ",
-		assertTypeInfo{
-			Type: TypeMap,
-			Key:  &assertTypeInfo{Type: TypeUUID},
-			Elem: &assertTypeInfo{Type: TypeBlob},
-		},
-	)
-
-	// custom
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.UserType(sandbox,61646472657373,737472656574:org.apache.cassandra.db.marshal.UTF8Type,63697479:org.apache.cassandra.db.marshal.UTF8Type,7a6970:org.apache.cassandra.db.marshal.Int32Type)",
-		assertTypeInfo{Type: TypeCustom, Custom: "org.apache.cassandra.db.marshal.UserType(sandbox,61646472657373,737472656574:org.apache.cassandra.db.marshal.UTF8Type,63697479:org.apache.cassandra.db.marshal.UTF8Type,7a6970:org.apache.cassandra.db.marshal.Int32Type)"},
-	)
-	assertParseNonCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.DynamicCompositeType(u=>org.apache.cassandra.db.marshal.UUIDType,d=>org.apache.cassandra.db.marshal.DateType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,b=>org.apache.cassandra.db.marshal.BytesType,s=>org.apache.cassandra.db.marshal.UTF8Type,B=>org.apache.cassandra.db.marshal.BooleanType,a=>org.apache.cassandra.db.marshal.AsciiType,l=>org.apache.cassandra.db.marshal.LongType,i=>org.apache.cassandra.db.marshal.IntegerType,x=>org.apache.cassandra.db.marshal.LexicalUUIDType)",
-		assertTypeInfo{Type: TypeCustom, Custom: "org.apache.cassandra.db.marshal.DynamicCompositeType(u=>org.apache.cassandra.db.marshal.UUIDType,d=>org.apache.cassandra.db.marshal.DateType,t=>org.apache.cassandra.db.marshal.TimeUUIDType,b=>org.apache.cassandra.db.marshal.BytesType,s=>org.apache.cassandra.db.marshal.UTF8Type,B=>org.apache.cassandra.db.marshal.BooleanType,a=>org.apache.cassandra.db.marshal.AsciiType,l=>org.apache.cassandra.db.marshal.LongType,i=>org.apache.cassandra.db.marshal.IntegerType,x=>org.apache.cassandra.db.marshal.LexicalUUIDType)"},
-	)
-
-	// composite defs
-	assertParseCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.UTF8Type)",
-		[]assertTypeInfo{
-			assertTypeInfo{Type: TypeVarchar},
-		},
-		nil,
-	)
-	assertParseCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.ReversedType(org.apache.cassandra.db.marshal.DateType),org.apache.cassandra.db.marshal.UTF8Type)",
-		[]assertTypeInfo{
-			assertTypeInfo{Type: TypeTimestamp, Reversed: true},
-			assertTypeInfo{Type: TypeVarchar},
-		},
-		nil,
-	)
-	assertParseCompositeType(
-		t,
-		"org.apache.cassandra.db.marshal.CompositeType(org.apache.cassandra.db.marshal.UTF8Type,org.apache.cassandra.db.marshal.ColumnToCollectionType(726f77735f6d6572676564:org.apache.cassandra.db.marshal.MapType(org.apache.cassandra.db.marshal.Int32Type,org.apache.cassandra.db.marshal.LongType)))",
-		[]assertTypeInfo{
-			assertTypeInfo{Type: TypeVarchar},
-		},
-		map[string]assertTypeInfo{
-			"rows_merged": assertTypeInfo{
-				Type: TypeMap,
-				Key:  &assertTypeInfo{Type: TypeInt},
-				Elem: &assertTypeInfo{Type: TypeBigInt},
-			},
-		},
-	)
-}
-
-// expected data holder
-type assertTypeInfo struct {
-	Type     Type
-	Reversed bool
-	Elem     *assertTypeInfo
-	Key      *assertTypeInfo
-	Custom   string
-}
-
-// Helper function for asserting that the type parser returns the expected
-// results for the given definition
-func assertParseNonCompositeType(
-	t *testing.T,
-	def string,
-	typeExpected assertTypeInfo,
-) {
-
-	result := parseType(def)
-	if len(result.reversed) != 1 {
-		t.Errorf("%s expected %d reversed values but there were %d", def, 1, len(result.reversed))
-	}
-
-	assertParseNonCompositeTypes(
-		t,
-		def,
-		[]assertTypeInfo{typeExpected},
-		result.types,
-	)
-
-	// expect no composite part of the result
-	if result.isComposite {
-		t.Errorf("%s: Expected not composite", def)
-	}
-	if result.collections != nil {
-		t.Errorf("%s: Expected nil collections: %v", def, result.collections)
-	}
-}
-
-// Helper function for asserting that the type parser returns the expected
-// results for the given definition
-func assertParseCompositeType(
-	t *testing.T,
-	def string,
-	typesExpected []assertTypeInfo,
-	collectionsExpected map[string]assertTypeInfo,
-) {
-
-	result := parseType(def)
-	if len(result.reversed) != len(typesExpected) {
-		t.Errorf("%s expected %d reversed values but there were %d", def, len(typesExpected), len(result.reversed))
-	}
-
-	assertParseNonCompositeTypes(
-		t,
-		def,
-		typesExpected,
-		result.types,
-	)
-
-	// expect composite part of the result
-	if !result.isComposite {
-		t.Errorf("%s: Expected composite", def)
-	}
-	if result.collections == nil {
-		t.Errorf("%s: Expected non-nil collections: %v", def, result.collections)
-	}
-
-	for name, typeExpected := range collectionsExpected {
-		// check for an actual type for this name
-		typeActual, found := result.collections[name]
-		if !found {
-			t.Errorf("%s.tcollections: Expected param named %s but there wasn't", def, name)
-		} else {
-			// remove the actual from the collection so we can detect extras
-			delete(result.collections, name)
-
-			// check the type
-			assertParseNonCompositeTypes(
-				t,
-				def+"collections["+name+"]",
-				[]assertTypeInfo{typeExpected},
-				[]TypeInfo{typeActual},
-			)
-		}
-	}
-
-	if len(result.collections) != 0 {
-		t.Errorf("%s.collections: Expected no more types in collections, but there was %v", def, result.collections)
-	}
-}
-
-// Helper function for asserting that the type parser returns the expected
-// results for the given definition
-func assertParseNonCompositeTypes(
-	t *testing.T,
-	context string,
-	typesExpected []assertTypeInfo,
-	typesActual []TypeInfo,
-) {
-	if len(typesActual) != len(typesExpected) {
-		t.Errorf("%s: Expected %d types, but there were %d", context, len(typesExpected), len(typesActual))
-	}
-
-	for i := range typesExpected {
-		typeExpected := typesExpected[i]
-		typeActual := typesActual[i]
-
-		// shadow copy the context for local modification
-		context := context
-		if len(typesExpected) > 1 {
-			context = context + "[" + strconv.Itoa(i) + "]"
-		}
-
-		// check the type
-		if typeActual.Type() != typeExpected.Type {
-			t.Errorf("%s: Expected to parse Type to %s but was %s", context, typeExpected.Type, typeActual.Type())
-		}
-		// check the custom
-		if typeActual.Custom() != typeExpected.Custom {
-			t.Errorf("%s: Expected to parse Custom %s but was %s", context, typeExpected.Custom, typeActual.Custom())
-		}
-
-		collection, _ := typeActual.(CollectionType)
-		// check the elem
-		if typeExpected.Elem != nil {
-			if collection.Elem == nil {
-				t.Errorf("%s: Expected to parse Elem, but was nil ", context)
-			} else {
-				assertParseNonCompositeTypes(
-					t,
-					context+".Elem",
-					[]assertTypeInfo{*typeExpected.Elem},
-					[]TypeInfo{collection.Elem},
-				)
-			}
-		} else if collection.Elem != nil {
-			t.Errorf("%s: Expected to not parse Elem, but was %+v", context, collection.Elem)
-		}
-
-		// check the key
-		if typeExpected.Key != nil {
-			if collection.Key == nil {
-				t.Errorf("%s: Expected to parse Key, but was nil ", context)
-			} else {
-				assertParseNonCompositeTypes(
-					t,
-					context+".Key",
-					[]assertTypeInfo{*typeExpected.Key},
-					[]TypeInfo{collection.Key},
-				)
-			}
-		} else if collection.Key != nil {
-			t.Errorf("%s: Expected to not parse Key, but was %+v", context, collection.Key)
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/policies.go b/vendor/github.com/gocql/gocql/policies.go
deleted file mode 100644
index cb68d4369..000000000
--- a/vendor/github.com/gocql/gocql/policies.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright (c) 2012 The gocql Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-//This file will be the future home for more policies
-package gocql
-
-import (
-	"log"
-	"sync"
-	"sync/atomic"
-)
-
-//RetryableQuery is an interface that represents a query or batch statement that
-//exposes the correct functions for the retry policy logic to evaluate correctly.
-type RetryableQuery interface {
-	Attempts() int
-	GetConsistency() Consistency
-}
-
-// RetryPolicy interface is used by gocql to determine if a query can be attempted
-// again after a retryable error has been received. The interface allows gocql
-// users to implement their own logic to determine if a query can be attempted
-// again.
-//
-// See SimpleRetryPolicy as an example of implementing and using a RetryPolicy
-// interface.
-type RetryPolicy interface {
-	Attempt(RetryableQuery) bool
-}
-
-// SimpleRetryPolicy has simple logic for attempting a query a fixed number of times.
-//
-// See below for examples of usage:
-//
-//     //Assign to the cluster
-//     cluster.RetryPolicy = &gocql.SimpleRetryPolicy{NumRetries: 3}
-//
-//     //Assign to a query
-//     query.RetryPolicy(&gocql.SimpleRetryPolicy{NumRetries: 1})
-//
-type SimpleRetryPolicy struct {
-	NumRetries int //Number of times to retry a query
-}
-
-// Attempt tells gocql to attempt the query again based on query.Attempts being less
-// than the NumRetries defined in the policy.
-func (s *SimpleRetryPolicy) Attempt(q RetryableQuery) bool {
-	return q.Attempts() <= s.NumRetries
-}
-
-//HostSelectionPolicy is an interface for selecting
-//the most appropriate host to execute a given query.
-type HostSelectionPolicy interface {
-	SetHosts
-	SetPartitioner
-	//Pick returns an iteration function over selected hosts
-	Pick(*Query) NextHost
-}
-
-//NextHost is an iteration function over picked hosts
-type NextHost func() *HostInfo
-
-//NewRoundRobinHostPolicy is a round-robin load balancing policy
-func NewRoundRobinHostPolicy() HostSelectionPolicy {
-	return &roundRobinHostPolicy{hosts: []HostInfo{}}
-}
-
-type roundRobinHostPolicy struct {
-	hosts []HostInfo
-	pos   uint32
-	mu    sync.RWMutex
-}
-
-func (r *roundRobinHostPolicy) SetHosts(hosts []HostInfo) {
-	r.mu.Lock()
-	r.hosts = hosts
-	r.mu.Unlock()
-}
-
-func (r *roundRobinHostPolicy) SetPartitioner(partitioner string) {
-	// noop
-}
-
-func (r *roundRobinHostPolicy) Pick(qry *Query) NextHost {
-	// i is used to limit the number of attempts to find a host
-	// to the number of hosts known to this policy
-	var i uint32 = 0
-	return func() *HostInfo {
-		r.mu.RLock()
-		if len(r.hosts) == 0 {
-			r.mu.RUnlock()
-			return nil
-		}
-
-		var host *HostInfo
-		// always increment pos to evenly distribute traffic in case of
-		// failures
-		pos := atomic.AddUint32(&r.pos, 1)
-		if int(i) < len(r.hosts) {
-			host = &r.hosts[(pos)%uint32(len(r.hosts))]
-			i++
-		}
-		r.mu.RUnlock()
-		return host
-	}
-}
-
-//NewTokenAwareHostPolicy is a token aware host selection policy
-func NewTokenAwareHostPolicy(fallback HostSelectionPolicy) HostSelectionPolicy {
-	return &tokenAwareHostPolicy{fallback: fallback, hosts: []HostInfo{}}
-}
-
-type tokenAwareHostPolicy struct {
-	mu          sync.RWMutex
-	hosts       []HostInfo
-	partitioner string
-	tokenRing   *tokenRing
-	fallback    HostSelectionPolicy
-}
-
-func (t *tokenAwareHostPolicy) SetHosts(hosts []HostInfo) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	// always update the fallback
-	t.fallback.SetHosts(hosts)
-	t.hosts = hosts
-
-	t.resetTokenRing()
-}
-
-func (t *tokenAwareHostPolicy) SetPartitioner(partitioner string) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	if t.partitioner != partitioner {
-		t.fallback.SetPartitioner(partitioner)
-		t.partitioner = partitioner
-
-		t.resetTokenRing()
-	}
-}
-
-func (t *tokenAwareHostPolicy) resetTokenRing() {
-	if t.partitioner == "" {
-		// partitioner not yet set
-		return
-	}
-
-	// create a new token ring
-	tokenRing, err := newTokenRing(t.partitioner, t.hosts)
-	if err != nil {
-		log.Printf("Unable to update the token ring due to error: %s", err)
-		return
-	}
-
-	// replace the token ring
-	t.tokenRing = tokenRing
-}
-
-func (t *tokenAwareHostPolicy) Pick(qry *Query) NextHost {
-	if qry == nil {
-		return t.fallback.Pick(qry)
-	}
-
-	routingKey, err := qry.GetRoutingKey()
-	if err != nil {
-		return t.fallback.Pick(qry)
-	}
-	if routingKey == nil {
-		return t.fallback.Pick(qry)
-	}
-
-	var host *HostInfo
-
-	t.mu.RLock()
-	// TODO retrieve a list of hosts based on the replication strategy
-	host = t.tokenRing.GetHostForPartitionKey(routingKey)
-	t.mu.RUnlock()
-
-	if host == nil {
-		return t.fallback.Pick(qry)
-	}
-
-	// scope these variables for the same lifetime as the iterator function
-	var (
-		hostReturned bool
-		fallbackIter NextHost
-	)
-	return func() *HostInfo {
-		if !hostReturned {
-			hostReturned = true
-			return host
-		}
-
-		// fallback
-		if fallbackIter == nil {
-			fallbackIter = t.fallback.Pick(qry)
-		}
-
-		fallbackHost := fallbackIter()
-
-		// filter the token aware selected hosts from the fallback hosts
-		if fallbackHost == host {
-			fallbackHost = fallbackIter()
-		}
-
-		return fallbackHost
-	}
-}
-
-//ConnSelectionPolicy is an interface for selecting an
-//appropriate connection for executing a query
-type ConnSelectionPolicy interface {
-	SetConns(conns []*Conn)
-	Pick(*Query) *Conn
-}
-
-type roundRobinConnPolicy struct {
-	conns []*Conn
-	pos   uint32
-	mu    sync.RWMutex
-}
-
-func NewRoundRobinConnPolicy() ConnSelectionPolicy {
-	return &roundRobinConnPolicy{}
-}
-
-func (r *roundRobinConnPolicy) SetConns(conns []*Conn) {
-	r.mu.Lock()
-	r.conns = conns
-	r.mu.Unlock()
-}
-
-func (r *roundRobinConnPolicy) Pick(qry *Query) *Conn {
-	pos := atomic.AddUint32(&r.pos, 1)
-	var conn *Conn
-	r.mu.RLock()
-	if len(r.conns) > 0 {
-		conn = r.conns[pos%uint32(len(r.conns))]
-	}
-	r.mu.RUnlock()
-	return conn
-}
diff --git a/vendor/github.com/gocql/gocql/policies_test.go b/vendor/github.com/gocql/gocql/policies_test.go
deleted file mode 100644
index 78f147f4c..000000000
--- a/vendor/github.com/gocql/gocql/policies_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) 2015 The gocql 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 gocql
-
-import "testing"
-
-// Tests of the round-robin host selection policy implementation
-func TestRoundRobinHostPolicy(t *testing.T) {
-	policy := NewRoundRobinHostPolicy()
-
-	hosts := []HostInfo{
-		HostInfo{HostId: "0"},
-		HostInfo{HostId: "1"},
-	}
-
-	policy.SetHosts(hosts)
-
-	// the first host selected is actually at [1], but this is ok for RR
-	// interleaved iteration should always increment the host
-	iterA := policy.Pick(nil)
-	if actual := iterA(); actual != &hosts[1] {
-		t.Errorf("Expected hosts[1] but was hosts[%s]", actual.HostId)
-	}
-	iterB := policy.Pick(nil)
-	if actual := iterB(); actual != &hosts[0] {
-		t.Errorf("Expected hosts[0] but was hosts[%s]", actual.HostId)
-	}
-	if actual := iterB(); actual != &hosts[1] {
-		t.Errorf("Expected hosts[1] but was hosts[%s]", actual.HostId)
-	}
-	if actual := iterA(); actual != &hosts[0] {
-		t.Errorf("Expected hosts[0] but was hosts[%s]", actual.HostId)
-	}
-
-	iterC := policy.Pick(nil)
-	if actual := iterC(); actual != &hosts[1] {
-		t.Errorf("Expected hosts[1] but was hosts[%s]", actual.HostId)
-	}
-	if actual := iterC(); actual != &hosts[0] {
-		t.Errorf("Expected hosts[0] but was hosts[%s]", actual.HostId)
-	}
-}
-
-// Tests of the token-aware host selection policy implementation with a
-// round-robin host selection policy fallback.
-func TestTokenAwareHostPolicy(t *testing.T) {
-	policy := NewTokenAwareHostPolicy(NewRoundRobinHostPolicy())
-
-	query := &Query{}
-
-	iter := policy.Pick(nil)
-	if iter == nil {
-		t.Fatal("host iterator was nil")
-	}
-	actual := iter()
-	if actual != nil {
-		t.Fatalf("expected nil from iterator, but was %v", actual)
-	}
-
-	// set the hosts
-	hosts := []HostInfo{
-		HostInfo{Peer: "0", Tokens: []string{"00"}},
-		HostInfo{Peer: "1", Tokens: []string{"25"}},
-		HostInfo{Peer: "2", Tokens: []string{"50"}},
-		HostInfo{Peer: "3", Tokens: []string{"75"}},
-	}
-	policy.SetHosts(hosts)
-
-	// the token ring is not setup without the partitioner, but the fallback
-	// should work
-	if actual := policy.Pick(nil)(); actual.Peer != "1" {
-		t.Errorf("Expected peer 1 but was %s", actual.Peer)
-	}
-
-	query.RoutingKey([]byte("30"))
-	if actual := policy.Pick(query)(); actual.Peer != "2" {
-		t.Errorf("Expected peer 2 but was %s", actual.Peer)
-	}
-
-	policy.SetPartitioner("OrderedPartitioner")
-
-	// now the token ring is configured
-	query.RoutingKey([]byte("20"))
-	iter = policy.Pick(query)
-	if actual := iter(); actual.Peer != "1" {
-		t.Errorf("Expected peer 1 but was %s", actual.Peer)
-	}
-	// rest are round robin
-	if actual := iter(); actual.Peer != "3" {
-		t.Errorf("Expected peer 3 but was %s", actual.Peer)
-	}
-	if actual := iter(); actual.Peer != "0" {
-		t.Errorf("Expected peer 0 but was %s", actual.Peer)
-	}
-	if actual := iter(); actual.Peer != "2" {
-		t.Errorf("Expected peer 2 but was %s", actual.Peer)
-	}
-}
-
-// Tests of the round-robin connection selection policy implementation
-func TestRoundRobinConnPolicy(t *testing.T) {
-	policy := NewRoundRobinConnPolicy()
-
-	conn0 := &Conn{}
-	conn1 := &Conn{}
-	conn := []*Conn{
-		conn0,
-		conn1,
-	}
-
-	policy.SetConns(conn)
-
-	// the first conn selected is actually at [1], but this is ok for RR
-	if actual := policy.Pick(nil); actual != conn1 {
-		t.Error("Expected conn1")
-	}
-	if actual := policy.Pick(nil); actual != conn0 {
-		t.Error("Expected conn0")
-	}
-	if actual := policy.Pick(nil); actual != conn1 {
-		t.Error("Expected conn1")
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/session.go b/vendor/github.com/gocql/gocql/session.go
deleted file mode 100644
index 1ca657fe6..000000000
--- a/vendor/github.com/gocql/gocql/session.go
+++ /dev/null
@@ -1,1019 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-	"time"
-	"unicode"
-
-	"github.com/golang/groupcache/lru"
-)
-
-// Session is the interface used by users to interact with the database.
-//
-// It's safe for concurrent use by multiple goroutines and a typical usage
-// scenario is to have one global session object to interact with the
-// whole Cassandra cluster.
-//
-// This type extends the Node interface by adding a convinient query builder
-// and automatically sets a default consinstency level on all operations
-// that do not have a consistency level set.
-type Session struct {
-	Pool                ConnectionPool
-	cons                Consistency
-	pageSize            int
-	prefetch            float64
-	routingKeyInfoCache routingKeyInfoLRU
-	schemaDescriber     *schemaDescriber
-	trace               Tracer
-	hostSource          *ringDescriber
-	mu                  sync.RWMutex
-
-	cfg ClusterConfig
-
-	closeMu  sync.RWMutex
-	isClosed bool
-}
-
-// NewSession wraps an existing Node.
-func NewSession(cfg ClusterConfig) (*Session, error) {
-	//Check that hosts in the ClusterConfig is not empty
-	if len(cfg.Hosts) < 1 {
-		return nil, ErrNoHosts
-	}
-
-	maxStreams := 128
-	if cfg.ProtoVersion > protoVersion2 {
-		maxStreams = 32768
-	}
-
-	if cfg.NumStreams <= 0 || cfg.NumStreams > maxStreams {
-		cfg.NumStreams = maxStreams
-	}
-
-	pool, err := cfg.ConnPoolType(&cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	//Adjust the size of the prepared statements cache to match the latest configuration
-	stmtsLRU.Lock()
-	initStmtsLRU(cfg.MaxPreparedStmts)
-	stmtsLRU.Unlock()
-
-	s := &Session{
-		Pool:     pool,
-		cons:     cfg.Consistency,
-		prefetch: 0.25,
-		cfg:      cfg,
-	}
-
-	//See if there are any connections in the pool
-	if pool.Size() > 0 {
-		s.routingKeyInfoCache.lru = lru.New(cfg.MaxRoutingKeyInfo)
-
-		s.SetConsistency(cfg.Consistency)
-		s.SetPageSize(cfg.PageSize)
-
-		if cfg.DiscoverHosts {
-			s.hostSource = &ringDescriber{
-				session:    s,
-				dcFilter:   cfg.Discovery.DcFilter,
-				rackFilter: cfg.Discovery.RackFilter,
-				closeChan:  make(chan bool),
-			}
-
-			go s.hostSource.run(cfg.Discovery.Sleep)
-		}
-
-		return s, nil
-	}
-
-	s.Close()
-
-	return nil, ErrNoConnectionsStarted
-}
-
-// SetConsistency sets the default consistency level for this session. This
-// setting can also be changed on a per-query basis and the default value
-// is Quorum.
-func (s *Session) SetConsistency(cons Consistency) {
-	s.mu.Lock()
-	s.cons = cons
-	s.mu.Unlock()
-}
-
-// SetPageSize sets the default page size for this session. A value <= 0 will
-// disable paging. This setting can also be changed on a per-query basis.
-func (s *Session) SetPageSize(n int) {
-	s.mu.Lock()
-	s.pageSize = n
-	s.mu.Unlock()
-}
-
-// SetPrefetch sets the default threshold for pre-fetching new pages. If
-// there are only p*pageSize rows remaining, the next page will be requested
-// automatically. This value can also be changed on a per-query basis and
-// the default value is 0.25.
-func (s *Session) SetPrefetch(p float64) {
-	s.mu.Lock()
-	s.prefetch = p
-	s.mu.Unlock()
-}
-
-// SetTrace sets the default tracer for this session. This setting can also
-// be changed on a per-query basis.
-func (s *Session) SetTrace(trace Tracer) {
-	s.mu.Lock()
-	s.trace = trace
-	s.mu.Unlock()
-}
-
-// Query generates a new query object for interacting with the database.
-// Further details of the query may be tweaked using the resulting query
-// value before the query is executed. Query is automatically prepared
-// if it has not previously been executed.
-func (s *Session) Query(stmt string, values ...interface{}) *Query {
-	s.mu.RLock()
-	qry := &Query{stmt: stmt, values: values, cons: s.cons,
-		session: s, pageSize: s.pageSize, trace: s.trace,
-		prefetch: s.prefetch, rt: s.cfg.RetryPolicy, serialCons: s.cfg.SerialConsistency,
-		defaultTimestamp: s.cfg.DefaultTimestamp,
-	}
-	s.mu.RUnlock()
-	return qry
-}
-
-type QueryInfo struct {
-	Id   []byte
-	Args []ColumnInfo
-	Rval []ColumnInfo
-}
-
-// Bind generates a new query object based on the query statement passed in.
-// The query is automatically prepared if it has not previously been executed.
-// The binding callback allows the application to define which query argument
-// values will be marshalled as part of the query execution.
-// During execution, the meta data of the prepared query will be routed to the
-// binding callback, which is responsible for producing the query argument values.
-func (s *Session) Bind(stmt string, b func(q *QueryInfo) ([]interface{}, error)) *Query {
-	s.mu.RLock()
-	qry := &Query{stmt: stmt, binding: b, cons: s.cons,
-		session: s, pageSize: s.pageSize, trace: s.trace,
-		prefetch: s.prefetch, rt: s.cfg.RetryPolicy}
-	s.mu.RUnlock()
-	return qry
-}
-
-// Close closes all connections. The session is unusable after this
-// operation.
-func (s *Session) Close() {
-
-	s.closeMu.Lock()
-	defer s.closeMu.Unlock()
-	if s.isClosed {
-		return
-	}
-	s.isClosed = true
-
-	s.Pool.Close()
-
-	if s.hostSource != nil {
-		close(s.hostSource.closeChan)
-	}
-}
-
-func (s *Session) Closed() bool {
-	s.closeMu.RLock()
-	closed := s.isClosed
-	s.closeMu.RUnlock()
-	return closed
-}
-
-func (s *Session) executeQuery(qry *Query) *Iter {
-
-	// fail fast
-	if s.Closed() {
-		return &Iter{err: ErrSessionClosed}
-	}
-
-	var iter *Iter
-	qry.attempts = 0
-	qry.totalLatency = 0
-	for {
-		conn := s.Pool.Pick(qry)
-
-		//Assign the error unavailable to the iterator
-		if conn == nil {
-			iter = &Iter{err: ErrNoConnections}
-			break
-		}
-
-		t := time.Now()
-		iter = conn.executeQuery(qry)
-		qry.totalLatency += time.Now().Sub(t).Nanoseconds()
-		qry.attempts++
-
-		//Exit for loop if the query was successful
-		if iter.err == nil {
-			break
-		}
-
-		if qry.rt == nil || !qry.rt.Attempt(qry) {
-			break
-		}
-	}
-
-	return iter
-}
-
-// KeyspaceMetadata returns the schema metadata for the keyspace specified.
-func (s *Session) KeyspaceMetadata(keyspace string) (*KeyspaceMetadata, error) {
-	// fail fast
-	if s.Closed() {
-		return nil, ErrSessionClosed
-	}
-
-	if keyspace == "" {
-		return nil, ErrNoKeyspace
-	}
-
-	s.mu.Lock()
-	// lazy-init schemaDescriber
-	if s.schemaDescriber == nil {
-		s.schemaDescriber = newSchemaDescriber(s)
-	}
-	s.mu.Unlock()
-
-	return s.schemaDescriber.getSchema(keyspace)
-}
-
-// returns routing key indexes and type info
-func (s *Session) routingKeyInfo(stmt string) (*routingKeyInfo, error) {
-	s.routingKeyInfoCache.mu.Lock()
-	cacheKey := s.cfg.Keyspace + stmt
-
-	entry, cached := s.routingKeyInfoCache.lru.Get(cacheKey)
-	if cached {
-		// done accessing the cache
-		s.routingKeyInfoCache.mu.Unlock()
-		// the entry is an inflight struct similiar to that used by
-		// Conn to prepare statements
-		inflight := entry.(*inflightCachedEntry)
-
-		// wait for any inflight work
-		inflight.wg.Wait()
-
-		if inflight.err != nil {
-			return nil, inflight.err
-		}
-
-		key, _ := inflight.value.(*routingKeyInfo)
-
-		return key, nil
-	}
-
-	// create a new inflight entry while the data is created
-	inflight := new(inflightCachedEntry)
-	inflight.wg.Add(1)
-	defer inflight.wg.Done()
-	s.routingKeyInfoCache.lru.Add(cacheKey, inflight)
-	s.routingKeyInfoCache.mu.Unlock()
-
-	var (
-		prepared     *resultPreparedFrame
-		partitionKey []*ColumnMetadata
-	)
-
-	// get the query info for the statement
-	conn := s.Pool.Pick(nil)
-	if conn == nil {
-		// no connections
-		inflight.err = ErrNoConnections
-		// don't cache this error
-		s.routingKeyInfoCache.Remove(cacheKey)
-		return nil, inflight.err
-	}
-
-	prepared, inflight.err = conn.prepareStatement(stmt, nil)
-	if inflight.err != nil {
-		// don't cache this error
-		s.routingKeyInfoCache.Remove(cacheKey)
-		return nil, inflight.err
-	}
-
-	if len(prepared.reqMeta.columns) == 0 {
-		// no arguments, no routing key, and no error
-		return nil, nil
-	}
-
-	// get the table metadata
-	table := prepared.reqMeta.columns[0].Table
-
-	var keyspaceMetadata *KeyspaceMetadata
-	keyspaceMetadata, inflight.err = s.KeyspaceMetadata(s.cfg.Keyspace)
-	if inflight.err != nil {
-		// don't cache this error
-		s.routingKeyInfoCache.Remove(cacheKey)
-		return nil, inflight.err
-	}
-
-	tableMetadata, found := keyspaceMetadata.Tables[table]
-	if !found {
-		// unlikely that the statement could be prepared and the metadata for
-		// the table couldn't be found, but this may indicate either a bug
-		// in the metadata code, or that the table was just dropped.
-		inflight.err = ErrNoMetadata
-		// don't cache this error
-		s.routingKeyInfoCache.Remove(cacheKey)
-		return nil, inflight.err
-	}
-
-	partitionKey = tableMetadata.PartitionKey
-
-	size := len(partitionKey)
-	routingKeyInfo := &routingKeyInfo{
-		indexes: make([]int, size),
-		types:   make([]TypeInfo, size),
-	}
-	for keyIndex, keyColumn := range partitionKey {
-		// set an indicator for checking if the mapping is missing
-		routingKeyInfo.indexes[keyIndex] = -1
-
-		// find the column in the query info
-		for argIndex, boundColumn := range prepared.reqMeta.columns {
-			if keyColumn.Name == boundColumn.Name {
-				// there may be many such bound columns, pick the first
-				routingKeyInfo.indexes[keyIndex] = argIndex
-				routingKeyInfo.types[keyIndex] = boundColumn.TypeInfo
-				break
-			}
-		}
-
-		if routingKeyInfo.indexes[keyIndex] == -1 {
-			// missing a routing key column mapping
-			// no routing key, and no error
-			return nil, nil
-		}
-	}
-
-	// cache this result
-	inflight.value = routingKeyInfo
-
-	return routingKeyInfo, nil
-}
-
-// ExecuteBatch executes a batch operation and returns nil if successful
-// otherwise an error is returned describing the failure.
-func (s *Session) ExecuteBatch(batch *Batch) error {
-	// fail fast
-	if s.Closed() {
-		return ErrSessionClosed
-	}
-
-	// Prevent the execution of the batch if greater than the limit
-	// Currently batches have a limit of 65536 queries.
-	// https://datastax-oss.atlassian.net/browse/JAVA-229
-	if batch.Size() > BatchSizeMaximum {
-		return ErrTooManyStmts
-	}
-
-	var err error
-	batch.attempts = 0
-	batch.totalLatency = 0
-	for {
-		conn := s.Pool.Pick(nil)
-
-		//Assign the error unavailable and break loop
-		if conn == nil {
-			err = ErrNoConnections
-			break
-		}
-		t := time.Now()
-		err = conn.executeBatch(batch)
-		batch.totalLatency += time.Now().Sub(t).Nanoseconds()
-		batch.attempts++
-		//Exit loop if operation executed correctly
-		if err == nil {
-			return nil
-		}
-
-		if batch.rt == nil || !batch.rt.Attempt(batch) {
-			break
-		}
-	}
-
-	return err
-}
-
-// Query represents a CQL statement that can be executed.
-type Query struct {
-	stmt             string
-	values           []interface{}
-	cons             Consistency
-	pageSize         int
-	routingKey       []byte
-	pageState        []byte
-	prefetch         float64
-	trace            Tracer
-	session          *Session
-	rt               RetryPolicy
-	binding          func(q *QueryInfo) ([]interface{}, error)
-	attempts         int
-	totalLatency     int64
-	serialCons       SerialConsistency
-	defaultTimestamp bool
-}
-
-//Attempts returns the number of times the query was executed.
-func (q *Query) Attempts() int {
-	return q.attempts
-}
-
-//Latency returns the average amount of nanoseconds per attempt of the query.
-func (q *Query) Latency() int64 {
-	if q.attempts > 0 {
-		return q.totalLatency / int64(q.attempts)
-	}
-	return 0
-}
-
-// Consistency sets the consistency level for this query. If no consistency
-// level have been set, the default consistency level of the cluster
-// is used.
-func (q *Query) Consistency(c Consistency) *Query {
-	q.cons = c
-	return q
-}
-
-// GetConsistency returns the currently configured consistency level for
-// the query.
-func (q *Query) GetConsistency() Consistency {
-	return q.cons
-}
-
-// Trace enables tracing of this query. Look at the documentation of the
-// Tracer interface to learn more about tracing.
-func (q *Query) Trace(trace Tracer) *Query {
-	q.trace = trace
-	return q
-}
-
-// PageSize will tell the iterator to fetch the result in pages of size n.
-// This is useful for iterating over large result sets, but setting the
-// page size to low might decrease the performance. This feature is only
-// available in Cassandra 2 and onwards.
-func (q *Query) PageSize(n int) *Query {
-	q.pageSize = n
-	return q
-}
-
-// DefaultTimestamp will enable the with default timestamp flag on the query.
-// If enable, this will replace the server side assigned
-// timestamp as default timestamp. Note that a timestamp in the query itself
-// will still override this timestamp. This is entirely optional.
-//
-// Only available on protocol >= 3
-func (q *Query) DefaultTimestamp(enable bool) *Query {
-	q.defaultTimestamp = enable
-	return q
-}
-
-// RoutingKey sets the routing key to use when a token aware connection
-// pool is used to optimize the routing of this query.
-func (q *Query) RoutingKey(routingKey []byte) *Query {
-	q.routingKey = routingKey
-	return q
-}
-
-// GetRoutingKey gets the routing key to use for routing this query. If
-// a routing key has not been explicitly set, then the routing key will
-// be constructed if possible using the keyspace's schema and the query
-// info for this query statement. If the routing key cannot be determined
-// then nil will be returned with no error. On any error condition,
-// an error description will be returned.
-func (q *Query) GetRoutingKey() ([]byte, error) {
-	if q.routingKey != nil {
-		return q.routingKey, nil
-	}
-
-	// try to determine the routing key
-	routingKeyInfo, err := q.session.routingKeyInfo(q.stmt)
-	if err != nil {
-		return nil, err
-	}
-	if routingKeyInfo == nil {
-		return nil, nil
-	}
-
-	if len(routingKeyInfo.indexes) == 1 {
-		// single column routing key
-		routingKey, err := Marshal(
-			routingKeyInfo.types[0],
-			q.values[routingKeyInfo.indexes[0]],
-		)
-		if err != nil {
-			return nil, err
-		}
-		return routingKey, nil
-	}
-
-	// composite routing key
-	buf := &bytes.Buffer{}
-	for i := range routingKeyInfo.indexes {
-		encoded, err := Marshal(
-			routingKeyInfo.types[i],
-			q.values[routingKeyInfo.indexes[i]],
-		)
-		if err != nil {
-			return nil, err
-		}
-		binary.Write(buf, binary.BigEndian, int16(len(encoded)))
-		buf.Write(encoded)
-		buf.WriteByte(0x00)
-	}
-	routingKey := buf.Bytes()
-	return routingKey, nil
-}
-
-func (q *Query) shouldPrepare() bool {
-
-	stmt := strings.TrimLeftFunc(strings.TrimRightFunc(q.stmt, func(r rune) bool {
-		return unicode.IsSpace(r) || r == ';'
-	}), unicode.IsSpace)
-
-	var stmtType string
-	if n := strings.IndexFunc(stmt, unicode.IsSpace); n >= 0 {
-		stmtType = strings.ToLower(stmt[:n])
-	}
-	if stmtType == "begin" {
-		if n := strings.LastIndexFunc(stmt, unicode.IsSpace); n >= 0 {
-			stmtType = strings.ToLower(stmt[n+1:])
-		}
-	}
-	switch stmtType {
-	case "select", "insert", "update", "delete", "batch":
-		return true
-	}
-	return false
-}
-
-// SetPrefetch sets the default threshold for pre-fetching new pages. If
-// there are only p*pageSize rows remaining, the next page will be requested
-// automatically.
-func (q *Query) Prefetch(p float64) *Query {
-	q.prefetch = p
-	return q
-}
-
-// RetryPolicy sets the policy to use when retrying the query.
-func (q *Query) RetryPolicy(r RetryPolicy) *Query {
-	q.rt = r
-	return q
-}
-
-// Bind sets query arguments of query. This can also be used to rebind new query arguments
-// to an existing query instance.
-func (q *Query) Bind(v ...interface{}) *Query {
-	q.values = v
-	return q
-}
-
-// SerialConsistency sets the consistencyc level for the
-// serial phase of conditional updates. That consitency can only be
-// either SERIAL or LOCAL_SERIAL and if not present, it defaults to
-// SERIAL. This option will be ignored for anything else that a
-// conditional update/insert.
-func (q *Query) SerialConsistency(cons SerialConsistency) *Query {
-	q.serialCons = cons
-	return q
-}
-
-// Exec executes the query without returning any rows.
-func (q *Query) Exec() error {
-	iter := q.Iter()
-	return iter.err
-}
-
-// Iter executes the query and returns an iterator capable of iterating
-// over all results.
-func (q *Query) Iter() *Iter {
-	if strings.Index(strings.ToLower(q.stmt), "use") == 0 {
-		return &Iter{err: ErrUseStmt}
-	}
-	return q.session.executeQuery(q)
-}
-
-// MapScan executes the query, copies the columns of the first selected
-// row into the map pointed at by m and discards the rest. If no rows
-// were selected, ErrNotFound is returned.
-func (q *Query) MapScan(m map[string]interface{}) error {
-	iter := q.Iter()
-	if err := iter.checkErrAndNotFound(); err != nil {
-		return err
-	}
-	iter.MapScan(m)
-	return iter.Close()
-}
-
-// Scan executes the query, copies the columns of the first selected
-// row into the values pointed at by dest and discards the rest. If no rows
-// were selected, ErrNotFound is returned.
-func (q *Query) Scan(dest ...interface{}) error {
-	iter := q.Iter()
-	if err := iter.checkErrAndNotFound(); err != nil {
-		return err
-	}
-	iter.Scan(dest...)
-	return iter.Close()
-}
-
-// ScanCAS executes a lightweight transaction (i.e. an UPDATE or INSERT
-// statement containing an IF clause). If the transaction fails because
-// the existing values did not match, the previous values will be stored
-// in dest.
-func (q *Query) ScanCAS(dest ...interface{}) (applied bool, err error) {
-	iter := q.Iter()
-	if err := iter.checkErrAndNotFound(); err != nil {
-		return false, err
-	}
-	if len(iter.Columns()) > 1 {
-		dest = append([]interface{}{&applied}, dest...)
-		iter.Scan(dest...)
-	} else {
-		iter.Scan(&applied)
-	}
-	return applied, iter.Close()
-}
-
-// MapScanCAS executes a lightweight transaction (i.e. an UPDATE or INSERT
-// statement containing an IF clause). If the transaction fails because
-// the existing values did not match, the previous values will be stored
-// in dest map.
-//
-// As for INSERT .. IF NOT EXISTS, previous values will be returned as if
-// SELECT * FROM. So using ScanCAS with INSERT is inherently prone to
-// column mismatching. MapScanCAS is added to capture them safely.
-func (q *Query) MapScanCAS(dest map[string]interface{}) (applied bool, err error) {
-	iter := q.Iter()
-	if err := iter.checkErrAndNotFound(); err != nil {
-		return false, err
-	}
-	iter.MapScan(dest)
-	applied = dest["[applied]"].(bool)
-	delete(dest, "[applied]")
-
-	return applied, iter.Close()
-}
-
-// Iter represents an iterator that can be used to iterate over all rows that
-// were returned by a query. The iterator might send additional queries to the
-// database during the iteration if paging was enabled.
-type Iter struct {
-	err  error
-	pos  int
-	rows [][][]byte
-	meta resultMetadata
-	next *nextIter
-}
-
-// Columns returns the name and type of the selected columns.
-func (iter *Iter) Columns() []ColumnInfo {
-	return iter.meta.columns
-}
-
-// Scan consumes the next row of the iterator and copies the columns of the
-// current row into the values pointed at by dest. Use nil as a dest value
-// to skip the corresponding column. Scan might send additional queries
-// to the database to retrieve the next set of rows if paging was enabled.
-//
-// Scan returns true if the row was successfully unmarshaled or false if the
-// end of the result set was reached or if an error occurred. Close should
-// be called afterwards to retrieve any potential errors.
-func (iter *Iter) Scan(dest ...interface{}) bool {
-	if iter.err != nil {
-		return false
-	}
-	if iter.pos >= len(iter.rows) {
-		if iter.next != nil {
-			*iter = *iter.next.fetch()
-			return iter.Scan(dest...)
-		}
-		return false
-	}
-	if iter.next != nil && iter.pos == iter.next.pos {
-		go iter.next.fetch()
-	}
-
-	// currently only support scanning into an expand tuple, such that its the same
-	// as scanning in more values from a single column
-	if len(dest) != iter.meta.actualColCount {
-		iter.err = errors.New("count mismatch")
-		return false
-	}
-
-	// i is the current position in dest, could posible replace it and just use
-	// slices of dest
-	i := 0
-	for c, col := range iter.meta.columns {
-		if dest[i] == nil {
-			i++
-			continue
-		}
-
-		switch col.TypeInfo.Type() {
-		case TypeTuple:
-			// this will panic, actually a bug, please report
-			tuple := col.TypeInfo.(TupleTypeInfo)
-
-			count := len(tuple.Elems)
-			// here we pass in a slice of the struct which has the number number of
-			// values as elements in the tuple
-			iter.err = Unmarshal(col.TypeInfo, iter.rows[iter.pos][c], dest[i:i+count])
-			i += count
-		default:
-			iter.err = Unmarshal(col.TypeInfo, iter.rows[iter.pos][c], dest[i])
-			i++
-		}
-
-		if iter.err != nil {
-			return false
-		}
-	}
-
-	iter.pos++
-	return true
-}
-
-// Close closes the iterator and returns any errors that happened during
-// the query or the iteration.
-func (iter *Iter) Close() error {
-	return iter.err
-}
-
-// checkErrAndNotFound handle error and NotFound in one method.
-func (iter *Iter) checkErrAndNotFound() error {
-	if iter.err != nil {
-		return iter.err
-	} else if len(iter.rows) == 0 {
-		return ErrNotFound
-	}
-	return nil
-}
-
-type nextIter struct {
-	qry  Query
-	pos  int
-	once sync.Once
-	next *Iter
-}
-
-func (n *nextIter) fetch() *Iter {
-	n.once.Do(func() {
-		n.next = n.qry.session.executeQuery(&n.qry)
-	})
-	return n.next
-}
-
-type Batch struct {
-	Type             BatchType
-	Entries          []BatchEntry
-	Cons             Consistency
-	rt               RetryPolicy
-	attempts         int
-	totalLatency     int64
-	serialCons       SerialConsistency
-	defaultTimestamp bool
-}
-
-// NewBatch creates a new batch operation without defaults from the cluster
-func NewBatch(typ BatchType) *Batch {
-	return &Batch{Type: typ}
-}
-
-// NewBatch creates a new batch operation using defaults defined in the cluster
-func (s *Session) NewBatch(typ BatchType) *Batch {
-	s.mu.RLock()
-	batch := &Batch{Type: typ, rt: s.cfg.RetryPolicy, serialCons: s.cfg.SerialConsistency,
-		Cons: s.cons, defaultTimestamp: s.cfg.DefaultTimestamp}
-	s.mu.RUnlock()
-	return batch
-}
-
-// Attempts returns the number of attempts made to execute the batch.
-func (b *Batch) Attempts() int {
-	return b.attempts
-}
-
-//Latency returns the average number of nanoseconds to execute a single attempt of the batch.
-func (b *Batch) Latency() int64 {
-	if b.attempts > 0 {
-		return b.totalLatency / int64(b.attempts)
-	}
-	return 0
-}
-
-// GetConsistency returns the currently configured consistency level for the batch
-// operation.
-func (b *Batch) GetConsistency() Consistency {
-	return b.Cons
-}
-
-// Query adds the query to the batch operation
-func (b *Batch) Query(stmt string, args ...interface{}) {
-	b.Entries = append(b.Entries, BatchEntry{Stmt: stmt, Args: args})
-}
-
-// Bind adds the query to the batch operation and correlates it with a binding callback
-// that will be invoked when the batch is executed. The binding callback allows the application
-// to define which query argument values will be marshalled as part of the batch execution.
-func (b *Batch) Bind(stmt string, bind func(q *QueryInfo) ([]interface{}, error)) {
-	b.Entries = append(b.Entries, BatchEntry{Stmt: stmt, binding: bind})
-}
-
-// RetryPolicy sets the retry policy to use when executing the batch operation
-func (b *Batch) RetryPolicy(r RetryPolicy) *Batch {
-	b.rt = r
-	return b
-}
-
-// Size returns the number of batch statements to be executed by the batch operation.
-func (b *Batch) Size() int {
-	return len(b.Entries)
-}
-
-// SerialConsistency sets the consistencyc level for the
-// serial phase of conditional updates. That consitency can only be
-// either SERIAL or LOCAL_SERIAL and if not present, it defaults to
-// SERIAL. This option will be ignored for anything else that a
-// conditional update/insert.
-//
-// Only available for protocol 3 and above
-func (b *Batch) SerialConsistency(cons SerialConsistency) *Batch {
-	b.serialCons = cons
-	return b
-}
-
-// DefaultTimestamp will enable the with default timestamp flag on the query.
-// If enable, this will replace the server side assigned
-// timestamp as default timestamp. Note that a timestamp in the query itself
-// will still override this timestamp. This is entirely optional.
-//
-// Only available on protocol >= 3
-func (b *Batch) DefaultTimestamp(enable bool) *Batch {
-	b.defaultTimestamp = enable
-	return b
-}
-
-type BatchType byte
-
-const (
-	LoggedBatch   BatchType = 0
-	UnloggedBatch           = 1
-	CounterBatch            = 2
-)
-
-type BatchEntry struct {
-	Stmt    string
-	Args    []interface{}
-	binding func(q *QueryInfo) ([]interface{}, error)
-}
-
-type ColumnInfo struct {
-	Keyspace string
-	Table    string
-	Name     string
-	TypeInfo TypeInfo
-}
-
-func (c ColumnInfo) String() string {
-	return fmt.Sprintf("[column keyspace=%s table=%s name=%s type=%v]", c.Keyspace, c.Table, c.Name, c.TypeInfo)
-}
-
-// routing key indexes LRU cache
-type routingKeyInfoLRU struct {
-	lru *lru.Cache
-	mu  sync.Mutex
-}
-
-type routingKeyInfo struct {
-	indexes []int
-	types   []TypeInfo
-}
-
-func (r *routingKeyInfoLRU) Remove(key string) {
-	r.mu.Lock()
-	r.lru.Remove(key)
-	r.mu.Unlock()
-}
-
-//Max adjusts the maximum size of the cache and cleans up the oldest records if
-//the new max is lower than the previous value. Not concurrency safe.
-func (r *routingKeyInfoLRU) Max(max int) {
-	r.mu.Lock()
-	for r.lru.Len() > max {
-		r.lru.RemoveOldest()
-	}
-	r.lru.MaxEntries = max
-	r.mu.Unlock()
-}
-
-type inflightCachedEntry struct {
-	wg    sync.WaitGroup
-	err   error
-	value interface{}
-}
-
-// Tracer is the interface implemented by query tracers. Tracers have the
-// ability to obtain a detailed event log of all events that happened during
-// the execution of a query from Cassandra. Gathering this information might
-// be essential for debugging and optimizing queries, but this feature should
-// not be used on production systems with very high load.
-type Tracer interface {
-	Trace(traceId []byte)
-}
-
-type traceWriter struct {
-	session *Session
-	w       io.Writer
-	mu      sync.Mutex
-}
-
-// NewTraceWriter returns a simple Tracer implementation that outputs
-// the event log in a textual format.
-func NewTraceWriter(session *Session, w io.Writer) Tracer {
-	return &traceWriter{session: session, w: w}
-}
-
-func (t *traceWriter) Trace(traceId []byte) {
-	var (
-		coordinator string
-		duration    int
-	)
-	t.session.Query(`SELECT coordinator, duration
-			FROM system_traces.sessions
-			WHERE session_id = ?`, traceId).
-		Consistency(One).Scan(&coordinator, &duration)
-
-	iter := t.session.Query(`SELECT event_id, activity, source, source_elapsed
-			FROM system_traces.events
-			WHERE session_id = ?`, traceId).
-		Consistency(One).Iter()
-	var (
-		timestamp time.Time
-		activity  string
-		source    string
-		elapsed   int
-	)
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	fmt.Fprintf(t.w, "Tracing session %016x (coordinator: %s, duration: %v):\n",
-		traceId, coordinator, time.Duration(duration)*time.Microsecond)
-	for iter.Scan(&timestamp, &activity, &source, &elapsed) {
-		fmt.Fprintf(t.w, "%s: %s (source: %s, elapsed: %d)\n",
-			timestamp.Format("2006/01/02 15:04:05.999999"), activity, source, elapsed)
-	}
-	if err := iter.Close(); err != nil {
-		fmt.Fprintln(t.w, "Error:", err)
-	}
-}
-
-type Error struct {
-	Code    int
-	Message string
-}
-
-func (e Error) Error() string {
-	return e.Message
-}
-
-var (
-	ErrNotFound      = errors.New("not found")
-	ErrUnavailable   = errors.New("unavailable")
-	ErrUnsupported   = errors.New("feature not supported")
-	ErrTooManyStmts  = errors.New("too many statements")
-	ErrUseStmt       = errors.New("use statements aren't supported. Please see https://github.com/gocql/gocql for explaination.")
-	ErrSessionClosed = errors.New("session has been closed")
-	ErrNoConnections = errors.New("no connections available")
-	ErrNoKeyspace    = errors.New("no keyspace provided")
-	ErrNoMetadata    = errors.New("no metadata available")
-)
-
-type ErrProtocol struct{ error }
-
-func NewErrProtocol(format string, args ...interface{}) error {
-	return ErrProtocol{fmt.Errorf(format, args...)}
-}
-
-// BatchSizeMaximum is the maximum number of statements a batch operation can have.
-// This limit is set by cassandra and could change in the future.
-const BatchSizeMaximum = 65535
diff --git a/vendor/github.com/gocql/gocql/session_test.go b/vendor/github.com/gocql/gocql/session_test.go
deleted file mode 100644
index fa41b6689..000000000
--- a/vendor/github.com/gocql/gocql/session_test.go
+++ /dev/null
@@ -1,255 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestSessionAPI(t *testing.T) {
-
-	cfg := &ClusterConfig{}
-	pool, err := NewSimplePool(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := &Session{
-		Pool: pool,
-		cfg:  *cfg,
-		cons: Quorum,
-	}
-
-	defer s.Close()
-
-	s.SetConsistency(All)
-	if s.cons != All {
-		t.Fatalf("expected consistency 'All', got '%v'", s.cons)
-	}
-
-	s.SetPageSize(100)
-	if s.pageSize != 100 {
-		t.Fatalf("expected pageSize 100, got %v", s.pageSize)
-	}
-
-	s.SetPrefetch(0.75)
-	if s.prefetch != 0.75 {
-		t.Fatalf("expceted prefetch 0.75, got %v", s.prefetch)
-	}
-
-	trace := &traceWriter{}
-
-	s.SetTrace(trace)
-	if s.trace != trace {
-		t.Fatalf("expected traceWriter '%v',got '%v'", trace, s.trace)
-	}
-
-	qry := s.Query("test", 1)
-	if v, ok := qry.values[0].(int); !ok {
-		t.Fatalf("expected qry.values[0] to be an int, got %v", qry.values[0])
-	} else if v != 1 {
-		t.Fatalf("expceted qry.values[0] to be 1, got %v", v)
-	} else if qry.stmt != "test" {
-		t.Fatalf("expected qry.stmt to be 'test', got '%v'", qry.stmt)
-	}
-
-	boundQry := s.Bind("test", func(q *QueryInfo) ([]interface{}, error) {
-		return nil, nil
-	})
-	if boundQry.binding == nil {
-		t.Fatal("expected qry.binding to be defined, got nil")
-	} else if boundQry.stmt != "test" {
-		t.Fatalf("expected qry.stmt to be 'test', got '%v'", boundQry.stmt)
-	}
-
-	itr := s.executeQuery(qry)
-	if itr.err != ErrNoConnections {
-		t.Fatalf("expected itr.err to be '%v', got '%v'", ErrNoConnections, itr.err)
-	}
-
-	testBatch := s.NewBatch(LoggedBatch)
-	testBatch.Query("test")
-	err = s.ExecuteBatch(testBatch)
-
-	if err != ErrNoConnections {
-		t.Fatalf("expected session.ExecuteBatch to return '%v', got '%v'", ErrNoConnections, err)
-	}
-
-	s.Close()
-	if !s.Closed() {
-		t.Fatal("expected s.Closed() to be true, got false")
-	}
-	//Should just return cleanly
-	s.Close()
-
-	err = s.ExecuteBatch(testBatch)
-	if err != ErrSessionClosed {
-		t.Fatalf("expected session.ExecuteBatch to return '%v', got '%v'", ErrSessionClosed, err)
-	}
-}
-
-func TestQueryBasicAPI(t *testing.T) {
-	qry := &Query{}
-
-	if qry.Latency() != 0 {
-		t.Fatalf("expected Query.Latency() to return 0, got %v", qry.Latency())
-	}
-
-	qry.attempts = 2
-	qry.totalLatency = 4
-	if qry.Attempts() != 2 {
-		t.Fatalf("expected Query.Attempts() to return 2, got %v", qry.Attempts())
-	}
-	if qry.Latency() != 2 {
-		t.Fatalf("expected Query.Latency() to return 2, got %v", qry.Latency())
-	}
-
-	qry.Consistency(All)
-	if qry.GetConsistency() != All {
-		t.Fatalf("expected Query.GetConsistency to return 'All', got '%s'", qry.GetConsistency())
-	}
-
-	trace := &traceWriter{}
-	qry.Trace(trace)
-	if qry.trace != trace {
-		t.Fatalf("expected Query.Trace to be '%v', got '%v'", trace, qry.trace)
-	}
-
-	qry.PageSize(10)
-	if qry.pageSize != 10 {
-		t.Fatalf("expected Query.PageSize to be 10, got %v", qry.pageSize)
-	}
-
-	qry.Prefetch(0.75)
-	if qry.prefetch != 0.75 {
-		t.Fatalf("expected Query.Prefetch to be 0.75, got %v", qry.prefetch)
-	}
-
-	rt := &SimpleRetryPolicy{NumRetries: 3}
-	if qry.RetryPolicy(rt); qry.rt != rt {
-		t.Fatalf("expected Query.RetryPolicy to be '%v', got '%v'", rt, qry.rt)
-	}
-
-	qry.Bind(qry)
-	if qry.values[0] != qry {
-		t.Fatalf("expected Query.Values[0] to be '%v', got '%v'", qry, qry.values[0])
-	}
-}
-
-func TestQueryShouldPrepare(t *testing.T) {
-	toPrepare := []string{"select * ", "INSERT INTO", "update table", "delete from", "begin batch"}
-	cantPrepare := []string{"create table", "USE table", "LIST keyspaces", "alter table", "drop table", "grant user", "revoke user"}
-	q := &Query{}
-
-	for i := 0; i < len(toPrepare); i++ {
-		q.stmt = toPrepare[i]
-		if !q.shouldPrepare() {
-			t.Fatalf("expected Query.shouldPrepare to return true, got false for statement '%v'", toPrepare[i])
-		}
-	}
-
-	for i := 0; i < len(cantPrepare); i++ {
-		q.stmt = cantPrepare[i]
-		if q.shouldPrepare() {
-			t.Fatalf("expected Query.shouldPrepare to return false, got true for statement '%v'", cantPrepare[i])
-		}
-	}
-}
-
-func TestBatchBasicAPI(t *testing.T) {
-
-	cfg := &ClusterConfig{RetryPolicy: &SimpleRetryPolicy{NumRetries: 2}}
-	pool, err := NewSimplePool(cfg)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := &Session{
-		Pool: pool,
-		cfg:  *cfg,
-		cons: Quorum,
-	}
-	defer s.Close()
-
-	b := s.NewBatch(UnloggedBatch)
-	if b.Type != UnloggedBatch {
-		t.Fatalf("expceted batch.Type to be '%v', got '%v'", UnloggedBatch, b.Type)
-	} else if b.rt != cfg.RetryPolicy {
-		t.Fatalf("expceted batch.RetryPolicy to be '%v', got '%v'", cfg.RetryPolicy, b.rt)
-	}
-
-	b = NewBatch(LoggedBatch)
-	if b.Type != LoggedBatch {
-		t.Fatalf("expected batch.Type to be '%v', got '%v'", LoggedBatch, b.Type)
-	}
-
-	b.attempts = 1
-	if b.Attempts() != 1 {
-		t.Fatalf("expceted batch.Attempts() to return %v, got %v", 1, b.Attempts())
-	}
-
-	if b.Latency() != 0 {
-		t.Fatalf("expected batch.Latency() to be 0, got %v", b.Latency())
-	}
-
-	b.totalLatency = 4
-	if b.Latency() != 4 {
-		t.Fatalf("expected batch.Latency() to return %v, got %v", 4, b.Latency())
-	}
-
-	b.Cons = One
-	if b.GetConsistency() != One {
-		t.Fatalf("expected batch.GetConsistency() to return 'One', got '%s'", b.GetConsistency())
-	}
-
-	b.Query("test", 1)
-	if b.Entries[0].Stmt != "test" {
-		t.Fatalf("expected batch.Entries[0].Stmt to be 'test', got '%v'", b.Entries[0].Stmt)
-	} else if b.Entries[0].Args[0].(int) != 1 {
-		t.Fatalf("expected batch.Entries[0].Args[0] to be 1, got %v", b.Entries[0].Args[0])
-	}
-
-	b.Bind("test2", func(q *QueryInfo) ([]interface{}, error) {
-		return nil, nil
-	})
-
-	if b.Entries[1].Stmt != "test2" {
-		t.Fatalf("expected batch.Entries[1].Stmt to be 'test2', got '%v'", b.Entries[1].Stmt)
-	} else if b.Entries[1].binding == nil {
-		t.Fatal("expected batch.Entries[1].binding to be defined, got nil")
-	}
-	r := &SimpleRetryPolicy{NumRetries: 4}
-
-	b.RetryPolicy(r)
-	if b.rt != r {
-		t.Fatalf("expected batch.RetryPolicy to be '%v', got '%v'", r, b.rt)
-	}
-
-	if b.Size() != 2 {
-		t.Fatalf("expected batch.Size() to return 2, got %v", b.Size())
-	}
-
-}
-
-func TestConsistencyNames(t *testing.T) {
-	names := map[fmt.Stringer]string{
-		Any:         "ANY",
-		One:         "ONE",
-		Two:         "TWO",
-		Three:       "THREE",
-		Quorum:      "QUORUM",
-		All:         "ALL",
-		LocalQuorum: "LOCAL_QUORUM",
-		EachQuorum:  "EACH_QUORUM",
-		Serial:      "SERIAL",
-		LocalSerial: "LOCAL_SERIAL",
-		LocalOne:    "LOCAL_ONE",
-	}
-
-	for k, v := range names {
-		if k.String() != v {
-			t.Fatalf("expected '%v', got '%v'", v, k.String())
-		}
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/stress_test.go b/vendor/github.com/gocql/gocql/stress_test.go
deleted file mode 100644
index 57e07085d..000000000
--- a/vendor/github.com/gocql/gocql/stress_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"sync/atomic"
-
-	"testing"
-)
-
-func BenchmarkConnStress(b *testing.B) {
-	const workers = 16
-
-	cluster := createCluster()
-	cluster.NumConns = 1
-	cluster.NumStreams = workers
-	session := createSessionFromCluster(cluster, b)
-	defer session.Close()
-
-	if err := createTable(session, "CREATE TABLE IF NOT EXISTS conn_stress (id int primary key)"); err != nil {
-		b.Fatal(err)
-	}
-
-	var seed uint64
-	writer := func(pb *testing.PB) {
-		seed := atomic.AddUint64(&seed, 1)
-		var i uint64 = 0
-		for pb.Next() {
-			if err := session.Query("insert into conn_stress (id) values (?)", i*seed).Exec(); err != nil {
-				b.Error(err)
-				return
-			}
-			i++
-		}
-	}
-
-	b.SetParallelism(workers)
-	b.RunParallel(writer)
-
-}
diff --git a/vendor/github.com/gocql/gocql/token.go b/vendor/github.com/gocql/gocql/token.go
deleted file mode 100644
index 00541707d..000000000
--- a/vendor/github.com/gocql/gocql/token.go
+++ /dev/null
@@ -1,348 +0,0 @@
-// Copyright (c) 2015 The gocql 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 gocql
-
-import (
-	"bytes"
-	"crypto/md5"
-	"fmt"
-	"math/big"
-	"sort"
-	"strconv"
-	"strings"
-	"unsafe"
-)
-
-// a token partitioner
-type partitioner interface {
-	Name() string
-	Hash([]byte) token
-	ParseString(string) token
-}
-
-// a token
-type token interface {
-	fmt.Stringer
-	Less(token) bool
-}
-
-// murmur3 partitioner and token
-type murmur3Partitioner struct{}
-type murmur3Token int64
-
-func (p murmur3Partitioner) Name() string {
-	return "Murmur3Partitioner"
-}
-
-func (p murmur3Partitioner) Hash(partitionKey []byte) token {
-	h1 := murmur3H1(partitionKey)
-	return murmur3Token(int64(h1))
-}
-
-// murmur3 little-endian, 128-bit hash, but returns only h1
-func murmur3H1(data []byte) uint64 {
-	length := len(data)
-
-	var h1, h2, k1, k2 uint64
-
-	const (
-		c1 = 0x87c37b91114253d5
-		c2 = 0x4cf5ad432745937f
-	)
-
-	// body
-	nBlocks := length / 16
-	for i := 0; i < nBlocks; i++ {
-		block := (*[2]uint64)(unsafe.Pointer(&data[i*16]))
-
-		k1 = block[0]
-		k2 = block[1]
-
-		k1 *= c1
-		k1 = (k1 << 31) | (k1 >> 33) // ROTL64(k1, 31)
-		k1 *= c2
-		h1 ^= k1
-
-		h1 = (h1 << 27) | (h1 >> 37) // ROTL64(h1, 27)
-		h1 += h2
-		h1 = h1*5 + 0x52dce729
-
-		k2 *= c2
-		k2 = (k2 << 33) | (k2 >> 31) // ROTL64(k2, 33)
-		k2 *= c1
-		h2 ^= k2
-
-		h2 = (h2 << 31) | (h2 >> 33) // ROTL64(h2, 31)
-		h2 += h1
-		h2 = h2*5 + 0x38495ab5
-	}
-
-	// tail
-	tail := data[nBlocks*16:]
-	k1 = 0
-	k2 = 0
-	switch length & 15 {
-	case 15:
-		k2 ^= uint64(tail[14]) << 48
-		fallthrough
-	case 14:
-		k2 ^= uint64(tail[13]) << 40
-		fallthrough
-	case 13:
-		k2 ^= uint64(tail[12]) << 32
-		fallthrough
-	case 12:
-		k2 ^= uint64(tail[11]) << 24
-		fallthrough
-	case 11:
-		k2 ^= uint64(tail[10]) << 16
-		fallthrough
-	case 10:
-		k2 ^= uint64(tail[9]) << 8
-		fallthrough
-	case 9:
-		k2 ^= uint64(tail[8])
-
-		k2 *= c2
-		k2 = (k2 << 33) | (k2 >> 31) // ROTL64(k2, 33)
-		k2 *= c1
-		h2 ^= k2
-
-		fallthrough
-	case 8:
-		k1 ^= uint64(tail[7]) << 56
-		fallthrough
-	case 7:
-		k1 ^= uint64(tail[6]) << 48
-		fallthrough
-	case 6:
-		k1 ^= uint64(tail[5]) << 40
-		fallthrough
-	case 5:
-		k1 ^= uint64(tail[4]) << 32
-		fallthrough
-	case 4:
-		k1 ^= uint64(tail[3]) << 24
-		fallthrough
-	case 3:
-		k1 ^= uint64(tail[2]) << 16
-		fallthrough
-	case 2:
-		k1 ^= uint64(tail[1]) << 8
-		fallthrough
-	case 1:
-		k1 ^= uint64(tail[0])
-
-		k1 *= c1
-		k1 = (k1 << 31) | (k1 >> 33) // ROTL64(k1, 31)
-		k1 *= c2
-		h1 ^= k1
-	}
-
-	h1 ^= uint64(length)
-	h2 ^= uint64(length)
-
-	h1 += h2
-	h2 += h1
-
-	// finalizer
-	const (
-		fmix1 = 0xff51afd7ed558ccd
-		fmix2 = 0xc4ceb9fe1a85ec53
-	)
-
-	// fmix64(h1)
-	h1 ^= h1 >> 33
-	h1 *= fmix1
-	h1 ^= h1 >> 33
-	h1 *= fmix2
-	h1 ^= h1 >> 33
-
-	// fmix64(h2)
-	h2 ^= h2 >> 33
-	h2 *= fmix1
-	h2 ^= h2 >> 33
-	h2 *= fmix2
-	h2 ^= h2 >> 33
-
-	h1 += h2
-	// the following is extraneous since h2 is discarded
-	// h2 += h1
-
-	return h1
-}
-
-func (p murmur3Partitioner) ParseString(str string) token {
-	val, _ := strconv.ParseInt(str, 10, 64)
-	return murmur3Token(val)
-}
-
-func (m murmur3Token) String() string {
-	return strconv.FormatInt(int64(m), 10)
-}
-
-func (m murmur3Token) Less(token token) bool {
-	return m < token.(murmur3Token)
-}
-
-// order preserving partitioner and token
-type orderedPartitioner struct{}
-type orderedToken []byte
-
-func (p orderedPartitioner) Name() string {
-	return "OrderedPartitioner"
-}
-
-func (p orderedPartitioner) Hash(partitionKey []byte) token {
-	// the partition key is the token
-	return orderedToken(partitionKey)
-}
-
-func (p orderedPartitioner) ParseString(str string) token {
-	return orderedToken([]byte(str))
-}
-
-func (o orderedToken) String() string {
-	return string([]byte(o))
-}
-
-func (o orderedToken) Less(token token) bool {
-	return -1 == bytes.Compare(o, token.(orderedToken))
-}
-
-// random partitioner and token
-type randomPartitioner struct{}
-type randomToken big.Int
-
-func (r randomPartitioner) Name() string {
-	return "RandomPartitioner"
-}
-
-func (p randomPartitioner) Hash(partitionKey []byte) token {
-	hash := md5.New()
-	sum := hash.Sum(partitionKey)
-
-	val := new(big.Int)
-	val = val.SetBytes(sum)
-	val = val.Abs(val)
-
-	return (*randomToken)(val)
-}
-
-func (p randomPartitioner) ParseString(str string) token {
-	val := new(big.Int)
-	val.SetString(str, 10)
-	return (*randomToken)(val)
-}
-
-func (r *randomToken) String() string {
-	return (*big.Int)(r).String()
-}
-
-func (r *randomToken) Less(token token) bool {
-	return -1 == (*big.Int)(r).Cmp((*big.Int)(token.(*randomToken)))
-}
-
-// a data structure for organizing the relationship between tokens and hosts
-type tokenRing struct {
-	partitioner partitioner
-	tokens      []token
-	hosts       []*HostInfo
-}
-
-func newTokenRing(partitioner string, hosts []HostInfo) (*tokenRing, error) {
-	tokenRing := &tokenRing{
-		tokens: []token{},
-		hosts:  []*HostInfo{},
-	}
-
-	if strings.HasSuffix(partitioner, "Murmur3Partitioner") {
-		tokenRing.partitioner = murmur3Partitioner{}
-	} else if strings.HasSuffix(partitioner, "OrderedPartitioner") {
-		tokenRing.partitioner = orderedPartitioner{}
-	} else if strings.HasSuffix(partitioner, "RandomPartitioner") {
-		tokenRing.partitioner = randomPartitioner{}
-	} else {
-		return nil, fmt.Errorf("Unsupported partitioner '%s'", partitioner)
-	}
-
-	for i := range hosts {
-		host := &hosts[i]
-		for _, strToken := range host.Tokens {
-			token := tokenRing.partitioner.ParseString(strToken)
-			tokenRing.tokens = append(tokenRing.tokens, token)
-			tokenRing.hosts = append(tokenRing.hosts, host)
-		}
-	}
-
-	sort.Sort(tokenRing)
-
-	return tokenRing, nil
-}
-
-func (t *tokenRing) Len() int {
-	return len(t.tokens)
-}
-
-func (t *tokenRing) Less(i, j int) bool {
-	return t.tokens[i].Less(t.tokens[j])
-}
-
-func (t *tokenRing) Swap(i, j int) {
-	t.tokens[i], t.hosts[i], t.tokens[j], t.hosts[j] =
-		t.tokens[j], t.hosts[j], t.tokens[i], t.hosts[i]
-}
-
-func (t *tokenRing) String() string {
-
-	buf := &bytes.Buffer{}
-	buf.WriteString("TokenRing(")
-	if t.partitioner != nil {
-		buf.WriteString(t.partitioner.Name())
-	}
-	buf.WriteString("){")
-	sep := ""
-	for i := range t.tokens {
-		buf.WriteString(sep)
-		sep = ","
-		buf.WriteString("\n\t[")
-		buf.WriteString(strconv.Itoa(i))
-		buf.WriteString("]")
-		buf.WriteString(t.tokens[i].String())
-		buf.WriteString(":")
-		buf.WriteString(t.hosts[i].Peer)
-	}
-	buf.WriteString("\n}")
-	return string(buf.Bytes())
-}
-
-func (t *tokenRing) GetHostForPartitionKey(partitionKey []byte) *HostInfo {
-	if t == nil {
-		return nil
-	}
-
-	token := t.partitioner.Hash(partitionKey)
-	return t.GetHostForToken(token)
-}
-
-func (t *tokenRing) GetHostForToken(token token) *HostInfo {
-	if t == nil {
-		return nil
-	}
-
-	// find the primary replica
-	ringIndex := sort.Search(
-		len(t.tokens),
-		func(i int) bool {
-			return !t.tokens[i].Less(token)
-		},
-	)
-	if ringIndex == len(t.tokens) {
-		// wrap around to the first in the ring
-		ringIndex = 0
-	}
-	host := t.hosts[ringIndex]
-	return host
-}
diff --git a/vendor/github.com/gocql/gocql/token_test.go b/vendor/github.com/gocql/gocql/token_test.go
deleted file mode 100644
index c17585ed4..000000000
--- a/vendor/github.com/gocql/gocql/token_test.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Copyright (c) 2015 The gocql 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 gocql
-
-import (
-	"bytes"
-	"math/big"
-	"sort"
-	"strconv"
-	"testing"
-)
-
-// Test the implementation of murmur3
-func TestMurmur3H1(t *testing.T) {
-	// these examples are based on adding a index number to a sample string in
-	// a loop. The expected values were generated by the java datastax murmur3
-	// implementation. The number of examples here of increasing lengths ensure
-	// test coverage of all tail-length branches in the murmur3 algorithm
-	seriesExpected := [...]uint64{
-		0x0000000000000000, // ""
-		0x2ac9debed546a380, // "0"
-		0x649e4eaa7fc1708e, // "01"
-		0xce68f60d7c353bdb, // "012"
-		0x0f95757ce7f38254, // "0123"
-		0x0f04e459497f3fc1, // "01234"
-		0x88c0a92586be0a27, // "012345"
-		0x13eb9fb82606f7a6, // "0123456"
-		0x8236039b7387354d, // "01234567"
-		0x4c1e87519fe738ba, // "012345678"
-		0x3f9652ac3effeb24, // "0123456789"
-		0x3f33760ded9006c6, // "01234567890"
-		0xaed70a6631854cb1, // "012345678901"
-		0x8a299a8f8e0e2da7, // "0123456789012"
-		0x624b675c779249a6, // "01234567890123"
-		0xa4b203bb1d90b9a3, // "012345678901234"
-		0xa3293ad698ecb99a, // "0123456789012345"
-		0xbc740023dbd50048, // "01234567890123456"
-		0x3fe5ab9837d25cdd, // "012345678901234567"
-		0x2d0338c1ca87d132, // "0123456789012345678"
-	}
-	sample := ""
-	for i, expected := range seriesExpected {
-		assertMurmur3H1(t, []byte(sample), expected)
-
-		sample = sample + strconv.Itoa(i%10)
-	}
-
-	// Here are some test examples from other driver implementations
-	assertMurmur3H1(t, []byte("hello"), 0xcbd8a7b341bd9b02)
-	assertMurmur3H1(t, []byte("hello, world"), 0x342fac623a5ebc8e)
-	assertMurmur3H1(t, []byte("19 Jan 2038 at 3:14:07 AM"), 0xb89e5988b737affc)
-	assertMurmur3H1(t, []byte("The quick brown fox jumps over the lazy dog."), 0xcd99481f9ee902c9)
-}
-
-// helper function for testing the murmur3 implementation
-func assertMurmur3H1(t *testing.T, data []byte, expected uint64) {
-	actual := murmur3H1(data)
-	if actual != expected {
-		t.Errorf("Expected h1 = %x for data = %x, but was %x", expected, data, actual)
-	}
-}
-
-// Benchmark of the performance of the murmur3 implementation
-func BenchmarkMurmur3H1(b *testing.B) {
-	var h1 uint64
-	var data [1024]byte
-	for i := 0; i < 1024; i++ {
-		data[i] = byte(i)
-	}
-	for i := 0; i < b.N; i++ {
-		b.ResetTimer()
-		h1 = murmur3H1(data[:])
-		_ = murmur3Token(int64(h1))
-	}
-}
-
-// Tests of the murmur3Patitioner
-func TestMurmur3Partitioner(t *testing.T) {
-	token := murmur3Partitioner{}.ParseString("-1053604476080545076")
-
-	if "-1053604476080545076" != token.String() {
-		t.Errorf("Expected '-1053604476080545076' but was '%s'", token)
-	}
-
-	// at least verify that the partitioner
-	// doesn't return nil
-	pk, _ := marshalInt(nil, 1)
-	token = murmur3Partitioner{}.Hash(pk)
-	if token == nil {
-		t.Fatal("token was nil")
-	}
-}
-
-// Tests of the murmur3Token
-func TestMurmur3Token(t *testing.T) {
-	if murmur3Token(42).Less(murmur3Token(42)) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-	if !murmur3Token(-42).Less(murmur3Token(42)) {
-		t.Errorf("Expected Less to return true, but was false")
-	}
-	if murmur3Token(42).Less(murmur3Token(-42)) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-}
-
-// Tests of the orderedPartitioner
-func TestOrderedPartitioner(t *testing.T) {
-	// at least verify that the partitioner
-	// doesn't return nil
-	p := orderedPartitioner{}
-	pk, _ := marshalInt(nil, 1)
-	token := p.Hash(pk)
-	if token == nil {
-		t.Fatal("token was nil")
-	}
-
-	str := token.String()
-	parsedToken := p.ParseString(str)
-
-	if !bytes.Equal([]byte(token.(orderedToken)), []byte(parsedToken.(orderedToken))) {
-		t.Errorf("Failed to convert to and from a string %s expected %x but was %x",
-			str,
-			[]byte(token.(orderedToken)),
-			[]byte(parsedToken.(orderedToken)),
-		)
-	}
-}
-
-// Tests of the orderedToken
-func TestOrderedToken(t *testing.T) {
-	if orderedToken([]byte{0, 0, 4, 2}).Less(orderedToken([]byte{0, 0, 4, 2})) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-	if !orderedToken([]byte{0, 0, 3}).Less(orderedToken([]byte{0, 0, 4, 2})) {
-		t.Errorf("Expected Less to return true, but was false")
-	}
-	if orderedToken([]byte{0, 0, 4, 2}).Less(orderedToken([]byte{0, 0, 3})) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-}
-
-// Tests of the randomPartitioner
-func TestRandomPartitioner(t *testing.T) {
-	// at least verify that the partitioner
-	// doesn't return nil
-	p := randomPartitioner{}
-	pk, _ := marshalInt(nil, 1)
-	token := p.Hash(pk)
-	if token == nil {
-		t.Fatal("token was nil")
-	}
-
-	str := token.String()
-	parsedToken := p.ParseString(str)
-
-	if (*big.Int)(token.(*randomToken)).Cmp((*big.Int)(parsedToken.(*randomToken))) != 0 {
-		t.Errorf("Failed to convert to and from a string %s expected %v but was %v",
-			str,
-			token,
-			parsedToken,
-		)
-	}
-}
-
-// Tests of the randomToken
-func TestRandomToken(t *testing.T) {
-	if ((*randomToken)(big.NewInt(42))).Less((*randomToken)(big.NewInt(42))) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-	if !((*randomToken)(big.NewInt(41))).Less((*randomToken)(big.NewInt(42))) {
-		t.Errorf("Expected Less to return true, but was false")
-	}
-	if ((*randomToken)(big.NewInt(42))).Less((*randomToken)(big.NewInt(41))) {
-		t.Errorf("Expected Less to return false, but was true")
-	}
-}
-
-type intToken int
-
-func (i intToken) String() string {
-	return strconv.Itoa(int(i))
-}
-
-func (i intToken) Less(token token) bool {
-	return i < token.(intToken)
-}
-
-// Test of the token ring implementation based on example at the start of this
-// page of documentation:
-// http://www.datastax.com/docs/0.8/cluster_architecture/partitioning
-func TestIntTokenRing(t *testing.T) {
-	host0 := &HostInfo{}
-	host25 := &HostInfo{}
-	host50 := &HostInfo{}
-	host75 := &HostInfo{}
-	ring := &tokenRing{
-		partitioner: nil,
-		// these tokens and hosts are out of order to test sorting
-		tokens: []token{
-			intToken(0),
-			intToken(50),
-			intToken(75),
-			intToken(25),
-		},
-		hosts: []*HostInfo{
-			host0,
-			host50,
-			host75,
-			host25,
-		},
-	}
-
-	sort.Sort(ring)
-
-	if ring.GetHostForToken(intToken(0)) != host0 {
-		t.Error("Expected host 0 for token 0")
-	}
-	if ring.GetHostForToken(intToken(1)) != host25 {
-		t.Error("Expected host 25 for token 1")
-	}
-	if ring.GetHostForToken(intToken(24)) != host25 {
-		t.Error("Expected host 25 for token 24")
-	}
-	if ring.GetHostForToken(intToken(25)) != host25 {
-		t.Error("Expected host 25 for token 25")
-	}
-	if ring.GetHostForToken(intToken(26)) != host50 {
-		t.Error("Expected host 50 for token 26")
-	}
-	if ring.GetHostForToken(intToken(49)) != host50 {
-		t.Error("Expected host 50 for token 49")
-	}
-	if ring.GetHostForToken(intToken(50)) != host50 {
-		t.Error("Expected host 50 for token 50")
-	}
-	if ring.GetHostForToken(intToken(51)) != host75 {
-		t.Error("Expected host 75 for token 51")
-	}
-	if ring.GetHostForToken(intToken(74)) != host75 {
-		t.Error("Expected host 75 for token 74")
-	}
-	if ring.GetHostForToken(intToken(75)) != host75 {
-		t.Error("Expected host 75 for token 75")
-	}
-	if ring.GetHostForToken(intToken(76)) != host0 {
-		t.Error("Expected host 0 for token 76")
-	}
-	if ring.GetHostForToken(intToken(99)) != host0 {
-		t.Error("Expected host 0 for token 99")
-	}
-	if ring.GetHostForToken(intToken(100)) != host0 {
-		t.Error("Expected host 0 for token 100")
-	}
-}
-
-// Test for the behavior of a nil pointer to tokenRing
-func TestNilTokenRing(t *testing.T) {
-	var ring *tokenRing = nil
-
-	if ring.GetHostForToken(nil) != nil {
-		t.Error("Expected nil for nil token ring")
-	}
-	if ring.GetHostForPartitionKey(nil) != nil {
-		t.Error("Expected nil for nil token ring")
-	}
-}
-
-// Test of the recognition of the partitioner class
-func TestUnknownTokenRing(t *testing.T) {
-	_, err := newTokenRing("UnknownPartitioner", nil)
-	if err == nil {
-		t.Error("Expected error for unknown partitioner value, but was nil")
-	}
-}
-
-// Test of the tokenRing with the Murmur3Partitioner
-func TestMurmur3TokenRing(t *testing.T) {
-	// Note, strings are parsed directly to int64, they are not murmur3 hashed
-	var hosts []HostInfo = []HostInfo{
-		HostInfo{
-			Peer:   "0",
-			Tokens: []string{"0"},
-		},
-		HostInfo{
-			Peer:   "1",
-			Tokens: []string{"25"},
-		},
-		HostInfo{
-			Peer:   "2",
-			Tokens: []string{"50"},
-		},
-		HostInfo{
-			Peer:   "3",
-			Tokens: []string{"75"},
-		},
-	}
-	ring, err := newTokenRing("Murmur3Partitioner", hosts)
-	if err != nil {
-		t.Fatalf("Failed to create token ring due to error: %v", err)
-	}
-
-	p := murmur3Partitioner{}
-
-	var actual *HostInfo
-	actual = ring.GetHostForToken(p.ParseString("0"))
-	if actual.Peer != "0" {
-		t.Errorf("Expected peer 0 for token \"0\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("25"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"25\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("50"))
-	if actual.Peer != "2" {
-		t.Errorf("Expected peer 2 for token \"50\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("75"))
-	if actual.Peer != "3" {
-		t.Errorf("Expected peer 3 for token \"01\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("12"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"12\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("24324545443332"))
-	if actual.Peer != "0" {
-		t.Errorf("Expected peer 0 for token \"24324545443332\", but was %s", actual.Peer)
-	}
-}
-
-// Test of the tokenRing with the OrderedPartitioner
-func TestOrderedTokenRing(t *testing.T) {
-	// Tokens here more or less are similar layout to the int tokens above due
-	// to each numeric character translating to a consistently offset byte.
-	var hosts []HostInfo = []HostInfo{
-		HostInfo{
-			Peer: "0",
-			Tokens: []string{
-				"00",
-			},
-		},
-		HostInfo{
-			Peer: "1",
-			Tokens: []string{
-				"25",
-			},
-		},
-		HostInfo{
-			Peer: "2",
-			Tokens: []string{
-				"50",
-			},
-		},
-		HostInfo{
-			Peer: "3",
-			Tokens: []string{
-				"75",
-			},
-		},
-	}
-	ring, err := newTokenRing("OrderedPartitioner", hosts)
-	if err != nil {
-		t.Fatalf("Failed to create token ring due to error: %v", err)
-	}
-
-	p := orderedPartitioner{}
-
-	var actual *HostInfo
-	actual = ring.GetHostForToken(p.ParseString("0"))
-	if actual.Peer != "0" {
-		t.Errorf("Expected peer 0 for token \"0\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("25"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"25\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("50"))
-	if actual.Peer != "2" {
-		t.Errorf("Expected peer 2 for token \"50\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("75"))
-	if actual.Peer != "3" {
-		t.Errorf("Expected peer 3 for token \"01\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("12"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"12\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("24324545443332"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"24324545443332\", but was %s", actual.Peer)
-	}
-}
-
-// Test of the tokenRing with the RandomPartitioner
-func TestRandomTokenRing(t *testing.T) {
-	// String tokens are parsed into big.Int in base 10
-	var hosts []HostInfo = []HostInfo{
-		HostInfo{
-			Peer: "0",
-			Tokens: []string{
-				"00",
-			},
-		},
-		HostInfo{
-			Peer: "1",
-			Tokens: []string{
-				"25",
-			},
-		},
-		HostInfo{
-			Peer: "2",
-			Tokens: []string{
-				"50",
-			},
-		},
-		HostInfo{
-			Peer: "3",
-			Tokens: []string{
-				"75",
-			},
-		},
-	}
-	ring, err := newTokenRing("RandomPartitioner", hosts)
-	if err != nil {
-		t.Fatalf("Failed to create token ring due to error: %v", err)
-	}
-
-	p := randomPartitioner{}
-
-	var actual *HostInfo
-	actual = ring.GetHostForToken(p.ParseString("0"))
-	if actual.Peer != "0" {
-		t.Errorf("Expected peer 0 for token \"0\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("25"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"25\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("50"))
-	if actual.Peer != "2" {
-		t.Errorf("Expected peer 2 for token \"50\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("75"))
-	if actual.Peer != "3" {
-		t.Errorf("Expected peer 3 for token \"01\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("12"))
-	if actual.Peer != "1" {
-		t.Errorf("Expected peer 1 for token \"12\", but was %s", actual.Peer)
-	}
-
-	actual = ring.GetHostForToken(p.ParseString("24324545443332"))
-	if actual.Peer != "0" {
-		t.Errorf("Expected peer 0 for token \"24324545443332\", but was %s", actual.Peer)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/topology.go b/vendor/github.com/gocql/gocql/topology.go
deleted file mode 100644
index 08ac094a1..000000000
--- a/vendor/github.com/gocql/gocql/topology.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2012 The gocql 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 gocql
-
-import (
-	"sync"
-	"sync/atomic"
-)
-
-type Node interface {
-	Pick(qry *Query) *Conn
-	Close()
-}
-
-type RoundRobin struct {
-	pool []Node
-	pos  uint32
-	mu   sync.RWMutex
-}
-
-func NewRoundRobin() *RoundRobin {
-	return &RoundRobin{}
-}
-
-func (r *RoundRobin) AddNode(node Node) {
-	r.mu.Lock()
-	r.pool = append(r.pool, node)
-	r.mu.Unlock()
-}
-
-func (r *RoundRobin) RemoveNode(node Node) {
-	r.mu.Lock()
-	n := len(r.pool)
-	for i := 0; i < n; i++ {
-		if r.pool[i] == node {
-			r.pool[i], r.pool[n-1] = r.pool[n-1], r.pool[i]
-			r.pool = r.pool[:n-1]
-			break
-		}
-	}
-	r.mu.Unlock()
-}
-
-func (r *RoundRobin) Size() int {
-	r.mu.RLock()
-	n := len(r.pool)
-	r.mu.RUnlock()
-	return n
-}
-
-func (r *RoundRobin) Pick(qry *Query) *Conn {
-	pos := atomic.AddUint32(&r.pos, 1)
-	var node Node
-	r.mu.RLock()
-	if len(r.pool) > 0 {
-		node = r.pool[pos%uint32(len(r.pool))]
-	}
-	r.mu.RUnlock()
-	if node == nil {
-		return nil
-	}
-	return node.Pick(qry)
-}
-
-func (r *RoundRobin) Close() {
-	r.mu.Lock()
-	for i := 0; i < len(r.pool); i++ {
-		r.pool[i].Close()
-	}
-	r.pool = nil
-	r.mu.Unlock()
-}
diff --git a/vendor/github.com/gocql/gocql/topology_test.go b/vendor/github.com/gocql/gocql/topology_test.go
deleted file mode 100644
index 8384824ab..000000000
--- a/vendor/github.com/gocql/gocql/topology_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build all unit
-
-package gocql
-
-import (
-	"testing"
-)
-
-// fakeNode is used as a simple structure to test the RoundRobin API
-type fakeNode struct {
-	conn   *Conn
-	closed bool
-}
-
-// Pick is needed to satisfy the Node interface
-func (n *fakeNode) Pick(qry *Query) *Conn {
-	if n.conn == nil {
-		n.conn = &Conn{}
-	}
-	return n.conn
-}
-
-//Close is needed to satisfy the Node interface
-func (n *fakeNode) Close() {
-	n.closed = true
-}
-
-//TestRoundRobinAPI tests the exported methods of the RoundRobin struct
-//to make sure the API behaves accordingly.
-func TestRoundRobinAPI(t *testing.T) {
-	node := &fakeNode{}
-	rr := NewRoundRobin()
-	rr.AddNode(node)
-
-	if rr.Size() != 1 {
-		t.Fatalf("expected size to be 1, got %v", rr.Size())
-	}
-
-	if c := rr.Pick(nil); c != node.conn {
-		t.Fatalf("expected conn %v, got %v", node.conn, c)
-	}
-
-	rr.Close()
-	if rr.pool != nil {
-		t.Fatalf("expected rr.pool to be nil, got %v", rr.pool)
-	}
-
-	if !node.closed {
-		t.Fatal("expected node.closed to be true, got false")
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/tuple_test.go b/vendor/github.com/gocql/gocql/tuple_test.go
deleted file mode 100644
index bf94191f6..000000000
--- a/vendor/github.com/gocql/gocql/tuple_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build all integration
-
-package gocql
-
-import "testing"
-
-func TestTupleSimple(t *testing.T) {
-	if *flagProto < protoVersion3 {
-		t.Skip("tuple types are only available of proto>=3")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	err := createTable(session, `CREATE TABLE tuple_test(
-		id int,
-		coord frozen<tuple<int, int>>,
-
-		primary key(id))`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = session.Query("INSERT INTO tuple_test(id, coord) VALUES(?, (?, ?))", 1, 100, -100).Exec()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var (
-		id    int
-		coord struct {
-			x int
-			y int
-		}
-	)
-
-	iter := session.Query("SELECT id, coord FROM tuple_test WHERE id=?", 1)
-	if err := iter.Scan(&id, &coord.x, &coord.y); err != nil {
-		t.Fatal(err)
-	}
-
-	if id != 1 {
-		t.Errorf("expected to get id=1 got: %v", id)
-	}
-	if coord.x != 100 {
-		t.Errorf("expected to get coord.x=100 got: %v", coord.x)
-	}
-	if coord.y != -100 {
-		t.Errorf("expected to get coord.y=-100 got: %v", coord.y)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/udt_test.go b/vendor/github.com/gocql/gocql/udt_test.go
deleted file mode 100644
index 1e0a9fcd1..000000000
--- a/vendor/github.com/gocql/gocql/udt_test.go
+++ /dev/null
@@ -1,254 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-type position struct {
-	Lat     int    `cql:"lat"`
-	Lon     int    `cql:"lon"`
-	Padding string `json:"padding"`
-}
-
-// NOTE: due to current implementation details it is not currently possible to use
-// a pointer receiver type for the UDTMarshaler interface to handle UDT's
-func (p position) MarshalUDT(name string, info TypeInfo) ([]byte, error) {
-	switch name {
-	case "lat":
-		return Marshal(info, p.Lat)
-	case "lon":
-		return Marshal(info, p.Lon)
-	case "padding":
-		return Marshal(info, p.Padding)
-	default:
-		return nil, fmt.Errorf("unknown column for position: %q", name)
-	}
-}
-
-func (p *position) UnmarshalUDT(name string, info TypeInfo, data []byte) error {
-	switch name {
-	case "lat":
-		return Unmarshal(info, data, &p.Lat)
-	case "lon":
-		return Unmarshal(info, data, &p.Lon)
-	case "padding":
-		return Unmarshal(info, data, &p.Padding)
-	default:
-		return fmt.Errorf("unknown column for position: %q", name)
-	}
-}
-
-func TestUDT_Marshaler(t *testing.T) {
-	if *flagProto < protoVersion3 {
-		t.Skip("UDT are only available on protocol >= 3")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	err := createTable(session, `CREATE TYPE position(
-		lat int,
-		lon int,
-		padding text);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = createTable(session, `CREATE TABLE houses(
-		id int,
-		name text,
-		loc frozen<position>,
-
-		primary key(id)
-	);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	const (
-		expLat = -1
-		expLon = 2
-	)
-	pad := strings.Repeat("X", 1000)
-
-	err = session.Query("INSERT INTO houses(id, name, loc) VALUES(?, ?, ?)", 1, "test", &position{expLat, expLon, pad}).Exec()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pos := &position{}
-
-	err = session.Query("SELECT loc FROM houses WHERE id = ?", 1).Scan(pos)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if pos.Lat != expLat {
-		t.Errorf("expeceted lat to be be %d got %d", expLat, pos.Lat)
-	}
-	if pos.Lon != expLon {
-		t.Errorf("expeceted lon to be be %d got %d", expLon, pos.Lon)
-	}
-	if pos.Padding != pad {
-		t.Errorf("expected to get padding %q got %q\n", pad, pos.Padding)
-	}
-}
-
-func TestUDT_Reflect(t *testing.T) {
-	if *flagProto < protoVersion3 {
-		t.Skip("UDT are only available on protocol >= 3")
-	}
-
-	// Uses reflection instead of implementing the marshaling type
-	session := createSession(t)
-	defer session.Close()
-
-	err := createTable(session, `CREATE TYPE horse(
-		name text,
-		owner text);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = createTable(session, `CREATE TABLE horse_race(
-		position int,
-		horse frozen<horse>,
-
-		primary key(position)
-	);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	type horse struct {
-		Name  string `cql:"name"`
-		Owner string `cql:"owner"`
-	}
-
-	insertedHorse := &horse{
-		Name:  "pony",
-		Owner: "jim",
-	}
-
-	err = session.Query("INSERT INTO horse_race(position, horse) VALUES(?, ?)", 1, insertedHorse).Exec()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	retrievedHorse := &horse{}
-	err = session.Query("SELECT horse FROM horse_race WHERE position = ?", 1).Scan(retrievedHorse)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if *retrievedHorse != *insertedHorse {
-		t.Fatal("exepcted to get %+v got %+v", insertedHorse, retrievedHorse)
-	}
-}
-
-func TestUDT_Proto2error(t *testing.T) {
-	if *flagProto < protoVersion3 {
-		t.Skip("UDT are only available on protocol >= 3")
-	}
-
-	cluster := createCluster()
-	cluster.ProtoVersion = 2
-	cluster.Keyspace = "gocql_test"
-
-	// Uses reflection instead of implementing the marshaling type
-	session, err := cluster.CreateSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer session.Close()
-
-	err = createTable(session, `CREATE TYPE fish(
-		name text,
-		owner text);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = createTable(session, `CREATE TABLE fish_race(
-		position int,
-		fish frozen<fish>,
-
-		primary key(position)
-	);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	type fish struct {
-		Name  string `cql:"name"`
-		Owner string `cql:"owner"`
-	}
-
-	insertedFish := &fish{
-		Name:  "pony",
-		Owner: "jim",
-	}
-
-	err = session.Query("INSERT INTO fish_race(position, fish) VALUES(?, ?)", 1, insertedFish).Exec()
-	if err != ErrorUDTUnavailable {
-		t.Fatalf("expected to get %v got %v", ErrorUDTUnavailable, err)
-	}
-}
-
-func TestUDT_NullObject(t *testing.T) {
-	if *flagProto < protoVersion3 {
-		t.Skip("UDT are only available on protocol >= 3")
-	}
-
-	session := createSession(t)
-	defer session.Close()
-
-	err := createTable(session, `CREATE TYPE udt_null_type(
-		name text,
-		owner text);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = createTable(session, `CREATE TABLE udt_null_table(
-		id uuid,
-		udt_col frozen<udt_null_type>,
-
-		primary key(id)
-	);`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	type col struct {
-		Name  string `cql:"name"`
-		Owner string `cql:"owner"`
-	}
-
-	id := TimeUUID()
-	err = session.Query("INSERT INTO udt_null_table(id) VALUES(?)", id).Exec()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	readCol := &col{
-		Name:  "temp",
-		Owner: "temp",
-	}
-
-	err = session.Query("SELECT udt_col FROM udt_null_table WHERE id = ?", id).Scan(readCol)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if readCol.Name != "" {
-		t.Errorf("expected empty string to be returned for null udt: got %q", readCol.Name)
-	}
-	if readCol.Owner != "" {
-		t.Errorf("expected empty string to be returned for null udt: got %q", readCol.Owner)
-	}
-}
diff --git a/vendor/github.com/gocql/gocql/uuid.go b/vendor/github.com/gocql/gocql/uuid.go
deleted file mode 100644
index 0017d99a9..000000000
--- a/vendor/github.com/gocql/gocql/uuid.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) 2012 The gocql 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 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 gocql
-
-import (
-	"crypto/rand"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"sync/atomic"
-	"time"
-)
-
-type UUID [16]byte
-
-var hardwareAddr []byte
-var clockSeq uint32
-
-const (
-	VariantNCSCompat = 0
-	VariantIETF      = 2
-	VariantMicrosoft = 6
-	VariantFuture    = 7
-)
-
-func init() {
-	if interfaces, err := net.Interfaces(); err == nil {
-		for _, i := range interfaces {
-			if i.Flags&net.FlagLoopback == 0 && len(i.HardwareAddr) > 0 {
-				hardwareAddr = i.HardwareAddr
-				break
-			}
-		}
-	}
-	if hardwareAddr == nil {
-		// If we failed to obtain the MAC address of the current computer,
-		// we will use a randomly generated 6 byte sequence instead and set
-		// the multicast bit as recommended in RFC 4122.
-		hardwareAddr = make([]byte, 6)
-		_, err := io.ReadFull(rand.Reader, hardwareAddr)
-		if err != nil {
-			panic(err)
-		}
-		hardwareAddr[0] = hardwareAddr[0] | 0x01
-	}
-
-	// initialize the clock sequence with a random number
-	var clockSeqRand [2]byte
-	io.ReadFull(rand.Reader, clockSeqRand[:])
-	clockSeq = uint32(clockSeqRand[1])<<8 | uint32(clockSeqRand[0])
-}
-
-// ParseUUID parses a 32 digit hexadecimal number (that might contain hypens)
-// representing an UUID.
-func ParseUUID(input string) (UUID, error) {
-	var u UUID
-	j := 0
-	for _, r := range input {
-		switch {
-		case r == '-' && j&1 == 0:
-			continue
-		case r >= '0' && r <= '9' && j < 32:
-			u[j/2] |= byte(r-'0') << uint(4-j&1*4)
-		case r >= 'a' && r <= 'f' && j < 32:
-			u[j/2] |= byte(r-'a'+10) << uint(4-j&1*4)
-		case r >= 'A' && r <= 'F' && j < 32:
-			u[j/2] |= byte(r-'A'+10) << uint(4-j&1*4)
-		default:
-			return UUID{}, fmt.Errorf("invalid UUID %q", input)
-		}
-		j += 1
-	}
-	if j != 32 {
-		return UUID{}, fmt.Errorf("invalid UUID %q", input)
-	}
-	return u, nil
-}
-
-// UUIDFromBytes converts a raw byte slice to an UUID.
-func UUIDFromBytes(input []byte) (UUID, error) {
-	var u UUID
-	if len(input) != 16 {
-		return u, errors.New("UUIDs must be exactly 16 bytes long")
-	}
-
-	copy(u[:], input)
-	return u, nil
-}
-
-// RandomUUID generates a totally random UUID (version 4) as described in
-// RFC 4122.
-func RandomUUID() (UUID, error) {
-	var u UUID
-	_, err := io.ReadFull(rand.Reader, u[:])
-	if err != nil {
-		return u, err
-	}
-	u[6] &= 0x0F // clear version
-	u[6] |= 0x40 // set version to 4 (random uuid)
-	u[8] &= 0x3F // clear variant
-	u[8] |= 0x80 // set to IETF variant
-	return u, nil
-}
-
-var timeBase = time.Date(1582, time.October, 15, 0, 0, 0, 0, time.UTC).Unix()
-
-// TimeUUID generates a new time based UUID (version 1) using the current
-// time as the timestamp.
-func TimeUUID() UUID {
-	return UUIDFromTime(time.Now())
-}
-
-// UUIDFromTime 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 UUIDFromTime(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)
-
-}
-
-// Bytes returns the raw byte slice for this UUID. A UUID is always 128 bits
-// (16 bytes) long.
-func (u UUID) Bytes() []byte {
-	return u[:]
-}
-
-// Variant returns the variant of this UUID. This package will only generate
-// UUIDs in the IETF variant.
-func (u UUID) Variant() int {
-	x := u[8]
-	if x&0x80 == 0 {
-		return VariantNCSCompat
-	}
-	if x&0x40 == 0 {
-		return VariantIETF
-	}
-	if x&0x20 == 0 {
-		return VariantMicrosoft
-	}
-	return VariantFuture
-}
-
-// Version extracts the version of this UUID variant. The RFC 4122 describes
-// five kinds of UUIDs.
-func (u UUID) Version() int {
-	return int(u[6] & 0xF0 >> 4)
-}
-
-// Node extracts the MAC address of the node who generated this UUID. It will
-// return nil if the UUID is not a time based UUID (version 1).
-func (u UUID) Node() []byte {
-	if u.Version() != 1 {
-		return nil
-	}
-	return u[10:]
-}
-
-// Timestamp extracts the timestamp information from a time based UUID
-// (version 1).
-func (u UUID) Timestamp() int64 {
-	if u.Version() != 1 {
-		return 0
-	}
-	return int64(uint64(u[0])<<24|uint64(u[1])<<16|
-		uint64(u[2])<<8|uint64(u[3])) +
-		int64(uint64(u[4])<<40|uint64(u[5])<<32) +
-		int64(uint64(u[6]&0x0F)<<56|uint64(u[7])<<48)
-}
-
-// Time is like Timestamp, except that it returns a time.Time.
-func (u UUID) Time() time.Time {
-	if u.Version() != 1 {
-		return time.Time{}
-	}
-	t := u.Timestamp()
-	sec := t / 1e7
-	nsec := (t % 1e7) * 100
-	return time.Unix(sec+timeBase, nsec).UTC()
-}
-
-// Marshaling for JSON
-func (u UUID) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + u.String() + `"`), nil
-}
-
-// Unmarshaling for JSON
-func (u *UUID) UnmarshalJSON(data []byte) error {
-	str := strings.Trim(string(data), `"`)
-	if len(str) > 36 {
-		return fmt.Errorf("invalid JSON UUID %s", str)
-	}
-
-	parsed, err := ParseUUID(str)
-	if err == nil {
-		copy(u[:], parsed[:])
-	}
-
-	return err
-}
diff --git a/vendor/github.com/gocql/gocql/uuid_test.go b/vendor/github.com/gocql/gocql/uuid_test.go
deleted file mode 100644
index ec6a69ff9..000000000
--- a/vendor/github.com/gocql/gocql/uuid_test.go
+++ /dev/null
@@ -1,197 +0,0 @@
-// +build all unit
-
-package gocql
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestUUIDNil(t *testing.T) {
-	var uuid UUID
-	want, got := "00000000-0000-0000-0000-000000000000", uuid.String()
-	if want != got {
-		t.Fatalf("TestNil: expected %q got %q", want, got)
-	}
-}
-
-var testsUUID = []struct {
-	input   string
-	variant int
-	version int
-}{
-	{"b4f00409-cef8-4822-802c-deb20704c365", VariantIETF, 4},
-	{"B4F00409-CEF8-4822-802C-DEB20704C365", VariantIETF, 4}, //Use capital letters
-	{"f81d4fae-7dec-11d0-a765-00a0c91e6bf6", VariantIETF, 1},
-	{"00000000-7dec-11d0-a765-00a0c91e6bf6", VariantIETF, 1},
-	{"3051a8d7-aea7-1801-e0bf-bc539dd60cf3", VariantFuture, 1},
-	{"3051a8d7-aea7-2801-e0bf-bc539dd60cf3", VariantFuture, 2},
-	{"3051a8d7-aea7-3801-e0bf-bc539dd60cf3", VariantFuture, 3},
-	{"3051a8d7-aea7-4801-e0bf-bc539dd60cf3", VariantFuture, 4},
-	{"3051a8d7-aea7-3801-e0bf-bc539dd60cf3", VariantFuture, 5},
-	{"d0e817e1-e4b1-1801-3fe6-b4b60ccecf9d", VariantNCSCompat, 0},
-	{"d0e817e1-e4b1-1801-bfe6-b4b60ccecf9d", VariantIETF, 1},
-	{"d0e817e1-e4b1-1801-dfe6-b4b60ccecf9d", VariantMicrosoft, 0},
-	{"d0e817e1-e4b1-1801-ffe6-b4b60ccecf9d", VariantFuture, 0},
-}
-
-func TestPredefinedUUID(t *testing.T) {
-	for i := range testsUUID {
-		uuid, err := ParseUUID(testsUUID[i].input)
-		if err != nil {
-			t.Errorf("ParseUUID #%d: %v", i, err)
-			continue
-		}
-
-		if str := uuid.String(); str != strings.ToLower(testsUUID[i].input) {
-			t.Errorf("String #%d: expected %q got %q", i, testsUUID[i].input, str)
-			continue
-		}
-
-		if variant := uuid.Variant(); variant != testsUUID[i].variant {
-			t.Errorf("Variant #%d: expected %d got %d", i, testsUUID[i].variant, variant)
-		}
-
-		if testsUUID[i].variant == VariantIETF {
-			if version := uuid.Version(); version != testsUUID[i].version {
-				t.Errorf("Version #%d: expected %d got %d", i, testsUUID[i].version, version)
-			}
-		}
-
-		json, err := uuid.MarshalJSON()
-		if err != nil {
-			t.Errorf("MarshalJSON #%d: %v", i, err)
-		}
-		expectedJson := `"` + strings.ToLower(testsUUID[i].input) + `"`
-		if string(json) != expectedJson {
-			t.Errorf("MarshalJSON #%d: expected %v got %v", i, expectedJson, string(json))
-		}
-
-		var unmarshaled UUID
-		err = unmarshaled.UnmarshalJSON(json)
-		if err != nil {
-			t.Errorf("UnmarshalJSON #%d: %v", i, err)
-		}
-		if unmarshaled != uuid {
-			t.Errorf("UnmarshalJSON #%d: expected %v got %v", i, uuid, unmarshaled)
-		}
-	}
-}
-
-func TestInvalidUUIDCharacter(t *testing.T) {
-	_, err := ParseUUID("z4f00409-cef8-4822-802c-deb20704c365")
-	if err == nil || !strings.Contains(err.Error(), "invalid UUID") {
-		t.Fatalf("expected invalid UUID error, got '%v' ", err)
-	}
-}
-
-func TestInvalidUUIDLength(t *testing.T) {
-	_, err := ParseUUID("4f00")
-	if err == nil || !strings.Contains(err.Error(), "invalid UUID") {
-		t.Fatalf("expected invalid UUID error, got '%v' ", err)
-	}
-
-	_, err = UUIDFromBytes(TimeUUID().Bytes()[:15])
-	if err == nil || err.Error() != "UUIDs must be exactly 16 bytes long" {
-		t.Fatalf("expected error '%v', got '%v'", "UUIDs must be exactly 16 bytes long", err)
-	}
-}
-
-func TestRandomUUID(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		uuid, err := RandomUUID()
-		if err != nil {
-			t.Errorf("RandomUUID: %v", err)
-		}
-		if variant := uuid.Variant(); variant != VariantIETF {
-			t.Errorf("wrong variant. expected %d got %d", VariantIETF, variant)
-		}
-		if version := uuid.Version(); version != 4 {
-			t.Errorf("wrong version. expected %d got %d", 4, version)
-		}
-	}
-}
-
-func TestRandomUUIDInvalidAPICalls(t *testing.T) {
-	uuid, err := RandomUUID()
-	if err != nil {
-		t.Fatalf("unexpected error %v", err)
-	}
-
-	if node := uuid.Node(); node != nil {
-		t.Fatalf("expected nil, got %v", node)
-	}
-
-	if stamp := uuid.Timestamp(); stamp != 0 {
-		t.Fatalf("expceted 0, got %v", stamp)
-	}
-	zeroT := time.Time{}
-	if to := uuid.Time(); to != zeroT {
-		t.Fatalf("expected %v, got %v", zeroT, to)
-	}
-}
-
-func TestUUIDFromTime(t *testing.T) {
-	date := time.Date(1982, 5, 5, 12, 34, 56, 400, time.UTC)
-	uuid := UUIDFromTime(date)
-
-	if uuid.Time() != date {
-		t.Errorf("embedded time incorrect. Expected %v got %v", date, uuid.Time())
-	}
-}
-
-func TestParseUUID(t *testing.T) {
-	uuid, _ := ParseUUID("486f3a88-775b-11e3-ae07-d231feb1dc81")
-	if uuid.Time() != time.Date(2014, 1, 7, 5, 19, 29, 222516000, time.UTC) {
-		t.Errorf("Expected date of 1/7/2014 at 5:19:29.222516, got %v", uuid.Time())
-	}
-}
-
-func TestTimeUUID(t *testing.T) {
-	var node []byte
-	timestamp := int64(0)
-	for i := 0; i < 20; i++ {
-		uuid := TimeUUID()
-
-		if variant := uuid.Variant(); variant != VariantIETF {
-			t.Errorf("wrong variant. expected %d got %d", VariantIETF, variant)
-		}
-		if version := uuid.Version(); version != 1 {
-			t.Errorf("wrong version. expected %d got %d", 1, version)
-		}
-
-		if n := uuid.Node(); !bytes.Equal(n, node) && i > 0 {
-			t.Errorf("wrong node. expected %x, got %x", node, n)
-		} else if i == 0 {
-			node = n
-		}
-
-		ts := uuid.Timestamp()
-		if ts < timestamp {
-			t.Errorf("timestamps must grow")
-		}
-		timestamp = ts
-	}
-}
-
-func TestUnmarshalJSON(t *testing.T) {
-	var withHyphens, withoutHypens, tooLong UUID
-
-	withHyphens.UnmarshalJSON([]byte(`"486f3a88-775b-11e3-ae07-d231feb1dc81"`))
-	if withHyphens.Time().Truncate(time.Second) != time.Date(2014, 1, 7, 5, 19, 29, 0, time.UTC) {
-		t.Errorf("Expected date of 1/7/2014 at 5:19:29, got %v", withHyphens.Time())
-	}
-
-	withoutHypens.UnmarshalJSON([]byte(`"486f3a88775b11e3ae07d231feb1dc81"`))
-	if withoutHypens.Time().Truncate(time.Second) != time.Date(2014, 1, 7, 5, 19, 29, 0, time.UTC) {
-		t.Errorf("Expected date of 1/7/2014 at 5:19:29, got %v", withoutHypens.Time())
-	}
-
-	err := tooLong.UnmarshalJSON([]byte(`"486f3a88-775b-11e3-ae07-d231feb1dc81486f3a88"`))
-	if err == nil {
-		t.Errorf("no error for invalid JSON UUID")
-	}
-
-}
diff --git a/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.css b/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.css
deleted file mode 100644
index ad1173569..000000000
--- a/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.css
+++ /dev/null
@@ -1,384 +0,0 @@
-.btn-default,
-.btn-primary,
-.btn-success,
-.btn-info,
-.btn-warning,
-.btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.btn-default:active,
-.btn-primary:active,
-.btn-success:active,
-.btn-info:active,
-.btn-warning:active,
-.btn-danger:active,
-.btn-default.active,
-.btn-primary.active,
-.btn-success.active,
-.btn-info.active,
-.btn-warning.active,
-.btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
-
-.btn:active,
-.btn.active {
-  background-image: none;
-}
-
-.btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #e6e6e6, 100%);
-  background-image: -moz-linear-gradient(top, #ffffff 0%, #e6e6e6 100%);
-  background-image: linear-gradient(to bottom, #ffffff 0%, #e6e6e6 100%);
-  background-repeat: repeat-x;
-  border-color: #e0e0e0;
-  border-color: #ccc;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-}
-
-.btn-default:active,
-.btn-default.active {
-  background-color: #e6e6e6;
-  border-color: #e0e0e0;
-}
-
-.btn-primary {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
-  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
-  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  background-repeat: repeat-x;
-  border-color: #2d6ca2;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-}
-
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #3071a9;
-  border-color: #2d6ca2;
-}
-
-.btn-success {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
-  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
-  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  background-repeat: repeat-x;
-  border-color: #419641;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-}
-
-.btn-success:active,
-.btn-success.active {
-  background-color: #449d44;
-  border-color: #419641;
-}
-
-.btn-warning {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
-  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
-  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  background-repeat: repeat-x;
-  border-color: #eb9316;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-}
-
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #ec971f;
-  border-color: #eb9316;
-}
-
-.btn-danger {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
-  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
-  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  background-repeat: repeat-x;
-  border-color: #c12e2a;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-}
-
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #c9302c;
-  border-color: #c12e2a;
-}
-
-.btn-info {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
-  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
-  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  background-repeat: repeat-x;
-  border-color: #2aabd2;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #31b0d5;
-  border-color: #2aabd2;
-}
-
-.thumbnail,
-.img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  background-color: #357ebd;
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
-  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
-  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-}
-
-.navbar {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#f8f8f8));
-  background-image: -webkit-linear-gradient(top, #ffffff, 0%, #f8f8f8, 100%);
-  background-image: -moz-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
-  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-}
-
-.navbar .navbar-nav > .active > a {
-  background-color: #f8f8f8;
-}
-
-.navbar-brand,
-.navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-}
-
-.navbar-inverse {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#3c3c3c), to(#222222));
-  background-image: -webkit-linear-gradient(top, #3c3c3c, 0%, #222222, 100%);
-  background-image: -moz-linear-gradient(top, #3c3c3c 0%, #222222 100%);
-  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-}
-
-.navbar-inverse .navbar-nav > .active > a {
-  background-color: #222222;
-}
-
-.navbar-inverse .navbar-brand,
-.navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar-static-top,
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  border-radius: 0;
-}
-
-.alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.alert-success {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#c8e5bc));
-  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #c8e5bc, 100%);
-  background-image: -moz-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-}
-
-.alert-info {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#b9def0));
-  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #b9def0, 100%);
-  background-image: -moz-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-}
-
-.alert-warning {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#f8efc0));
-  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #f8efc0, 100%);
-  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-}
-
-.alert-danger {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#e7c3c3));
-  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #e7c3c3, 100%);
-  background-image: -moz-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-}
-
-.progress {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ebebeb), to(#f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ebebeb, 0%, #f5f5f5, 100%);
-  background-image: -moz-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-}
-
-.progress-bar {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3071a9));
-  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3071a9, 100%);
-  background-image: -moz-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-}
-
-.progress-bar-success {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5cb85c), to(#449d44));
-  background-image: -webkit-linear-gradient(top, #5cb85c, 0%, #449d44, 100%);
-  background-image: -moz-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-}
-
-.progress-bar-info {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#5bc0de), to(#31b0d5));
-  background-image: -webkit-linear-gradient(top, #5bc0de, 0%, #31b0d5, 100%);
-  background-image: -moz-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-}
-
-.progress-bar-warning {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f0ad4e), to(#ec971f));
-  background-image: -webkit-linear-gradient(top, #f0ad4e, 0%, #ec971f, 100%);
-  background-image: -moz-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-}
-
-.progress-bar-danger {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9534f), to(#c9302c));
-  background-image: -webkit-linear-gradient(top, #d9534f, 0%, #c9302c, 100%);
-  background-image: -moz-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-}
-
-.list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-}
-
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #3071a9;
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#3278b3));
-  background-image: -webkit-linear-gradient(top, #428bca, 0%, #3278b3, 100%);
-  background-image: -moz-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
-  background-repeat: repeat-x;
-  border-color: #3278b3;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
-}
-
-.panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.panel-default > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f5f5f5), to(#e8e8e8));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, 0%, #e8e8e8, 100%);
-  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-}
-
-.panel-primary > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#428bca), to(#357ebd));
-  background-image: -webkit-linear-gradient(top, #428bca, 0%, #357ebd, 100%);
-  background-image: -moz-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-}
-
-.panel-success > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#dff0d8), to(#d0e9c6));
-  background-image: -webkit-linear-gradient(top, #dff0d8, 0%, #d0e9c6, 100%);
-  background-image: -moz-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-}
-
-.panel-info > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#d9edf7), to(#c4e3f3));
-  background-image: -webkit-linear-gradient(top, #d9edf7, 0%, #c4e3f3, 100%);
-  background-image: -moz-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-}
-
-.panel-warning > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fcf8e3), to(#faf2cc));
-  background-image: -webkit-linear-gradient(top, #fcf8e3, 0%, #faf2cc, 100%);
-  background-image: -moz-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-}
-
-.panel-danger > .panel-heading {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#f2dede), to(#ebcccc));
-  background-image: -webkit-linear-gradient(top, #f2dede, 0%, #ebcccc, 100%);
-  background-image: -moz-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-}
-
-.well {
-  background-image: -webkit-gradient(linear, left 0%, left 100%, from(#e8e8e8), to(#f5f5f5));
-  background-image: -webkit-linear-gradient(top, #e8e8e8, 0%, #f5f5f5, 100%);
-  background-image: -moz-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-}
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.min.css b/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.min.css
deleted file mode 100644
index cad36b4e6..000000000
--- a/vendor/github.com/gocql/gocql/website/css/bootstrap-theme.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,0%,#e6e6e6,100%);background-image:-moz-linear-gradient(top,#fff 0,#e6e6e6 100%);background-image:linear-gradient(to bottom,#fff 0,#e6e6e6 100%);background-repeat:repeat-x;border-color:#e0e0e0;border-color:#ccc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0)}.btn-default:active,.btn-default.active{background-color:#e6e6e6;border-color:#e0e0e0}.btn-primary{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca,0%,#3071a9,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;border-color:#2d6ca2;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.btn-primary:active,.btn-primary.active{background-color:#3071a9;border-color:#2d6ca2}.btn-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c,0%,#449d44,100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;border-color:#419641;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.btn-success:active,.btn-success.active{background-color:#449d44;border-color:#419641}.btn-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e,0%,#ec971f,100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;border-color:#eb9316;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.btn-warning:active,.btn-warning.active{background-color:#ec971f;border-color:#eb9316}.btn-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f,0%,#c9302c,100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;border-color:#c12e2a;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.btn-danger:active,.btn-danger.active{background-color:#c9302c;border-color:#c12e2a}.btn-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de,0%,#31b0d5,100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;border-color:#2aabd2;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.btn-info:active,.btn-info.active{background-color:#31b0d5;border-color:#2aabd2}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.navbar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fff),to(#f8f8f8));background-image:-webkit-linear-gradient(top,#fff,0%,#f8f8f8,100%);background-image:-moz-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff8f8f8',GradientType=0);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar .navbar-nav>.active>a{background-color:#f8f8f8}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-gradient(linear,left 0,left 100%,from(#3c3c3c),to(#222));background-image:-webkit-linear-gradient(top,#3c3c3c,0%,#222,100%);background-image:-moz-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0)}.navbar-inverse .navbar-nav>.active>a{background-color:#222}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#c8e5bc));background-image:-webkit-linear-gradient(top,#dff0d8,0%,#c8e5bc,100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;border-color:#b2dba1;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0)}.alert-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#b9def0));background-image:-webkit-linear-gradient(top,#d9edf7,0%,#b9def0,100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;border-color:#9acfea;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0)}.alert-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#f8efc0));background-image:-webkit-linear-gradient(top,#fcf8e3,0%,#f8efc0,100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;border-color:#f5e79e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fff8efc0',GradientType=0)}.alert-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#e7c3c3));background-image:-webkit-linear-gradient(top,#f2dede,0%,#e7c3c3,100%);background-image:-moz-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;border-color:#dca7a7;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffe7c3c3',GradientType=0)}.progress{background-image:-webkit-gradient(linear,left 0,left 100%,from(#ebebeb),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#ebebeb,0%,#f5f5f5,100%);background-image:-moz-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff5f5f5',GradientType=0)}.progress-bar{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3071a9));background-image:-webkit-linear-gradient(top,#428bca,0%,#3071a9,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.progress-bar-success{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5cb85c),to(#449d44));background-image:-webkit-linear-gradient(top,#5cb85c,0%,#449d44,100%);background-image:-moz-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.progress-bar-info{background-image:-webkit-gradient(linear,left 0,left 100%,from(#5bc0de),to(#31b0d5));background-image:-webkit-linear-gradient(top,#5bc0de,0%,#31b0d5,100%);background-image:-moz-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.progress-bar-warning{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f0ad4e),to(#ec971f));background-image:-webkit-linear-gradient(top,#f0ad4e,0%,#ec971f,100%);background-image:-moz-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.progress-bar-danger{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9534f),to(#c9302c));background-image:-webkit-linear-gradient(top,#d9534f,0%,#c9302c,100%);background-image:-moz-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#3278b3));background-image:-webkit-linear-gradient(top,#428bca,0%,#3278b3,100%);background-image:-moz-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;border-color:#3278b3;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0)}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f5f5f5),to(#e8e8e8));background-image:-webkit-linear-gradient(top,#f5f5f5,0%,#e8e8e8,100%);background-image:-moz-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#428bca),to(#357ebd));background-image:-webkit-linear-gradient(top,#428bca,0%,#357ebd,100%);background-image:-moz-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#dff0d8),to(#d0e9c6));background-image:-webkit-linear-gradient(top,#dff0d8,0%,#d0e9c6,100%);background-image:-moz-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#d9edf7),to(#c4e3f3));background-image:-webkit-linear-gradient(top,#d9edf7,0%,#c4e3f3,100%);background-image:-moz-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#fcf8e3),to(#faf2cc));background-image:-webkit-linear-gradient(top,#fcf8e3,0%,#faf2cc,100%);background-image:-moz-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fffaf2cc',GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-gradient(linear,left 0,left 100%,from(#f2dede),to(#ebcccc));background-image:-webkit-linear-gradient(top,#f2dede,0%,#ebcccc,100%);background-image:-moz-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffebcccc',GradientType=0)}.well{background-image:-webkit-gradient(linear,left 0,left 100%,from(#e8e8e8),to(#f5f5f5));background-image:-webkit-linear-gradient(top,#e8e8e8,0%,#f5f5f5,100%);background-image:-moz-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;border-color:#dcdcdc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/website/css/bootstrap.css b/vendor/github.com/gocql/gocql/website/css/bootstrap.css
deleted file mode 100644
index bbda4eed4..000000000
--- a/vendor/github.com/gocql/gocql/website/css/bootstrap.css
+++ /dev/null
@@ -1,6805 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-  display: block;
-}
-
-audio,
-canvas,
-video {
-  display: inline-block;
-}
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-[hidden] {
-  display: none;
-}
-
-html {
-  font-family: sans-serif;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-body {
-  margin: 0;
-}
-
-a:focus {
-  outline: thin dotted;
-}
-
-a:active,
-a:hover {
-  outline: 0;
-}
-
-h1 {
-  margin: 0.67em 0;
-  font-size: 2em;
-}
-
-abbr[title] {
-  border-bottom: 1px dotted;
-}
-
-b,
-strong {
-  font-weight: bold;
-}
-
-dfn {
-  font-style: italic;
-}
-
-hr {
-  height: 0;
-  -moz-box-sizing: content-box;
-       box-sizing: content-box;
-}
-
-mark {
-  color: #000;
-  background: #ff0;
-}
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-small {
-  font-size: 80%;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  border: 0;
-}
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-figure {
-  margin: 0;
-}
-
-fieldset {
-  padding: 0.35em 0.625em 0.75em;
-  margin: 0 2px;
-  border: 1px solid #c0c0c0;
-}
-
-legend {
-  padding: 0;
-  border: 0;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: 100%;
-}
-
-button,
-input {
-  line-height: normal;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-
-button[disabled],
-html input[disabled] {
-  cursor: default;
-}
-
-input[type="checkbox"],
-input[type="radio"] {
-  padding: 0;
-  box-sizing: border-box;
-}
-
-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;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-@media print {
-  * {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]: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;
-  }
-  @page  {
-    margin: 2cm .5cm;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-  .navbar {
-    display: none;
-  }
-  .table td,
-  .table th {
-    background-color: #fff !important;
-  }
-  .btn > .caret,
-  .dropup > .btn > .caret {
-    border-top-color: #000 !important;
-  }
-  .label {
-    border: 1px solid #000;
-  }
-  .table {
-    border-collapse: collapse !important;
-  }
-  .table-bordered th,
-  .table-bordered td {
-    border: 1px solid #ddd !important;
-  }
-}
-
-*,
-*:before,
-*:after {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-html {
-  font-size: 62.5%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.428571429;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-input,
-select[multiple],
-textarea {
-  background-image: none;
-}
-
-a {
-  color: #428bca;
-  text-decoration: none;
-}
-
-a:hover,
-a:focus {
-  color: #2a6496;
-  text-decoration: underline;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-img {
-  vertical-align: middle;
-}
-
-.img-responsive {
-  display: block;
-  height: auto;
-  max-width: 100%;
-}
-
-.img-rounded {
-  border-radius: 6px;
-}
-
-.img-thumbnail {
-  display: inline-block;
-  height: auto;
-  max-width: 100%;
-  padding: 4px;
-  line-height: 1.428571429;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-radius: 4px;
-  -webkit-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-.img-circle {
-  border-radius: 50%;
-}
-
-hr {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-}
-
-.sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0 0 0 0);
-  border: 0;
-}
-
-p {
-  margin: 0 0 10px;
-}
-
-.lead {
-  margin-bottom: 20px;
-  font-size: 16.099999999999998px;
-  font-weight: 200;
-  line-height: 1.4;
-}
-
-@media (min-width: 768px) {
-  .lead {
-    font-size: 21px;
-  }
-}
-
-small {
-  font-size: 85%;
-}
-
-cite {
-  font-style: normal;
-}
-
-.text-muted {
-  color: #999999;
-}
-
-.text-primary {
-  color: #428bca;
-}
-
-.text-warning {
-  color: #c09853;
-}
-
-.text-danger {
-  color: #b94a48;
-}
-
-.text-success {
-  color: #468847;
-}
-
-.text-info {
-  color: #3a87ad;
-}
-
-.text-left {
-  text-align: left;
-}
-
-.text-right {
-  text-align: right;
-}
-
-.text-center {
-  text-align: center;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-weight: 500;
-  line-height: 1.1;
-}
-
-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: #999999;
-}
-
-h1,
-h2,
-h3 {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
-
-h4,
-h5,
-h6 {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-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;
-}
-
-h1 small,
-.h1 small {
-  font-size: 24px;
-}
-
-h2 small,
-.h2 small {
-  font-size: 18px;
-}
-
-h3 small,
-.h3 small,
-h4 small,
-.h4 small {
-  font-size: 14px;
-}
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #eeeeee;
-}
-
-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;
-  list-style: none;
-}
-
-.list-inline > li {
-  display: inline-block;
-  padding-right: 5px;
-  padding-left: 5px;
-}
-
-dl {
-  margin-bottom: 20px;
-}
-
-dt,
-dd {
-  line-height: 1.428571429;
-}
-
-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;
-  }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    display: table;
-    content: " ";
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    display: table;
-    content: " ";
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
-}
-
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-blockquote {
-  padding: 10px 20px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
-  font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
-}
-
-blockquote p:last-child {
-  margin-bottom: 0;
-}
-
-blockquote small {
-  display: block;
-  line-height: 1.428571429;
-  color: #999999;
-}
-
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-
-blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-
-blockquote.pull-right small:before {
-  content: '';
-}
-
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 1.428571429;
-}
-
-code,
-pre {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-}
-
-code {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #c7254e;
-  white-space: nowrap;
-  background-color: #f9f2f4;
-  border-radius: 4px;
-}
-
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 1.428571429;
-  color: #333333;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: #f5f5f5;
-  border: 1px solid #cccccc;
-  border-radius: 4px;
-}
-
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-
-pre code {
-  padding: 0;
-  font-size: inherit;
-  color: inherit;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border: 0;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-.container {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  content: " ";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  content: " ";
-}
-
-.container:after {
-  clear: both;
-}
-
-.row {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  content: " ";
-}
-
-.row:after {
-  clear: both;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  content: " ";
-}
-
-.row:after {
-  clear: both;
-}
-
-.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,
-.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,
-.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,
-.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 {
-  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 {
-  float: left;
-}
-
-.col-xs-1 {
-  width: 8.333333333333332%;
-}
-
-.col-xs-2 {
-  width: 16.666666666666664%;
-}
-
-.col-xs-3 {
-  width: 25%;
-}
-
-.col-xs-4 {
-  width: 33.33333333333333%;
-}
-
-.col-xs-5 {
-  width: 41.66666666666667%;
-}
-
-.col-xs-6 {
-  width: 50%;
-}
-
-.col-xs-7 {
-  width: 58.333333333333336%;
-}
-
-.col-xs-8 {
-  width: 66.66666666666666%;
-}
-
-.col-xs-9 {
-  width: 75%;
-}
-
-.col-xs-10 {
-  width: 83.33333333333334%;
-}
-
-.col-xs-11 {
-  width: 91.66666666666666%;
-}
-
-.col-xs-12 {
-  width: 100%;
-}
-
-@media (min-width: 768px) {
-  .container {
-    max-width: 750px;
-  }
-  .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 {
-    float: left;
-  }
-  .col-sm-1 {
-    width: 8.333333333333332%;
-  }
-  .col-sm-2 {
-    width: 16.666666666666664%;
-  }
-  .col-sm-3 {
-    width: 25%;
-  }
-  .col-sm-4 {
-    width: 33.33333333333333%;
-  }
-  .col-sm-5 {
-    width: 41.66666666666667%;
-  }
-  .col-sm-6 {
-    width: 50%;
-  }
-  .col-sm-7 {
-    width: 58.333333333333336%;
-  }
-  .col-sm-8 {
-    width: 66.66666666666666%;
-  }
-  .col-sm-9 {
-    width: 75%;
-  }
-  .col-sm-10 {
-    width: 83.33333333333334%;
-  }
-  .col-sm-11 {
-    width: 91.66666666666666%;
-  }
-  .col-sm-12 {
-    width: 100%;
-  }
-  .col-sm-push-1 {
-    left: 8.333333333333332%;
-  }
-  .col-sm-push-2 {
-    left: 16.666666666666664%;
-  }
-  .col-sm-push-3 {
-    left: 25%;
-  }
-  .col-sm-push-4 {
-    left: 33.33333333333333%;
-  }
-  .col-sm-push-5 {
-    left: 41.66666666666667%;
-  }
-  .col-sm-push-6 {
-    left: 50%;
-  }
-  .col-sm-push-7 {
-    left: 58.333333333333336%;
-  }
-  .col-sm-push-8 {
-    left: 66.66666666666666%;
-  }
-  .col-sm-push-9 {
-    left: 75%;
-  }
-  .col-sm-push-10 {
-    left: 83.33333333333334%;
-  }
-  .col-sm-push-11 {
-    left: 91.66666666666666%;
-  }
-  .col-sm-pull-1 {
-    right: 8.333333333333332%;
-  }
-  .col-sm-pull-2 {
-    right: 16.666666666666664%;
-  }
-  .col-sm-pull-3 {
-    right: 25%;
-  }
-  .col-sm-pull-4 {
-    right: 33.33333333333333%;
-  }
-  .col-sm-pull-5 {
-    right: 41.66666666666667%;
-  }
-  .col-sm-pull-6 {
-    right: 50%;
-  }
-  .col-sm-pull-7 {
-    right: 58.333333333333336%;
-  }
-  .col-sm-pull-8 {
-    right: 66.66666666666666%;
-  }
-  .col-sm-pull-9 {
-    right: 75%;
-  }
-  .col-sm-pull-10 {
-    right: 83.33333333333334%;
-  }
-  .col-sm-pull-11 {
-    right: 91.66666666666666%;
-  }
-  .col-sm-offset-1 {
-    margin-left: 8.333333333333332%;
-  }
-  .col-sm-offset-2 {
-    margin-left: 16.666666666666664%;
-  }
-  .col-sm-offset-3 {
-    margin-left: 25%;
-  }
-  .col-sm-offset-4 {
-    margin-left: 33.33333333333333%;
-  }
-  .col-sm-offset-5 {
-    margin-left: 41.66666666666667%;
-  }
-  .col-sm-offset-6 {
-    margin-left: 50%;
-  }
-  .col-sm-offset-7 {
-    margin-left: 58.333333333333336%;
-  }
-  .col-sm-offset-8 {
-    margin-left: 66.66666666666666%;
-  }
-  .col-sm-offset-9 {
-    margin-left: 75%;
-  }
-  .col-sm-offset-10 {
-    margin-left: 83.33333333333334%;
-  }
-  .col-sm-offset-11 {
-    margin-left: 91.66666666666666%;
-  }
-}
-
-@media (min-width: 992px) {
-  .container {
-    max-width: 970px;
-  }
-  .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 {
-    float: left;
-  }
-  .col-md-1 {
-    width: 8.333333333333332%;
-  }
-  .col-md-2 {
-    width: 16.666666666666664%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-4 {
-    width: 33.33333333333333%;
-  }
-  .col-md-5 {
-    width: 41.66666666666667%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-7 {
-    width: 58.333333333333336%;
-  }
-  .col-md-8 {
-    width: 66.66666666666666%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-10 {
-    width: 83.33333333333334%;
-  }
-  .col-md-11 {
-    width: 91.66666666666666%;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-push-0 {
-    left: auto;
-  }
-  .col-md-push-1 {
-    left: 8.333333333333332%;
-  }
-  .col-md-push-2 {
-    left: 16.666666666666664%;
-  }
-  .col-md-push-3 {
-    left: 25%;
-  }
-  .col-md-push-4 {
-    left: 33.33333333333333%;
-  }
-  .col-md-push-5 {
-    left: 41.66666666666667%;
-  }
-  .col-md-push-6 {
-    left: 50%;
-  }
-  .col-md-push-7 {
-    left: 58.333333333333336%;
-  }
-  .col-md-push-8 {
-    left: 66.66666666666666%;
-  }
-  .col-md-push-9 {
-    left: 75%;
-  }
-  .col-md-push-10 {
-    left: 83.33333333333334%;
-  }
-  .col-md-push-11 {
-    left: 91.66666666666666%;
-  }
-  .col-md-pull-0 {
-    right: auto;
-  }
-  .col-md-pull-1 {
-    right: 8.333333333333332%;
-  }
-  .col-md-pull-2 {
-    right: 16.666666666666664%;
-  }
-  .col-md-pull-3 {
-    right: 25%;
-  }
-  .col-md-pull-4 {
-    right: 33.33333333333333%;
-  }
-  .col-md-pull-5 {
-    right: 41.66666666666667%;
-  }
-  .col-md-pull-6 {
-    right: 50%;
-  }
-  .col-md-pull-7 {
-    right: 58.333333333333336%;
-  }
-  .col-md-pull-8 {
-    right: 66.66666666666666%;
-  }
-  .col-md-pull-9 {
-    right: 75%;
-  }
-  .col-md-pull-10 {
-    right: 83.33333333333334%;
-  }
-  .col-md-pull-11 {
-    right: 91.66666666666666%;
-  }
-  .col-md-offset-0 {
-    margin-left: 0;
-  }
-  .col-md-offset-1 {
-    margin-left: 8.333333333333332%;
-  }
-  .col-md-offset-2 {
-    margin-left: 16.666666666666664%;
-  }
-  .col-md-offset-3 {
-    margin-left: 25%;
-  }
-  .col-md-offset-4 {
-    margin-left: 33.33333333333333%;
-  }
-  .col-md-offset-5 {
-    margin-left: 41.66666666666667%;
-  }
-  .col-md-offset-6 {
-    margin-left: 50%;
-  }
-  .col-md-offset-7 {
-    margin-left: 58.333333333333336%;
-  }
-  .col-md-offset-8 {
-    margin-left: 66.66666666666666%;
-  }
-  .col-md-offset-9 {
-    margin-left: 75%;
-  }
-  .col-md-offset-10 {
-    margin-left: 83.33333333333334%;
-  }
-  .col-md-offset-11 {
-    margin-left: 91.66666666666666%;
-  }
-}
-
-@media (min-width: 1200px) {
-  .container {
-    max-width: 1170px;
-  }
-  .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 {
-    float: left;
-  }
-  .col-lg-1 {
-    width: 8.333333333333332%;
-  }
-  .col-lg-2 {
-    width: 16.666666666666664%;
-  }
-  .col-lg-3 {
-    width: 25%;
-  }
-  .col-lg-4 {
-    width: 33.33333333333333%;
-  }
-  .col-lg-5 {
-    width: 41.66666666666667%;
-  }
-  .col-lg-6 {
-    width: 50%;
-  }
-  .col-lg-7 {
-    width: 58.333333333333336%;
-  }
-  .col-lg-8 {
-    width: 66.66666666666666%;
-  }
-  .col-lg-9 {
-    width: 75%;
-  }
-  .col-lg-10 {
-    width: 83.33333333333334%;
-  }
-  .col-lg-11 {
-    width: 91.66666666666666%;
-  }
-  .col-lg-12 {
-    width: 100%;
-  }
-  .col-lg-push-0 {
-    left: auto;
-  }
-  .col-lg-push-1 {
-    left: 8.333333333333332%;
-  }
-  .col-lg-push-2 {
-    left: 16.666666666666664%;
-  }
-  .col-lg-push-3 {
-    left: 25%;
-  }
-  .col-lg-push-4 {
-    left: 33.33333333333333%;
-  }
-  .col-lg-push-5 {
-    left: 41.66666666666667%;
-  }
-  .col-lg-push-6 {
-    left: 50%;
-  }
-  .col-lg-push-7 {
-    left: 58.333333333333336%;
-  }
-  .col-lg-push-8 {
-    left: 66.66666666666666%;
-  }
-  .col-lg-push-9 {
-    left: 75%;
-  }
-  .col-lg-push-10 {
-    left: 83.33333333333334%;
-  }
-  .col-lg-push-11 {
-    left: 91.66666666666666%;
-  }
-  .col-lg-pull-0 {
-    right: auto;
-  }
-  .col-lg-pull-1 {
-    right: 8.333333333333332%;
-  }
-  .col-lg-pull-2 {
-    right: 16.666666666666664%;
-  }
-  .col-lg-pull-3 {
-    right: 25%;
-  }
-  .col-lg-pull-4 {
-    right: 33.33333333333333%;
-  }
-  .col-lg-pull-5 {
-    right: 41.66666666666667%;
-  }
-  .col-lg-pull-6 {
-    right: 50%;
-  }
-  .col-lg-pull-7 {
-    right: 58.333333333333336%;
-  }
-  .col-lg-pull-8 {
-    right: 66.66666666666666%;
-  }
-  .col-lg-pull-9 {
-    right: 75%;
-  }
-  .col-lg-pull-10 {
-    right: 83.33333333333334%;
-  }
-  .col-lg-pull-11 {
-    right: 91.66666666666666%;
-  }
-  .col-lg-offset-0 {
-    margin-left: 0;
-  }
-  .col-lg-offset-1 {
-    margin-left: 8.333333333333332%;
-  }
-  .col-lg-offset-2 {
-    margin-left: 16.666666666666664%;
-  }
-  .col-lg-offset-3 {
-    margin-left: 25%;
-  }
-  .col-lg-offset-4 {
-    margin-left: 33.33333333333333%;
-  }
-  .col-lg-offset-5 {
-    margin-left: 41.66666666666667%;
-  }
-  .col-lg-offset-6 {
-    margin-left: 50%;
-  }
-  .col-lg-offset-7 {
-    margin-left: 58.333333333333336%;
-  }
-  .col-lg-offset-8 {
-    margin-left: 66.66666666666666%;
-  }
-  .col-lg-offset-9 {
-    margin-left: 75%;
-  }
-  .col-lg-offset-10 {
-    margin-left: 83.33333333333334%;
-  }
-  .col-lg-offset-11 {
-    margin-left: 91.66666666666666%;
-  }
-}
-
-table {
-  max-width: 100%;
-  background-color: transparent;
-}
-
-th {
-  text-align: left;
-}
-
-.table {
-  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.428571429;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-
-.table thead > tr > th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #dddddd;
-}
-
-.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 #dddddd;
-}
-
-.table .table {
-  background-color: #ffffff;
-}
-
-.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 #dddddd;
-}
-
-.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 #dddddd;
-}
-
-.table-bordered > thead > tr > th,
-.table-bordered > thead > tr > td {
-  border-bottom-width: 2px;
-}
-
-.table-striped > tbody > tr:nth-child(odd) > td,
-.table-striped > tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
-}
-
-.table-hover > tbody > tr:hover > td,
-.table-hover > tbody > tr:hover > th {
-  background-color: #f5f5f5;
-}
-
-table col[class*="col-"] {
-  display: table-column;
-  float: none;
-}
-
-table td[class*="col-"],
-table th[class*="col-"] {
-  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 > 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;
-  border-color: #d6e9c6;
-}
-
-.table-hover > tbody > tr > td.success:hover,
-.table-hover > tbody > tr > th.success:hover,
-.table-hover > tbody > tr.success:hover > td {
-  background-color: #d0e9c6;
-  border-color: #c9e2b3;
-}
-
-.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;
-  border-color: #eed3d7;
-}
-
-.table-hover > tbody > tr > td.danger:hover,
-.table-hover > tbody > tr > th.danger:hover,
-.table-hover > tbody > tr.danger:hover > td {
-  background-color: #ebcccc;
-  border-color: #e6c1c7;
-}
-
-.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;
-  border-color: #fbeed5;
-}
-
-.table-hover > tbody > tr > td.warning:hover,
-.table-hover > tbody > tr > th.warning:hover,
-.table-hover > tbody > tr.warning:hover > td {
-  background-color: #faf2cc;
-  border-color: #f8e5be;
-}
-
-@media (max-width: 768px) {
-  .table-responsive {
-    width: 100%;
-    margin-bottom: 15px;
-    overflow-x: scroll;
-    overflow-y: hidden;
-    border: 1px solid #dddddd;
-  }
-  .table-responsive > .table {
-    margin-bottom: 0;
-    background-color: #fff;
-  }
-  .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 > thead > tr:last-child > th,
-  .table-responsive > .table-bordered > tbody > tr:last-child > th,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
-  .table-responsive > .table-bordered > thead > tr:last-child > td,
-  .table-responsive > .table-bordered > tbody > tr:last-child > td,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
-    border-bottom: 0;
-  }
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: inherit;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-label {
-  display: inline-block;
-  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;
-  /* IE8-9 */
-
-  line-height: normal;
-}
-
-input[type="file"] {
-  display: block;
-}
-
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-select optgroup {
-  font-family: inherit;
-  font-size: inherit;
-  font-style: inherit;
-}
-
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
-
-.form-control:-moz-placeholder {
-  color: #999999;
-}
-
-.form-control::-moz-placeholder {
-  color: #999999;
-}
-
-.form-control:-ms-input-placeholder {
-  color: #999999;
-}
-
-.form-control::-webkit-input-placeholder {
-  color: #999999;
-}
-
-.form-control {
-  display: block;
-  width: 100%;
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.428571429;
-  color: #555555;
-  vertical-align: middle;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-          transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-}
-
-.form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-}
-
-.form-control[disabled],
-.form-control[readonly],
-fieldset[disabled] .form-control {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-textarea.form-control {
-  height: auto;
-}
-
-.form-group {
-  margin-bottom: 15px;
-}
-
-.radio,
-.checkbox {
-  display: block;
-  min-height: 20px;
-  padding-left: 20px;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  vertical-align: middle;
-}
-
-.radio label,
-.checkbox label {
-  display: inline;
-  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"] {
-  float: left;
-  margin-left: -20px;
-}
-
-.radio + .radio,
-.checkbox + .checkbox {
-  margin-top: -5px;
-}
-
-.radio-inline,
-.checkbox-inline {
-  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],
-.radio[disabled],
-.radio-inline[disabled],
-.checkbox[disabled],
-.checkbox-inline[disabled],
-fieldset[disabled] input[type="radio"],
-fieldset[disabled] input[type="checkbox"],
-fieldset[disabled] .radio,
-fieldset[disabled] .radio-inline,
-fieldset[disabled] .checkbox,
-fieldset[disabled] .checkbox-inline {
-  cursor: not-allowed;
-}
-
-.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 {
-  height: auto;
-}
-
-.input-lg {
-  height: 45px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
-}
-
-select.input-lg {
-  height: 45px;
-  line-height: 45px;
-}
-
-textarea.input-lg {
-  height: auto;
-}
-
-.has-warning .help-block,
-.has-warning .control-label {
-  color: #c09853;
-}
-
-.has-warning .form-control {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.has-warning .form-control:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.has-warning .input-group-addon {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.has-error .help-block,
-.has-error .control-label {
-  color: #b94a48;
-}
-
-.has-error .form-control {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.has-error .form-control:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.has-error .input-group-addon {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.has-success .help-block,
-.has-success .control-label {
-  color: #468847;
-}
-
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.has-success .input-group-addon {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
-.form-control-static {
-  padding-top: 7px;
-  margin-bottom: 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;
-  }
-  .form-inline .radio,
-  .form-inline .checkbox {
-    display: inline-block;
-    padding-left: 0;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-  .form-inline .radio input[type="radio"],
-  .form-inline .checkbox input[type="checkbox"] {
-    float: none;
-    margin-left: 0;
-  }
-}
-
-.form-horizontal .control-label,
-.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 .form-group {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
-@media (min-width: 768px) {
-  .form-horizontal .control-label {
-    text-align: right;
-  }
-}
-
-.btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.428571429;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  cursor: pointer;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-       -o-user-select: none;
-          user-select: none;
-}
-
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.btn:hover,
-.btn:focus {
-  color: #333333;
-  text-decoration: none;
-}
-
-.btn:active,
-.btn.active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
-
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
-  pointer-events: none;
-  cursor: not-allowed;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-default {
-  color: #333333;
-  background-color: #ffffff;
-  border-color: #cccccc;
-}
-
-.btn-default:hover,
-.btn-default:focus,
-.btn-default:active,
-.btn-default.active,
-.open .dropdown-toggle.btn-default {
-  color: #333333;
-  background-color: #ebebeb;
-  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: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: #ffffff;
-  border-color: #cccccc;
-}
-
-.btn-primary {
-  color: #ffffff;
-  background-color: #428bca;
-  border-color: #357ebd;
-}
-
-.btn-primary:hover,
-.btn-primary:focus,
-.btn-primary:active,
-.btn-primary.active,
-.open .dropdown-toggle.btn-primary {
-  color: #ffffff;
-  background-color: #3276b1;
-  border-color: #285e8e;
-}
-
-.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: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: #428bca;
-  border-color: #357ebd;
-}
-
-.btn-warning {
-  color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  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: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-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  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: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-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
-  color: #ffffff;
-  background-color: #47a447;
-  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: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-info {
-  color: #ffffff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
-  color: #ffffff;
-  background-color: #39b3d7;
-  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: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-link {
-  font-weight: normal;
-  color: #428bca;
-  cursor: pointer;
-  border-radius: 0;
-}
-
-.btn-link,
-.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: #2a6496;
-  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: #999999;
-  text-decoration: none;
-}
-
-.btn-lg {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
-}
-
-.btn-sm,
-.btn-xs {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-
-.btn-xs {
-  padding: 1px 5px;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.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 0.15s linear;
-          transition: opacity 0.15s linear;
-}
-
-.fade.in {
-  opacity: 1;
-}
-
-.collapse {
-  display: none;
-}
-
-.collapse.in {
-  display: block;
-}
-
-.collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-          transition: height 0.35s ease;
-}
-
-@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.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';
-  -webkit-font-smoothing: antialiased;
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
-}
-
-.glyphicon-asterisk:before {
-  content: "\2a";
-}
-
-.glyphicon-plus:before {
-  content: "\2b";
-}
-
-.glyphicon-euro: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-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-print:before {
-  content: "\e045";
-}
-
-.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-eye-open:before {
-  content: "\e105";
-}
-
-.glyphicon-eye-close:before {
-  content: "\e106";
-}
-
-.glyphicon-warning-sign:before {
-  content: "\e107";
-}
-
-.glyphicon-plane:before {
-  content: "\e108";
-}
-
-.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-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-tasks:before {
-  content: "\e137";
-}
-
-.glyphicon-filter:before {
-  content: "\e138";
-}
-
-.glyphicon-fullscreen:before {
-  content: "\e140";
-}
-
-.glyphicon-dashboard:before {
-  content: "\e141";
-}
-
-.glyphicon-heart-empty:before {
-  content: "\e143";
-}
-
-.glyphicon-link:before {
-  content: "\e144";
-}
-
-.glyphicon-phone:before {
-  content: "\e145";
-}
-
-.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-briefcase:before {
-  content: "\1f4bc";
-}
-
-.glyphicon-calendar:before {
-  content: "\1f4c5";
-}
-
-.glyphicon-pushpin:before {
-  content: "\1f4cc";
-}
-
-.glyphicon-paperclip:before {
-  content: "\1f4ce";
-}
-
-.glyphicon-camera:before {
-  content: "\1f4f7";
-}
-
-.glyphicon-lock:before {
-  content: "\1f512";
-}
-
-.glyphicon-bell:before {
-  content: "\1f514";
-}
-
-.glyphicon-bookmark:before {
-  content: "\1f516";
-}
-
-.glyphicon-fire:before {
-  content: "\1f525";
-}
-
-.glyphicon-wrench:before {
-  content: "\1f527";
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-left: 2px;
-  vertical-align: middle;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-bottom: 0 dotted;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.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;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-  background-clip: padding-box;
-}
-
-.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.428571429;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #428bca;
-}
-
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #428bca;
-  outline: 0;
-}
-
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: #999999;
-}
-
-.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-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.428571429;
-  color: #999999;
-}
-
-.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 {
-  border-top: 0 dotted;
-  border-bottom: 4px solid #000000;
-  content: "";
-}
-
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
-}
-
-@media (min-width: 768px) {
-  .navbar-right .dropdown-menu {
-    right: 0;
-    left: auto;
-  }
-}
-
-.btn-default .caret {
-  border-top-color: #333333;
-}
-
-.btn-primary .caret,
-.btn-success .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret {
-  border-top-color: #fff;
-}
-
-.dropup .btn-default .caret {
-  border-bottom-color: #333333;
-}
-
-.dropup .btn-primary .caret,
-.dropup .btn-success .caret,
-.dropup .btn-warning .caret,
-.dropup .btn-danger .caret,
-.dropup .btn-info .caret {
-  border-bottom-color: #fff;
-}
-
-.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:focus,
-.btn-group-vertical > .btn:focus {
-  outline: none;
-}
-
-.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:before,
-.btn-toolbar:after {
-  display: table;
-  content: " ";
-}
-
-.btn-toolbar:after {
-  clear: both;
-}
-
-.btn-toolbar:before,
-.btn-toolbar:after {
-  display: table;
-  content: " ";
-}
-
-.btn-toolbar:after {
-  clear: both;
-}
-
-.btn-toolbar .btn-group {
-  float: left;
-}
-
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-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-bottom-left-radius: 0;
-  border-top-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 > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-}
-
-.btn-group > .btn-group:last-child > .btn:first-child {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-.btn-group-xs > .btn {
-  padding: 5px 10px;
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-
-.btn-group-sm > .btn {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
-}
-
-.btn-group-lg > .btn {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
-}
-
-.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, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
-
-.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 {
-  display: block;
-  float: none;
-  width: 100%;
-  max-width: 100%;
-}
-
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  display: table;
-  content: " ";
-}
-
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  display: table;
-  content: " ";
-}
-
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-
-.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-right-radius: 0;
-  border-bottom-left-radius: 4px;
-  border-top-left-radius: 0;
-}
-
-.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
-}
-
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.btn-group-justified {
-  display: table;
-  width: 100%;
-  border-collapse: separate;
-  table-layout: fixed;
-}
-
-.btn-group-justified .btn {
-  display: table-cell;
-  float: none;
-  width: 1%;
-}
-
-[data-toggle="buttons"] > .btn > input[type="radio"],
-[data-toggle="buttons"] > .btn > input[type="checkbox"] {
-  display: none;
-}
-
-.input-group {
-  position: relative;
-  display: table;
-  border-collapse: separate;
-}
-
-.input-group.col {
-  float: none;
-  padding-right: 0;
-  padding-left: 0;
-}
-
-.input-group .form-control {
-  width: 100%;
-  margin-bottom: 0;
-}
-
-.input-group-lg > .form-control,
-.input-group-lg > .input-group-addon,
-.input-group-lg > .input-group-btn > .btn {
-  height: 45px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  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: 45px;
-  line-height: 45px;
-}
-
-textarea.input-group-lg > .form-control,
-textarea.input-group-lg > .input-group-addon,
-textarea.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 {
-  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;
-  text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #cccccc;
-  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 > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
-  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 > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
-  border-bottom-left-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.input-group-addon:last-child {
-  border-left: 0;
-}
-
-.input-group-btn {
-  position: relative;
-  white-space: nowrap;
-}
-
-.input-group-btn > .btn {
-  position: relative;
-}
-
-.input-group-btn > .btn + .btn {
-  margin-left: -4px;
-}
-
-.input-group-btn > .btn:hover,
-.input-group-btn > .btn:active {
-  z-index: 2;
-}
-
-.nav {
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
-}
-
-.nav:before,
-.nav:after {
-  display: table;
-  content: " ";
-}
-
-.nav:after {
-  clear: both;
-}
-
-.nav:before,
-.nav:after {
-  display: table;
-  content: " ";
-}
-
-.nav:after {
-  clear: both;
-}
-
-.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: #eeeeee;
-}
-
-.nav > li.disabled > a {
-  color: #999999;
-}
-
-.nav > li.disabled > a:hover,
-.nav > li.disabled > a:focus {
-  color: #999999;
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-}
-
-.nav .open > a,
-.nav .open > a:hover,
-.nav .open > a:focus {
-  background-color: #eeeeee;
-  border-color: #428bca;
-}
-
-.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 #dddddd;
-}
-
-.nav-tabs > li {
-  float: left;
-  margin-bottom: -1px;
-}
-
-.nav-tabs > li > a {
-  margin-right: 2px;
-  line-height: 1.428571429;
-  border: 1px solid transparent;
-  border-radius: 4px 4px 0 0;
-}
-
-.nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-
-.nav-tabs > li.active > a,
-.nav-tabs > li.active > a:hover,
-.nav-tabs > li.active > a:focus {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  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 {
-  text-align: center;
-}
-
-@media (min-width: 768px) {
-  .nav-tabs.nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-}
-
-.nav-tabs.nav-justified > li > a {
-  margin-right: 0;
-  border-bottom: 1px solid #dddddd;
-}
-
-.nav-tabs.nav-justified > .active > a {
-  border-bottom-color: #ffffff;
-}
-
-.nav-pills > li {
-  float: left;
-}
-
-.nav-pills > li > a {
-  border-radius: 5px;
-}
-
-.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: #ffffff;
-  background-color: #428bca;
-}
-
-.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 {
-  text-align: center;
-}
-
-@media (min-width: 768px) {
-  .nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-}
-
-.nav-tabs-justified {
-  border-bottom: 0;
-}
-
-.nav-tabs-justified > li > a {
-  margin-right: 0;
-  border-bottom: 1px solid #dddddd;
-}
-
-.nav-tabs-justified > .active > a {
-  border-bottom-color: #ffffff;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  content: " ";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  content: " ";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-.nav .caret {
-  border-top-color: #428bca;
-  border-bottom-color: #428bca;
-}
-
-.nav a:hover .caret {
-  border-top-color: #2a6496;
-  border-bottom-color: #2a6496;
-}
-
-.nav-tabs .dropdown-menu {
-  margin-top: -1px;
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.navbar {
-  position: relative;
-  z-index: 1000;
-  min-height: 50px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-}
-
-.navbar:before,
-.navbar:after {
-  display: table;
-  content: " ";
-}
-
-.navbar:after {
-  clear: both;
-}
-
-.navbar:before,
-.navbar:after {
-  display: table;
-  content: " ";
-}
-
-.navbar:after {
-  clear: both;
-}
-
-@media (min-width: 768px) {
-  .navbar {
-    border-radius: 4px;
-  }
-}
-
-.navbar-header:before,
-.navbar-header:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-header:after {
-  clear: both;
-}
-
-.navbar-header:before,
-.navbar-header:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-header:after {
-  clear: both;
-}
-
-@media (min-width: 768px) {
-  .navbar-header {
-    float: left;
-  }
-}
-
-.navbar-collapse {
-  max-height: 340px;
-  padding-right: 15px;
-  padding-left: 15px;
-  overflow-x: visible;
-  border-top: 1px solid transparent;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
-  -webkit-overflow-scrolling: touch;
-}
-
-.navbar-collapse:before,
-.navbar-collapse:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-collapse:after {
-  clear: both;
-}
-
-.navbar-collapse:before,
-.navbar-collapse:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-collapse:after {
-  clear: both;
-}
-
-.navbar-collapse.in {
-  overflow-y: auto;
-}
-
-@media (min-width: 768px) {
-  .navbar-collapse {
-    width: auto;
-    border-top: 0;
-    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-collapse .navbar-nav.navbar-left:first-child {
-    margin-left: -15px;
-  }
-  .navbar-collapse .navbar-nav.navbar-right:last-child {
-    margin-right: -15px;
-  }
-  .navbar-collapse .navbar-text:last-child {
-    margin-right: 0;
-  }
-}
-
-.container > .navbar-header,
-.container > .navbar-collapse {
-  margin-right: -15px;
-  margin-left: -15px;
-}
-
-@media (min-width: 768px) {
-  .container > .navbar-header,
-  .container > .navbar-collapse {
-    margin-right: 0;
-    margin-left: 0;
-  }
-}
-
-.navbar-static-top {
-  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;
-  border-width: 0 0 1px;
-}
-
-@media (min-width: 768px) {
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    border-radius: 0;
-  }
-}
-
-.navbar-fixed-top {
-  top: 0;
-  z-index: 1030;
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-  margin-bottom: 0;
-}
-
-.navbar-brand {
-  float: left;
-  padding: 15px 15px;
-  font-size: 18px;
-  line-height: 20px;
-}
-
-.navbar-brand:hover,
-.navbar-brand:focus {
-  text-decoration: none;
-}
-
-@media (min-width: 768px) {
-  .navbar > .container .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;
-  border: 1px solid transparent;
-  border-radius: 4px;
-}
-
-.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;
-    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;
-  }
-}
-
-@media (min-width: 768px) {
-  .navbar-left {
-    float: left !important;
-  }
-  .navbar-right {
-    float: right !important;
-  }
-}
-
-.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, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.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;
-  }
-  .navbar-form .radio,
-  .navbar-form .checkbox {
-    display: inline-block;
-    padding-left: 0;
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-  .navbar-form .radio input[type="radio"],
-  .navbar-form .checkbox input[type="checkbox"] {
-    float: none;
-    margin-left: 0;
-  }
-}
-
-@media (max-width: 767px) {
-  .navbar-form .form-group {
-    margin-bottom: 5px;
-  }
-}
-
-@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-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
-}
-
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.navbar-btn {
-  margin-top: 8px;
-  margin-bottom: 8px;
-}
-
-.navbar-text {
-  float: left;
-  margin-top: 15px;
-  margin-bottom: 15px;
-}
-
-@media (min-width: 768px) {
-  .navbar-text {
-    margin-right: 15px;
-    margin-left: 15px;
-  }
-}
-
-.navbar-default {
-  background-color: #f8f8f8;
-  border-color: #e7e7e7;
-}
-
-.navbar-default .navbar-brand {
-  color: #777777;
-}
-
-.navbar-default .navbar-brand:hover,
-.navbar-default .navbar-brand:focus {
-  color: #5e5e5e;
-  background-color: transparent;
-}
-
-.navbar-default .navbar-text {
-  color: #777777;
-}
-
-.navbar-default .navbar-nav > li > a {
-  color: #777777;
-}
-
-.navbar-default .navbar-nav > li > a:hover,
-.navbar-default .navbar-nav > li > a:focus {
-  color: #333333;
-  background-color: transparent;
-}
-
-.navbar-default .navbar-nav > .active > a,
-.navbar-default .navbar-nav > .active > a:hover,
-.navbar-default .navbar-nav > .active > a:focus {
-  color: #555555;
-  background-color: #e7e7e7;
-}
-
-.navbar-default .navbar-nav > .disabled > a,
-.navbar-default .navbar-nav > .disabled > a:hover,
-.navbar-default .navbar-nav > .disabled > a:focus {
-  color: #cccccc;
-  background-color: transparent;
-}
-
-.navbar-default .navbar-toggle {
-  border-color: #dddddd;
-}
-
-.navbar-default .navbar-toggle:hover,
-.navbar-default .navbar-toggle:focus {
-  background-color: #dddddd;
-}
-
-.navbar-default .navbar-toggle .icon-bar {
-  background-color: #cccccc;
-}
-
-.navbar-default .navbar-collapse,
-.navbar-default .navbar-form {
-  border-color: #e6e6e6;
-}
-
-.navbar-default .navbar-nav > .dropdown > a:hover .caret,
-.navbar-default .navbar-nav > .dropdown > a:focus .caret {
-  border-top-color: #333333;
-  border-bottom-color: #333333;
-}
-
-.navbar-default .navbar-nav > .open > a,
-.navbar-default .navbar-nav > .open > a:hover,
-.navbar-default .navbar-nav > .open > a:focus {
-  color: #555555;
-  background-color: #e7e7e7;
-}
-
-.navbar-default .navbar-nav > .open > a .caret,
-.navbar-default .navbar-nav > .open > a:hover .caret,
-.navbar-default .navbar-nav > .open > a:focus .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar-default .navbar-nav > .dropdown > a .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #777777;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #333333;
-    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: #555555;
-    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: #cccccc;
-    background-color: transparent;
-  }
-}
-
-.navbar-default .navbar-link {
-  color: #777777;
-}
-
-.navbar-default .navbar-link:hover {
-  color: #333333;
-}
-
-.navbar-inverse {
-  background-color: #222222;
-  border-color: #080808;
-}
-
-.navbar-inverse .navbar-brand {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-brand:hover,
-.navbar-inverse .navbar-brand:focus {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .navbar-text {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-nav > li > a {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
-  color: #ffffff;
-  background-color: #080808;
-}
-
-.navbar-inverse .navbar-nav > .disabled > a,
-.navbar-inverse .navbar-nav > .disabled > a:hover,
-.navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444444;
-  background-color: transparent;
-}
-
-.navbar-inverse .navbar-toggle {
-  border-color: #333333;
-}
-
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-  background-color: #333333;
-}
-
-.navbar-inverse .navbar-toggle .icon-bar {
-  background-color: #ffffff;
-}
-
-.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: #ffffff;
-  background-color: #080808;
-}
-
-.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-nav > .dropdown > a .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-
-.navbar-inverse .navbar-nav > .open > a .caret,
-.navbar-inverse .navbar-nav > .open > a:hover .caret,
-.navbar-inverse .navbar-nav > .open > a:focus .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-@media (max-width: 767px) {
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
-    border-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
-    color: #999999;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ffffff;
-    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: #ffffff;
-    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: #444444;
-    background-color: transparent;
-  }
-}
-
-.navbar-inverse .navbar-link {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-link:hover {
-  color: #ffffff;
-}
-
-.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: #cccccc;
-  content: "/\00a0";
-}
-
-.breadcrumb > .active {
-  color: #999999;
-}
-
-.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.428571429;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-}
-
-.pagination > li:first-child > a,
-.pagination > li:first-child > span {
-  margin-left: 0;
-  border-bottom-left-radius: 4px;
-  border-top-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 {
-  background-color: #eeeeee;
-}
-
-.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: #ffffff;
-  cursor: default;
-  background-color: #428bca;
-  border-color: #428bca;
-}
-
-.pagination > .disabled > span,
-.pagination > .disabled > a,
-.pagination > .disabled > a:hover,
-.pagination > .disabled > a:focus {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #ffffff;
-  border-color: #dddddd;
-}
-
-.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-bottom-left-radius: 6px;
-  border-top-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-bottom-left-radius: 3px;
-  border-top-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:before,
-.pager:after {
-  display: table;
-  content: " ";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  content: " ";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager li {
-  display: inline;
-}
-
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-radius: 15px;
-}
-
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-
-.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: #999999;
-  cursor: not-allowed;
-  background-color: #ffffff;
-}
-
-.label {
-  display: inline;
-  padding: .2em .6em .3em;
-  font-size: 75%;
-  font-weight: bold;
-  line-height: 1;
-  color: #ffffff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: .25em;
-}
-
-.label[href]:hover,
-.label[href]:focus {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.label:empty {
-  display: none;
-}
-
-.label-default {
-  background-color: #999999;
-}
-
-.label-default[href]:hover,
-.label-default[href]:focus {
-  background-color: #808080;
-}
-
-.label-primary {
-  background-color: #428bca;
-}
-
-.label-primary[href]:hover,
-.label-primary[href]:focus {
-  background-color: #3071a9;
-}
-
-.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: #ffffff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
-  border-radius: 10px;
-}
-
-.badge:empty {
-  display: none;
-}
-
-a.badge:hover,
-a.badge:focus {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-a.list-group-item.active > .badge,
-.nav-pills > .active > a > .badge {
-  color: #428bca;
-  background-color: #ffffff;
-}
-
-.nav-pills > li > a > .badge {
-  margin-left: 3px;
-}
-
-.jumbotron {
-  padding: 30px;
-  margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
-  color: inherit;
-  background-color: #eeeeee;
-}
-
-.jumbotron h1 {
-  line-height: 1;
-  color: inherit;
-}
-
-.jumbotron p {
-  line-height: 1.4;
-}
-
-.container .jumbotron {
-  border-radius: 6px;
-}
-
-@media screen and (min-width: 768px) {
-  .jumbotron {
-    padding-top: 48px;
-    padding-bottom: 48px;
-  }
-  .container .jumbotron {
-    padding-right: 60px;
-    padding-left: 60px;
-  }
-  .jumbotron h1 {
-    font-size: 63px;
-  }
-}
-
-.thumbnail {
-  display: inline-block;
-  display: block;
-  height: auto;
-  max-width: 100%;
-  padding: 4px;
-  line-height: 1.428571429;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-radius: 4px;
-  -webkit-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-.thumbnail > img {
-  display: block;
-  height: auto;
-  max-width: 100%;
-}
-
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: #428bca;
-}
-
-.thumbnail > img {
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.thumbnail .caption {
-  padding: 9px;
-  color: #333333;
-}
-
-.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 {
-  padding-right: 35px;
-}
-
-.alert-dismissable .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  color: inherit;
-}
-
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.alert-success hr {
-  border-top-color: #c9e2b3;
-}
-
-.alert-success .alert-link {
-  color: #356635;
-}
-
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.alert-info hr {
-  border-top-color: #a6e1ec;
-}
-
-.alert-info .alert-link {
-  color: #2d6987;
-}
-
-.alert-warning {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #fbeed5;
-}
-
-.alert-warning hr {
-  border-top-color: #f8e5be;
-}
-
-.alert-warning .alert-link {
-  color: #a47e3c;
-}
-
-.alert-danger {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.alert-danger hr {
-  border-top-color: #e6c1c7;
-}
-
-.alert-danger .alert-link {
-  color: #953b39;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 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, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.progress-bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  background-color: #428bca;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-transition: width 0.6s ease;
-          transition: width 0.6s ease;
-}
-
-.progress-striped .progress-bar {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-size: 40px 40px;
-}
-
-.progress.active .progress-bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-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-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-bar-info {
-  background-color: #5bc0de;
-}
-
-.progress-striped .progress-bar-info {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-bar-warning {
-  background-color: #f0ad4e;
-}
-
-.progress-striped .progress-bar-warning {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-bar-danger {
-  background-color: #d9534f;
-}
-
-.progress-striped .progress-bar-danger {
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.media,
-.media-body {
-  overflow: hidden;
-  zoom: 1;
-}
-
-.media,
-.media .media {
-  margin-top: 15px;
-}
-
-.media:first-child {
-  margin-top: 0;
-}
-
-.media-object {
-  display: block;
-}
-
-.media-heading {
-  margin: 0 0 5px;
-}
-
-.media > .pull-left {
-  margin-right: 10px;
-}
-
-.media > .pull-right {
-  margin-left: 10px;
-}
-
-.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: #ffffff;
-  border: 1px solid #dddddd;
-}
-
-.list-group-item:first-child {
-  border-top-right-radius: 4px;
-  border-top-left-radius: 4px;
-}
-
-.list-group-item:last-child {
-  margin-bottom: 0;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
-}
-
-.list-group-item > .badge {
-  float: right;
-}
-
-.list-group-item > .badge + .badge {
-  margin-right: 5px;
-}
-
-a.list-group-item {
-  color: #555555;
-}
-
-a.list-group-item .list-group-item-heading {
-  color: #333333;
-}
-
-a.list-group-item:hover,
-a.list-group-item:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-
-.list-group-item.active,
-.list-group-item.active:hover,
-.list-group-item.active:focus {
-  z-index: 2;
-  color: #ffffff;
-  background-color: #428bca;
-  border-color: #428bca;
-}
-
-.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 {
-  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: #e1edf7;
-}
-
-.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: #ffffff;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.panel-body {
-  padding: 15px;
-}
-
-.panel-body:before,
-.panel-body:after {
-  display: table;
-  content: " ";
-}
-
-.panel-body:after {
-  clear: both;
-}
-
-.panel-body:before,
-.panel-body:after {
-  display: table;
-  content: " ";
-}
-
-.panel-body:after {
-  clear: both;
-}
-
-.panel > .list-group {
-  margin-bottom: 0;
-}
-
-.panel > .list-group .list-group-item {
-  border-width: 1px 0;
-}
-
-.panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
-}
-
-.panel > .list-group .list-group-item:last-child {
-  border-bottom: 0;
-}
-
-.panel-heading + .list-group .list-group-item:first-child {
-  border-top-width: 0;
-}
-
-.panel > .table {
-  margin-bottom: 0;
-}
-
-.panel > .panel-body + .table {
-  border-top: 1px solid #dddddd;
-}
-
-.panel-heading {
-  padding: 10px 15px;
-  border-bottom: 1px solid transparent;
-  border-top-right-radius: 3px;
-  border-top-left-radius: 3px;
-}
-
-.panel-title {
-  margin-top: 0;
-  margin-bottom: 0;
-  font-size: 16px;
-}
-
-.panel-title > a {
-  color: inherit;
-}
-
-.panel-footer {
-  padding: 10px 15px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #dddddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
-}
-
-.panel-group .panel {
-  margin-bottom: 0;
-  overflow: hidden;
-  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 {
-  border-top: 1px solid #dddddd;
-}
-
-.panel-group .panel-footer {
-  border-top: 0;
-}
-
-.panel-group .panel-footer + .panel-collapse .panel-body {
-  border-bottom: 1px solid #dddddd;
-}
-
-.panel-default {
-  border-color: #dddddd;
-}
-
-.panel-default > .panel-heading {
-  color: #333333;
-  background-color: #f5f5f5;
-  border-color: #dddddd;
-}
-
-.panel-default > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #dddddd;
-}
-
-.panel-default > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #dddddd;
-}
-
-.panel-primary {
-  border-color: #428bca;
-}
-
-.panel-primary > .panel-heading {
-  color: #ffffff;
-  background-color: #428bca;
-  border-color: #428bca;
-}
-
-.panel-primary > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #428bca;
-}
-
-.panel-primary > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #428bca;
-}
-
-.panel-success {
-  border-color: #d6e9c6;
-}
-
-.panel-success > .panel-heading {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.panel-success > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #d6e9c6;
-}
-
-.panel-success > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #d6e9c6;
-}
-
-.panel-warning {
-  border-color: #fbeed5;
-}
-
-.panel-warning > .panel-heading {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #fbeed5;
-}
-
-.panel-warning > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #fbeed5;
-}
-
-.panel-warning > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #fbeed5;
-}
-
-.panel-danger {
-  border-color: #eed3d7;
-}
-
-.panel-danger > .panel-heading {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.panel-danger > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #eed3d7;
-}
-
-.panel-danger > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #eed3d7;
-}
-
-.panel-info {
-  border-color: #bce8f1;
-}
-
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
-
-.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, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 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: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-
-.close:hover,
-.close:focus {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
-
-.modal-open {
-  overflow: hidden;
-}
-
-body.modal-open,
-.modal-open .navbar-fixed-top,
-.modal-open .navbar-fixed-bottom {
-  margin-right: 15px;
-}
-
-.modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  display: none;
-  overflow: auto;
-  overflow-y: scroll;
-}
-
-.modal.fade .modal-dialog {
-  -webkit-transform: translate(0, -25%);
-      -ms-transform: translate(0, -25%);
-          transform: translate(0, -25%);
-  -webkit-transition: -webkit-transform 0.3s ease-out;
-     -moz-transition: -moz-transform 0.3s ease-out;
-       -o-transition: -o-transform 0.3s ease-out;
-          transition: transform 0.3s ease-out;
-}
-
-.modal.in .modal-dialog {
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-          transform: translate(0, 0);
-}
-
-.modal-dialog {
-  z-index: 1050;
-  width: auto;
-  padding: 10px;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.modal-content {
-  position: relative;
-  background-color: #ffffff;
-  border: 1px solid #999999;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 6px;
-  outline: none;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-          box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-  background-clip: padding-box;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1030;
-  background-color: #000000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-  filter: alpha(opacity=0);
-}
-
-.modal-backdrop.in {
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.modal-header {
-  min-height: 16.428571429px;
-  padding: 15px;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.modal-header .close {
-  margin-top: -2px;
-}
-
-.modal-title {
-  margin: 0;
-  line-height: 1.428571429;
-}
-
-.modal-body {
-  position: relative;
-  padding: 20px;
-}
-
-.modal-footer {
-  padding: 19px 20px 20px;
-  margin-top: 15px;
-  text-align: right;
-  border-top: 1px solid #e5e5e5;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.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;
-}
-
-@media screen and (min-width: 768px) {
-  .modal-dialog {
-    right: auto;
-    left: 50%;
-    width: 600px;
-    padding-top: 30px;
-    padding-bottom: 30px;
-  }
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-            box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-  }
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  font-size: 12px;
-  line-height: 1.4;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: visible;
-}
-
-.tooltip.in {
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.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: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  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-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.top-left .tooltip-arrow {
-  bottom: 0;
-  left: 5px;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.top-right .tooltip-arrow {
-  right: 5px;
-  bottom: 0;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-right-color: #000000;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-left-color: #000000;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.tooltip.bottom-left .tooltip-arrow {
-  top: 0;
-  left: 5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.tooltip.bottom-right .tooltip-arrow {
-  top: 0;
-  right: 5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left;
-  white-space: normal;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  background-clip: padding-box;
-}
-
-.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;
-  font-weight: normal;
-  line-height: 18px;
-  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 {
-  border-width: 10px;
-  content: "";
-}
-
-.popover.top .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999999;
-  border-top-color: rgba(0, 0, 0, 0.25);
-  border-bottom-width: 0;
-}
-
-.popover.top .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  border-top-color: #ffffff;
-  border-bottom-width: 0;
-  content: " ";
-}
-
-.popover.right .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999999;
-  border-right-color: rgba(0, 0, 0, 0.25);
-  border-left-width: 0;
-}
-
-.popover.right .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  border-right-color: #ffffff;
-  border-left-width: 0;
-  content: " ";
-}
-
-.popover.bottom .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-bottom-color: #999999;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-  border-top-width: 0;
-}
-
-.popover.bottom .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-top-width: 0;
-  content: " ";
-}
-
-.popover.left .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-left-color: #999999;
-  border-left-color: rgba(0, 0, 0, 0.25);
-  border-right-width: 0;
-}
-
-.popover.left .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  border-left-color: #ffffff;
-  border-right-width: 0;
-  content: " ";
-}
-
-.carousel {
-  position: relative;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
-}
-
-.carousel-inner > .item > img,
-.carousel-inner > .item > a > img {
-  display: block;
-  height: auto;
-  max-width: 100%;
-  line-height: 1;
-}
-
-.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: #ffffff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.carousel-control.left {
-  background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.5)), to(rgba(0, 0, 0, 0.0001)));
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%));
-  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
-}
-
-.carousel-control.right {
-  right: 0;
-  left: auto;
-  background-image: -webkit-gradient(linear, 0 top, 100% top, from(rgba(0, 0, 0, 0.0001)), to(rgba(0, 0, 0, 0.5)));
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%));
-  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
-}
-
-.carousel-control:hover,
-.carousel-control:focus {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.carousel-control .icon-prev,
-.carousel-control .icon-next,
-.carousel-control .glyphicon-chevron-left,
-.carousel-control .glyphicon-chevron-right {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  z-index: 5;
-  display: inline-block;
-}
-
-.carousel-control .icon-prev,
-.carousel-control .icon-next {
-  width: 20px;
-  height: 20px;
-  margin-top: -10px;
-  margin-left: -10px;
-  font-family: serif;
-}
-
-.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;
-  border: 1px solid #ffffff;
-  border-radius: 10px;
-}
-
-.carousel-indicators .active {
-  width: 12px;
-  height: 12px;
-  margin: 0;
-  background-color: #ffffff;
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 15%;
-  bottom: 20px;
-  left: 15%;
-  z-index: 10;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-}
-
-.carousel-caption .btn {
-  text-shadow: none;
-}
-
-@media screen and (min-width: 768px) {
-  .carousel-control .icon-prev,
-  .carousel-control .icon-next {
-    width: 30px;
-    height: 30px;
-    margin-top: -15px;
-    margin-left: -15px;
-    font-size: 30px;
-  }
-  .carousel-caption {
-    right: 20%;
-    left: 20%;
-    padding-bottom: 30px;
-  }
-  .carousel-indicators {
-    bottom: 20px;
-  }
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  content: " ";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.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;
-}
-
-.affix {
-  position: fixed;
-}
-
-@-ms-viewport {
-  width: device-width;
-}
-
-@media screen and (max-width: 400px) {
-  @-ms-viewport {
-    width: 320px;
-  }
-}
-
-.hidden {
-  display: none !important;
-  visibility: hidden !important;
-}
-
-.visible-xs {
-  display: none !important;
-}
-
-tr.visible-xs {
-  display: none !important;
-}
-
-th.visible-xs,
-td.visible-xs {
-  display: none !important;
-}
-
-@media (max-width: 767px) {
-  .visible-xs {
-    display: block !important;
-  }
-  tr.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-xs,
-  td.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
-
-.visible-sm {
-  display: none !important;
-}
-
-tr.visible-sm {
-  display: none !important;
-}
-
-th.visible-sm,
-td.visible-sm {
-  display: none !important;
-}
-
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm {
-    display: block !important;
-  }
-  tr.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
-
-.visible-md {
-  display: none !important;
-}
-
-tr.visible-md {
-  display: none !important;
-}
-
-th.visible-md,
-td.visible-md {
-  display: none !important;
-}
-
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md {
-    display: block !important;
-  }
-  tr.visible-md {
-    display: table-row !important;
-  }
-  th.visible-md,
-  td.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
-
-.visible-lg {
-  display: none !important;
-}
-
-tr.visible-lg {
-  display: none !important;
-}
-
-th.visible-lg,
-td.visible-lg {
-  display: none !important;
-}
-
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-lg {
-    display: block !important;
-  }
-  tr.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: table-cell !important;
-  }
-}
-
-.hidden-xs {
-  display: block !important;
-}
-
-tr.hidden-xs {
-  display: table-row !important;
-}
-
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-xs {
-    display: none !important;
-  }
-  tr.hidden-xs {
-    display: none !important;
-  }
-  th.hidden-xs,
-  td.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm {
-    display: none !important;
-  }
-  tr.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md {
-    display: none !important;
-  }
-  tr.hidden-xs.hidden-md {
-    display: none !important;
-  }
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg {
-    display: none !important;
-  }
-  tr.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-sm {
-  display: block !important;
-}
-
-tr.hidden-sm {
-  display: table-row !important;
-}
-
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs {
-    display: none !important;
-  }
-  tr.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-sm {
-    display: none !important;
-  }
-  tr.hidden-sm {
-    display: none !important;
-  }
-  th.hidden-sm,
-  td.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md {
-    display: none !important;
-  }
-  tr.hidden-sm.hidden-md {
-    display: none !important;
-  }
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg {
-    display: none !important;
-  }
-  tr.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-md {
-  display: block !important;
-}
-
-tr.hidden-md {
-  display: table-row !important;
-}
-
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs {
-    display: none !important;
-  }
-  tr.hidden-md.hidden-xs {
-    display: none !important;
-  }
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm {
-    display: none !important;
-  }
-  tr.hidden-md.hidden-sm {
-    display: none !important;
-  }
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-md {
-    display: none !important;
-  }
-  tr.hidden-md {
-    display: none !important;
-  }
-  th.hidden-md,
-  td.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg {
-    display: none !important;
-  }
-  tr.hidden-md.hidden-lg {
-    display: none !important;
-  }
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-lg {
-  display: block !important;
-}
-
-tr.hidden-lg {
-  display: table-row !important;
-}
-
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs {
-    display: none !important;
-  }
-  tr.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm {
-    display: none !important;
-  }
-  tr.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md {
-    display: none !important;
-  }
-  tr.hidden-lg.hidden-md {
-    display: none !important;
-  }
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-lg {
-    display: none !important;
-  }
-  tr.hidden-lg {
-    display: none !important;
-  }
-  th.hidden-lg,
-  td.hidden-lg {
-    display: none !important;
-  }
-}
-
-.visible-print {
-  display: none !important;
-}
-
-tr.visible-print {
-  display: none !important;
-}
-
-th.visible-print,
-td.visible-print {
-  display: none !important;
-}
-
-@media print {
-  .visible-print {
-    display: block !important;
-  }
-  tr.visible-print {
-    display: table-row !important;
-  }
-  th.visible-print,
-  td.visible-print {
-    display: table-cell !important;
-  }
-  .hidden-print {
-    display: none !important;
-  }
-  tr.hidden-print {
-    display: none !important;
-  }
-  th.hidden-print,
-  td.hidden-print {
-    display: none !important;
-  }
-}
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/website/css/bootstrap.min.css b/vendor/github.com/gocql/gocql/website/css/bootstrap.min.css
deleted file mode 100644
index a553c4f5e..000000000
--- a/vendor/github.com/gocql/gocql/website/css/bootstrap.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- *//*! normalize.css v2.1.0 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}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}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]: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}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}button,input,select[multiple],textarea{background-image:none}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-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}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16.099999999999998px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-warning{color:#c09853}.text-danger{color:#b94a48}.text-success{color:#468847}.text-info{color:#3a87ad}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1}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:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h4,h5,h6{margin-top:10px;margin-bottom:10px}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}h1 small,.h1 small{font-size:24px}h2 small,.h2 small{font-size:18px}h3 small,.h3 small,h4 small,.h4 small{font-size:14px}.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;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}dl{margin-bottom:20px}dt,dd{line-height:1.428571429}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}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small{display:block;line-height:1.428571429;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:1.428571429}code,pre{font-family:Monaco,Menlo,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.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,.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,.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,.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{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{float:left}.col-xs-1{width:8.333333333333332%}.col-xs-2{width:16.666666666666664%}.col-xs-3{width:25%}.col-xs-4{width:33.33333333333333%}.col-xs-5{width:41.66666666666667%}.col-xs-6{width:50%}.col-xs-7{width:58.333333333333336%}.col-xs-8{width:66.66666666666666%}.col-xs-9{width:75%}.col-xs-10{width:83.33333333333334%}.col-xs-11{width:91.66666666666666%}.col-xs-12{width:100%}@media(min-width:768px){.container{max-width:750px}.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{float:left}.col-sm-1{width:8.333333333333332%}.col-sm-2{width:16.666666666666664%}.col-sm-3{width:25%}.col-sm-4{width:33.33333333333333%}.col-sm-5{width:41.66666666666667%}.col-sm-6{width:50%}.col-sm-7{width:58.333333333333336%}.col-sm-8{width:66.66666666666666%}.col-sm-9{width:75%}.col-sm-10{width:83.33333333333334%}.col-sm-11{width:91.66666666666666%}.col-sm-12{width:100%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-11{left:91.66666666666666%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-11{margin-left:91.66666666666666%}}@media(min-width:992px){.container{max-width:970px}.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{float:left}.col-md-1{width:8.333333333333332%}.col-md-2{width:16.666666666666664%}.col-md-3{width:25%}.col-md-4{width:33.33333333333333%}.col-md-5{width:41.66666666666667%}.col-md-6{width:50%}.col-md-7{width:58.333333333333336%}.col-md-8{width:66.66666666666666%}.col-md-9{width:75%}.col-md-10{width:83.33333333333334%}.col-md-11{width:91.66666666666666%}.col-md-12{width:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.333333333333332%}.col-md-push-2{left:16.666666666666664%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333333333333%}.col-md-push-5{left:41.66666666666667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.333333333333336%}.col-md-push-8{left:66.66666666666666%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333333333334%}.col-md-push-11{left:91.66666666666666%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-11{right:91.66666666666666%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-11{margin-left:91.66666666666666%}}@media(min-width:1200px){.container{max-width:1170px}.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{float:left}.col-lg-1{width:8.333333333333332%}.col-lg-2{width:16.666666666666664%}.col-lg-3{width:25%}.col-lg-4{width:33.33333333333333%}.col-lg-5{width:41.66666666666667%}.col-lg-6{width:50%}.col-lg-7{width:58.333333333333336%}.col-lg-8{width:66.66666666666666%}.col-lg-9{width:75%}.col-lg-10{width:83.33333333333334%}.col-lg-11{width:91.66666666666666%}.col-lg-12{width:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-11{left:91.66666666666666%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-11{margin-left:91.66666666666666%}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{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.428571429;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-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{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>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;border-color:#d6e9c6}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td{background-color:#d0e9c6;border-color:#c9e2b3}.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;border-color:#eed3d7}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td{background-color:#ebcccc;border-color:#e6c1c7}.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;border-color:#fbeed5}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td{background-color:#faf2cc;border-color:#f8e5be}@media(max-width:768px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd}.table-responsive>.table{margin-bottom:0;background-color:#fff}.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>thead>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>thead>tr:last-child>td,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{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;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}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-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,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;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"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{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],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.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{height:auto}.input-lg{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:45px;line-height:45px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label{color:#c09853}.has-warning .form-control{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.has-warning .input-group-addon{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.has-error .help-block,.has-error .control-label{color:#b94a48}.has-error .form-control{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.has-error .input-group-addon{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.has-success .help-block,.has-success .control-label{color:#468847}.has-success .form-control{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.has-success .input-group-addon{color:#468847;background-color:#dff0d8;border-color:#468847}.form-control-static{padding-top:7px;margin-bottom: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}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.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 .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.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,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;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: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-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.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: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:#428bca;border-color:#357ebd}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;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: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-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;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: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-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;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: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-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;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: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-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.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:#2a6496;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:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm,.btn-xs{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.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;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@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.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';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro: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-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-print:before{content:"\e045"}.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-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.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-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-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.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-briefcase:before{content:"\1f4bc"}.glyphicon-calendar:before{content:"\1f4c5"}.glyphicon-pushpin:before{content:"\1f4cc"}.glyphicon-paperclip:before{content:"\1f4ce"}.glyphicon-camera:before{content:"\1f4f7"}.glyphicon-lock:before{content:"\1f512"}.glyphicon-bell:before{content:"\1f514"}.glyphicon-bookmark:before{content:"\1f516"}.glyphicon-fire:before{content:"\1f525"}.glyphicon-wrench:before{content:"\1f527"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid #000;border-right:4px solid transparent;border-bottom:0 dotted;border-left:4px solid transparent;content:""}.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;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.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.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#fff;text-decoration:none;background-color:#428bca}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.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-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.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{border-top:0 dotted;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-default .caret{border-top-color:#333}.btn-primary .caret,.btn-success .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret{border-top-color:#fff}.dropup .btn-default .caret{border-bottom-color:#333}.dropup .btn-primary .caret,.dropup .btn-success .caret,.dropup .btn-warning .caret,.dropup .btn-danger .caret,.dropup .btn-info .caret{border-bottom-color:#fff}.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:focus,.btn-group-vertical>.btn:focus{outline:0}.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:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-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-bottom-left-radius:0;border-top-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>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:5px 10px;padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.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,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.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{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.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-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified .btn{display:table-cell;float:none;width:1%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group.col{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:45px;padding:10px 16px;font-size:18px;line-height:1.33;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:45px;line-height:45px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.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{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;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>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){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>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.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:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;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:#428bca}.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.428571429;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{text-align:center}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}}.nav-tabs.nav-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs.nav-justified>.active>a{border-bottom-color:#fff}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:5px}.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:#428bca}.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{text-align:center}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-bottom:1px solid #ddd}.nav-tabs-justified>.active>a{border-bottom-color:#fff}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tabbable:before,.tabbable:after{display:table;content:" "}.tabbable:after{clear:both}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.nav .caret{border-top-color:#428bca;border-bottom-color:#428bca}.nav a:hover .caret{border-top-color:#2a6496;border-bottom-color:#2a6496}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;z-index:1000;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;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-collapse .navbar-nav.navbar-left:first-child{margin-left:-15px}.navbar-collapse .navbar-nav.navbar-right:last-child{margin-right:-15px}.navbar-collapse .navbar-text:last-child{margin-right:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{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;border-width:0 0 1px}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;z-index:1030}.navbar-fixed-bottom{bottom:0;margin-bottom:0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .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;border:1px solid transparent;border-radius:4px}.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;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}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.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,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.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}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@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-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-text{float:left;margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{margin-right:15px;margin-left:15px}}.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:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e6e6e6}.navbar-default .navbar-nav>.dropdown>a:hover .caret,.navbar-default .navbar-nav>.dropdown>a:focus .caret{border-top-color:#333;border-bottom-color:#333}.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}.navbar-default .navbar-nav>.open>a .caret,.navbar-default .navbar-nav>.open>a:hover .caret,.navbar-default .navbar-nav>.open>a:focus .caret{border-top-color:#555;border-bottom-color:#555}.navbar-default .navbar-nav>.dropdown>a .caret{border-top-color:#777;border-bottom-color:#777}@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-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.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}.navbar-inverse .navbar-nav>.dropdown>a:hover .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-nav>.dropdown>a .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .navbar-nav>.open>a .caret,.navbar-inverse .navbar-nav>.open>a:hover .caret,.navbar-inverse .navbar-nav>.open>a:focus .caret{border-top-color:#fff;border-bottom-color:#fff}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.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:#999}.navbar-inverse .navbar-link:hover{color:#fff}.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:#999}.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.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-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{background-color:#eee}.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:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;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-bottom-left-radius:6px;border-top-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-bottom-left-radius:3px;border-top-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:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.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:#999;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}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.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:#999;border-radius:10px}.badge:empty{display:none}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}.btn .badge{position:relative;top:-1px}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1{font-size:63px}}.thumbnail{display:inline-block;display:block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img{display:block;height:auto;max-width:100%}a.thumbnail:hover,a.thumbnail:focus{border-color:#428bca}.thumbnail>img{margin-right:auto;margin-left:auto}.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{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#356635}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#2d6987}.alert-warning{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.alert-warning hr{border-top-color:#f8e5be}.alert-warning .alert-link{color:#a47e3c}.alert-danger{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-danger hr{border-top-color:#e6c1c7}.alert-danger .alert-link{color:#953b39}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 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,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-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-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.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-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}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{text-decoration:none;background-color:#f5f5f5}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}.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{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:#e1edf7}.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,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table{margin-bottom:0}.panel>.panel-body+.table{border-top:1px solid #ddd}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-title{margin-top:0;margin-bottom:0;font-size:16px}.panel-title>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-group .panel{margin-bottom:0;overflow:hidden;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{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-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#fbeed5}.panel-warning>.panel-heading{color:#c09853;background-color:#fcf8e3;border-color:#fbeed5}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#fbeed5}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#fbeed5}.panel-danger{border-color:#eed3d7}.panel-danger>.panel-heading{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#eed3d7}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#eed3d7}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.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,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,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;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}body.modal-open,.modal-open .navbar-fixed-top,.modal-open .navbar-fixed-bottom{margin-right:15px}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{z-index:1050;width:auto;padding:10px;margin-right:auto;margin-left:auto}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.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}@media screen and (min-width:768px){.modal-dialog{right:auto;left:50%;width:600px;padding-top:30px;padding-bottom:30px}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.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-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.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;font-weight:normal;line-height:18px;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{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.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;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.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,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.5)),to(rgba(0,0,0,0.0001)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-gradient(linear,0 top,100% top,from(rgba(0,0,0,0.0001)),to(rgba(0,0,0,0.5)));background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:-moz-linear-gradient(left,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;left:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.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;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,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.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}.affix{position:fixed}@-ms-viewport{width:device-width}@media screen and (max-width:400px){@-ms-viewport{width:320px}}.hidden{display:none!important;visibility:hidden!important}.visible-xs{display:none!important}tr.visible-xs{display:none!important}th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm{display:none!important}tr.visible-sm{display:none!important}th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md{display:none!important}tr.visible-md{display:none!important}th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg{display:none!important}tr.visible-lg{display:none!important}th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs{display:none!important}tr.hidden-xs{display:none!important}th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm{display:none!important}tr.hidden-xs.hidden-sm{display:none!important}th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md{display:none!important}tr.hidden-xs.hidden-md{display:none!important}th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg{display:none!important}tr.hidden-xs.hidden-lg{display:none!important}th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs{display:none!important}tr.hidden-sm.hidden-xs{display:none!important}th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm{display:none!important}tr.hidden-sm{display:none!important}th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md{display:none!important}tr.hidden-sm.hidden-md{display:none!important}th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg{display:none!important}tr.hidden-sm.hidden-lg{display:none!important}th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs{display:none!important}tr.hidden-md.hidden-xs{display:none!important}th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm{display:none!important}tr.hidden-md.hidden-sm{display:none!important}th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md{display:none!important}tr.hidden-md{display:none!important}th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg{display:none!important}tr.hidden-md.hidden-lg{display:none!important}th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs{display:none!important}tr.hidden-lg.hidden-xs{display:none!important}th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm{display:none!important}tr.hidden-lg.hidden-sm{display:none!important}th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md{display:none!important}tr.hidden-lg.hidden-md{display:none!important}th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg{display:none!important}tr.hidden-lg{display:none!important}th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print{display:none!important}tr.visible-print{display:none!important}th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print{display:none!important}tr.hidden-print{display:none!important}th.hidden-print,td.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/website/favicon.ico b/vendor/github.com/gocql/gocql/website/favicon.ico
deleted file mode 100644
index 821547373..000000000
Binary files a/vendor/github.com/gocql/gocql/website/favicon.ico and /dev/null differ
diff --git a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.eot b/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.eot
deleted file mode 100644
index 87eaa4342..000000000
Binary files a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.eot and /dev/null differ
diff --git a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.svg b/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.svg
deleted file mode 100644
index 5fee06854..000000000
--- a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.svg
+++ /dev/null
@@ -1,228 +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 />
-<glyph />
-<glyph unicode=" " />
-<glyph unicode="*" d="M1100 500h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200z" />
-<glyph unicode="+" d="M1100 400h-400v-400h-300v400h-400v300h400v400h300v-400h400v-300z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#x2000;" horiz-adv-x="652" />
-<glyph unicode="&#x2001;" horiz-adv-x="1304" />
-<glyph unicode="&#x2002;" horiz-adv-x="652" />
-<glyph unicode="&#x2003;" horiz-adv-x="1304" />
-<glyph unicode="&#x2004;" horiz-adv-x="434" />
-<glyph unicode="&#x2005;" horiz-adv-x="326" />
-<glyph unicode="&#x2006;" horiz-adv-x="217" />
-<glyph unicode="&#x2007;" horiz-adv-x="217" />
-<glyph unicode="&#x2008;" horiz-adv-x="163" />
-<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="326" />
-<glyph unicode="&#x20ac;" d="M800 500h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257 q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406z" />
-<glyph unicode="&#x2212;" d="M1100 700h-900v-300h900v300z" />
-<glyph unicode="&#x2601;" d="M178 300h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5q0 -80 56.5 -137t135.5 -57z" />
-<glyph unicode="&#x2709;" d="M1200 1100h-1200l600 -603zM300 600l-300 -300v600zM1200 900v-600l-300 300zM800 500l400 -400h-1200l400 400l200 -200z" />
-<glyph unicode="&#x270f;" d="M1101 889l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13l-94 -97zM401 189l614 614l-214 214l-614 -614zM-13 -13l333 112l-223 223z" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xe001;" d="M700 100h300v-100h-800v100h300v550l-500 550h1200l-500 -550v-550z" />
-<glyph unicode="&#xe002;" d="M1000 934v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7q-79 -25 -122.5 -82t-25.5 -112t86 -75.5t147 5.5 q65 21 109 69t44 90v606z" />
-<glyph unicode="&#xe003;" d="M913 432l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342t142 342t342 142t342 -142t142 -342q0 -142 -78 -261zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="&#xe005;" d="M649 949q48 69 109.5 105t121.5 38t118.5 -20.5t102.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-149.5 152.5t-126.5 127.5t-94 124.5t-33.5 117.5q0 64 28 123t73 100.5t104.5 64t119 20.5 t120 -38.5t104.5 -104.5z" />
-<glyph unicode="&#xe006;" d="M791 522l145 -449l-384 275l-382 -275l146 447l-388 280h479l146 400h2l146 -400h472zM168 71l2 1z" />
-<glyph unicode="&#xe007;" d="M791 522l145 -449l-384 275l-382 -275l146 447l-388 280h479l146 400h2l146 -400h472zM747 331l-74 229l193 140h-235l-77 211l-78 -211h-239l196 -142l-73 -226l192 140zM168 71l2 1z" />
-<glyph unicode="&#xe008;" d="M1200 143v-143h-1200v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100z" />
-<glyph unicode="&#xe009;" d="M1200 1100v-1100h-1200v1100h1200zM200 1000h-100v-100h100v100zM900 1000h-600v-400h600v400zM1100 1000h-100v-100h100v100zM200 800h-100v-100h100v100zM1100 800h-100v-100h100v100zM200 600h-100v-100h100v100zM1100 600h-100v-100h100v100zM900 500h-600v-400h600 v400zM200 400h-100v-100h100v100zM1100 400h-100v-100h100v100zM200 200h-100v-100h100v100zM1100 200h-100v-100h100v100z" />
-<glyph unicode="&#xe010;" d="M500 1050v-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.5h400q21 0 35.5 -14.5t14.5 -35.5zM1100 1050v-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.5h400 q21 0 35.5 -14.5t14.5 -35.5zM500 450v-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.5h400q21 0 35.5 -14.5t14.5 -35.5zM1100 450v-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.5h400q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe011;" d="M300 1050v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM700 1050v-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.5h200 q21 0 35.5 -14.5t14.5 -35.5zM1100 1050v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM300 650v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM700 650v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM1100 650v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM300 250v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM700 250v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM1100 250v-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.5h200q21 0 35.5 -14.5 t14.5 -35.5z" />
-<glyph unicode="&#xe012;" d="M300 1050v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM1200 1050v-200q0 -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.5h700 q21 0 35.5 -14.5t14.5 -35.5zM300 450v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-200q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5zM1200 650v-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.5h700q21 0 35.5 -14.5t14.5 -35.5zM300 250v-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.5h200q21 0 35.5 -14.5t14.5 -35.5zM1200 250v-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.5h700q21 0 35.5 -14.5t14.5 -35.5z" />
-<glyph unicode="&#xe013;" d="M448 34l818 820l-212 212l-607 -607l-206 207l-212 -212z" />
-<glyph unicode="&#xe014;" d="M882 106l-282 282l-282 -282l-212 212l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282z" />
-<glyph unicode="&#xe015;" d="M913 432l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342t142 342t342 142t342 -142t142 -342q0 -142 -78 -261zM507 363q137 0 233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5t-234 -97t-97 -233 t97 -233t234 -97zM600 800h100v-200h-100v-100h-200v100h-100v200h100v100h200v-100z" />
-<glyph unicode="&#xe016;" d="M913 432l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342t142 342t342 142t342 -142t142 -342q0 -141 -78 -262zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 801v-200h400v200h-400z" />
-<glyph unicode="&#xe017;" d="M700 750v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5zM800 975v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123 t-123 184t-45.5 224.5q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155z" />
-<glyph unicode="&#xe018;" d="M1200 1h-200v1200h200v-1200zM900 1h-200v800h200v-800zM600 1h-200v500h200v-500zM300 301h-200v-300h200v300z" />
-<glyph unicode="&#xe019;" d="M488 183l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5 q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39zM600 815q89 0 152 -63 t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152q0 88 63 151t152 63z" />
-<glyph unicode="&#xe020;" d="M900 1100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100zM800 1100v100h-300v-100h300zM200 900h900v-800q0 -41 -29.5 -71 t-70.5 -30h-700q-41 0 -70.5 30t-29.5 71v800zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
-<glyph unicode="&#xe021;" d="M1301 601h-200v-600h-300v400h-300v-400h-300v600h-200l656 644z" />
-<glyph unicode="&#xe022;" d="M600 700h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18v1150q0 11 7 18t18 7h475v-500zM1000 800h-300v300z" />
-<glyph unicode="&#xe023;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM600 600h200 v-100h-300v400h100v-300z" />
-<glyph unicode="&#xe024;" d="M721 400h-242l-40 -400h-539l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538zM712 500l-27 300h-170l-27 -300h224z" />
-<glyph unicode="&#xe025;" d="M1100 400v-400h-1100v400h490l-290 300h200v500h300v-500h200l-290 -300h490zM988 300h-175v-100h175v100z" />
-<glyph unicode="&#xe026;" d="M600 1199q122 0 233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233t47.5 233t127.5 191t191 127.5t233 47.5zM600 1012q-170 0 -291 -121t-121 -291t121 -291t291 -121t291 121 t121 291t-121 291t-291 121zM700 600h150l-250 -300l-250 300h150v300h200v-300z" />
-<glyph unicode="&#xe027;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM850 600h-150 v-300h-200v300h-150l250 300z" />
-<glyph unicode="&#xe028;" d="M0 500l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18v475zM903 1000h-606l-97 -500h200l50 -200h300l50 200h200z" />
-<glyph unicode="&#xe029;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5zM797 598 l-297 -201v401z" />
-<glyph unicode="&#xe030;" d="M1177 600h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123t-123 -184t-45.5 -224.5t45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123 t123 184t45.5 224.5z" />
-<glyph unicode="&#xe031;" d="M700 800l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400zM500 400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122l-145 -145v400h400z" />
-<glyph unicode="&#xe032;" d="M100 1200v-1200h1100v1200h-1100zM1100 100h-900v900h900v-900zM400 800h-100v100h100v-100zM1000 800h-500v100h500v-100zM400 600h-100v100h100v-100zM1000 600h-500v100h500v-100zM400 400h-100v100h100v-100zM1000 400h-500v100h500v-100zM400 200h-100v100h100v-100 zM1000 300h-500v-100h500v100z" />
-<glyph unicode="&#xe034;" d="M200 0h-100v1100h100v-1100zM1100 600v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5z" />
-<glyph unicode="&#xe035;" d="M1200 275v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5t-49.5 -227v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50 q11 0 18 7t7 18zM400 480v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14zM1000 480v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14z" />
-<glyph unicode="&#xe036;" d="M0 800v-400h300l300 -200v800l-300 -200h-300zM971 600l141 -141l-71 -71l-141 141l-141 -141l-71 71l141 141l-141 141l71 71l141 -141l141 141l71 -71z" />
-<glyph unicode="&#xe037;" d="M0 800v-400h300l300 -200v800l-300 -200h-300zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
-<glyph unicode="&#xe038;" d="M974 186l6 8q142 178 142 405q0 230 -144 408l-6 8l-83 -64l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8zM300 801l300 200v-800l-300 200h-300v400h300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257z" />
-<glyph unicode="&#xe039;" d="M100 700h400v100h100v100h-100v300h-500v-600h100v100zM1200 700v500h-600v-200h100v-300h200v-300h300v200h-200v100h200zM100 1100h300v-300h-300v300zM800 800v300h300v-300h-300zM200 900h100v100h-100v-100zM900 1000h100v-100h-100v100zM300 600h-100v-100h-200 v-500h500v500h-200v100zM900 200v-100h-200v100h-100v100h100v200h-200v100h300v-300h200v-100h-100zM400 400v-300h-300v300h300zM300 200h-100v100h100v-100zM1100 300h100v-100h-100v100zM600 100h100v-100h-100v100zM1200 100v-100h-300v100h300z" />
-<glyph unicode="&#xe040;" d="M100 1200h-100v-1000h100v1000zM300 200h-100v1000h100v-1000zM700 200h-200v1000h200v-1000zM900 200h-100v1000h100v-1000zM1200 1200v-1000h-200v1000h200zM400 100v-100h-300v100h300zM500 91h100v-91h-100v91zM700 91h100v-91h-100v91zM1100 91v-91h-200v91h200z " />
-<glyph unicode="&#xe041;" d="M1200 500l-500 -500l-699 700v475q0 10 7.5 17.5t17.5 7.5h474zM320 882q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71t29 -71q30 -30 71.5 -30t71.5 30z" />
-<glyph unicode="&#xe042;" d="M1201 500l-500 -500l-699 700v475q0 11 7 18t18 7h474zM1501 500l-500 -500l-50 50l450 450l-700 700h100zM320 882q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71t30 -71q29 -30 71 -30t71 30z" />
-<glyph unicode="&#xe043;" d="M1200 1200v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900v1025l175 175h925z" />
-<glyph unicode="&#xe045;" d="M947 829l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18l-94 -346l40 -124h592zM1200 800v-700h-200v200h-800v-200h-200v700h200l100 -200h600l100 200h200zM881 176l38 -152q2 -10 -3.5 -17t-15.5 -7h-600q-10 0 -15.5 7t-3.5 17l38 152q2 10 11.5 17t19.5 7 h500q10 0 19.5 -7t11.5 -17z" />
-<glyph unicode="&#xe047;" d="M1200 0v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417zM416 521l178 457l46 -140l116 -317 h-340z" />
-<glyph unicode="&#xe048;" d="M100 1199h471q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111t-162 -38.5h-500v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21 t-29 14t-49 14.5v70zM400 1079v-379h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400z" />
-<glyph unicode="&#xe049;" d="M877 1200l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425z" />
-<glyph unicode="&#xe050;" d="M1150 1200h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49v300h150h700zM100 1000v-800h75l-125 -167l-125 167h75v800h-75l125 167 l125 -167h-75z" />
-<glyph unicode="&#xe051;" d="M950 1201h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50v300h150h700zM200 101h800v75l167 -125l-167 -125v75h-800v-75l-167 125l167 125 v-75z" />
-<glyph unicode="&#xe052;" d="M700 950v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35zM1100 650v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h1000 q21 0 35.5 15t14.5 35zM900 350v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35zM1200 50v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35 t35.5 -15h1100q21 0 35.5 15t14.5 35z" />
-<glyph unicode="&#xe053;" d="M1000 950v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35zM1200 650v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h1100 q21 0 35.5 15t14.5 35zM1000 350v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35zM1200 50v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35 t35.5 -15h1100q21 0 35.5 15t14.5 35z" />
-<glyph unicode="&#xe054;" d="M500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe055;" d="M0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe056;" d="M0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35zM0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe057;" d="M400 1100h-100v-1100h100v1100zM700 950v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35zM1100 650v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15 h500q20 0 35 15t15 35zM100 425v75h-201v100h201v75l166 -125zM900 350v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35zM1200 50v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5 v-100q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35z" />
-<glyph unicode="&#xe058;" d="M201 950v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35zM801 1100h100v-1100h-100v1100zM601 650v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15 h500q20 0 35 15t15 35zM1101 425v75h200v100h-200v75l-167 -125zM401 350v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35zM701 50v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5 v-100q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35z" />
-<glyph unicode="&#xe059;" d="M900 925v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53zM1200 300l-300 300l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M1200 1056v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31zM1100 1000h-1000v-737l247 182l298 -131l-74 156l293 318l236 -288v500zM476 750q0 -56 -39 -95t-95 -39t-95 39t-39 95t39 95t95 39t95 -39 t39 -95z" />
-<glyph unicode="&#xe062;" d="M600 1213q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262q0 124 60.5 231.5t165 172t226.5 64.5zM599 514q107 0 182.5 75.5t75.5 182.5t-75.5 182 t-182.5 75t-182 -75.5t-75 -181.5q0 -107 75.5 -182.5t181.5 -75.5z" />
-<glyph unicode="&#xe063;" d="M600 1199q122 0 233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233t47.5 233t127.5 191t191 127.5t233 47.5zM600 173v854q-176 0 -301.5 -125t-125.5 -302t125.5 -302t301.5 -125z " />
-<glyph unicode="&#xe064;" d="M554 1295q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5zM455 296q-7 6 -18 17 t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156q14 -82 59.5 -136t136.5 -80z" />
-<glyph unicode="&#xe065;" d="M1108 902l113 113l-21 85l-92 28l-113 -113zM1100 625v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5 t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125zM436 341l161 50l412 412l-114 113l-405 -405z" />
-<glyph unicode="&#xe066;" d="M1100 453v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-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.5z M813 431l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209z" />
-<glyph unicode="&#xe067;" d="M1100 569v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5v300q0 165 117.5 282.5t282.5 117.5h300q60 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.5v69z M625 348l566 567l-136 137l-430 -431l-147 147l-136 -136z" />
-<glyph unicode="&#xe068;" d="M900 303v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198l-300 300l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296z" />
-<glyph unicode="&#xe069;" d="M900 0l-500 488v-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.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100z" />
-<glyph unicode="&#xe070;" d="M1200 0l-500 488v-488l-500 488v-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.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100z" />
-<glyph unicode="&#xe071;" d="M1200 0l-500 488v-488l-564 550l564 550v-487l500 487v-1100z" />
-<glyph unicode="&#xe072;" d="M1100 550l-900 550v-1100z" />
-<glyph unicode="&#xe073;" d="M500 150v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5zM900 150v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800q0 -21 14.5 -35.5t35.5 -14.5h200 q21 0 35.5 14.5t14.5 35.5z" />
-<glyph unicode="&#xe074;" d="M1100 150v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35z" />
-<glyph unicode="&#xe075;" d="M500 0v488l-500 -488v1100l500 -487v487l564 -550z" />
-<glyph unicode="&#xe076;" d="M1050 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-500 -488v488l-500 -488v1100l500 -487v487l500 -487v437q0 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-500 -488v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5z" />
-<glyph unicode="&#xe078;" d="M650 1064l-550 -564h1100zM1200 350v-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="&#xe079;" d="M777 7l240 240l-353 353l353 353l-240 240l-592 -594z" />
-<glyph unicode="&#xe080;" d="M513 -46l-241 240l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1z" />
-<glyph unicode="&#xe081;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM500 900v-200h-200v-200h200v-200h200v200h200v200h-200v200h-200z" />
-<glyph unicode="&#xe082;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM300 700v-200h600v200h-600z" />
-<glyph unicode="&#xe083;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM247 741l141 -141l-142 -141l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141 l-141 142z" />
-<glyph unicode="&#xe084;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM546 623l-102 102l-174 -174l276 -277l411 411l-175 174z" />
-<glyph unicode="&#xe085;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM500 500h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3 q-105 0 -172 -56t-67 -183h144q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5zM500 400v-100h200v100h-200z" />
-<glyph unicode="&#xe086;" d="M600 1197q162 0 299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5t80 299.5t217.5 217.5t299.5 80zM500 900v-100h200v100h-200zM400 700v-100h100v-200h-100v-100h400v100h-100v300h-300z" />
-<glyph unicode="&#xe087;" d="M1200 700v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203zM700 500v-206q149 48 201 206h-201v200h200 q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210q24 -73 79.5 -127.5t130.5 -78.5v206h200z" />
-<glyph unicode="&#xe088;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM844 735 l-135 -135l135 -135l-109 -109l-135 135l-135 -135l-109 109l135 135l-135 135l109 109l135 -135l135 135z" />
-<glyph unicode="&#xe089;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM896 654 l-346 -345l-228 228l141 141l87 -87l204 205z" />
-<glyph unicode="&#xe090;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM248 385l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5q0 -115 62 -215zM955 809l-564 -564q97 -59 209 -59q171 0 292.5 121.5 t121.5 292.5q0 112 -59 209z" />
-<glyph unicode="&#xe091;" d="M1200 400h-600v-301l-600 448l600 453v-300h600v-300z" />
-<glyph unicode="&#xe092;" d="M600 400h-600v300h600v300l600 -453l-600 -448v301z" />
-<glyph unicode="&#xe093;" d="M1098 600h-298v-600h-300v600h-296l450 600z" />
-<glyph unicode="&#xe094;" d="M998 600l-449 -600l-445 600h296v600h300v-600h298z" />
-<glyph unicode="&#xe095;" d="M600 199v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453z" />
-<glyph unicode="&#xe096;" d="M1200 1200h-400l129 -129l-294 -294l142 -142l294 294l129 -129v400zM565 423l-294 -294l129 -129h-400v400l129 -129l294 294z" />
-<glyph unicode="&#xe097;" d="M871 730l129 -130h-400v400l129 -129l295 295l142 -141zM200 600h400v-400l-129 130l-295 -295l-142 141l295 295z" />
-<glyph unicode="&#xe101;" d="M600 1177q118 0 224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5t45.5 224.5t123 184t184 123t224.5 45.5zM686 549l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5 l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5t21.5 34.5zM700 400h-200v-100h200v100z" />
-<glyph unicode="&#xe102;" d="M1200 900h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100h100v-200h400v300h200v-300h400v200h100v100z M731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269zM481 900h-281q-3 0 14 48t35 96l18 47zM100 0h400v400h-400v-400zM700 400h400v-400h-400v400z" />
-<glyph unicode="&#xe103;" d="M0 121l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55l-201 -202 v143zM692 611q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5t86.5 76.5q55 66 367 234z" />
-<glyph unicode="&#xe105;" d="M1261 600l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30l-26 40l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5 t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30zM600 240q64 0 123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212 q0 85 46 158q-102 -87 -226 -258q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5zM484 762l-107 -106q49 -124 154 -191l105 105q-37 24 -75 72t-57 84z" />
-<glyph unicode="&#xe106;" d="M906 1200l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43l-26 40l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148zM1261 600l-26 -40q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5 t-124 -100t-146.5 -79l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52zM513 264l37 141q-107 18 -178.5 101.5t-71.5 193.5q0 85 46 158q-102 -87 -226 -258q210 -282 393 -336z M484 762l-107 -106q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68z" />
-<glyph unicode="&#xe107;" d="M-47 0h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66t50.5 -34zM700 200v100h-200v-100h-345l445 723l445 -723h-345zM700 700h-200v-100l100 -300l100 300v100z" />
-<glyph unicode="&#xe108;" d="M800 711l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -21 -13 -29t-32 1l-94 78h-222l-94 -78q-19 -9 -32 -1t-13 29v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5v41q0 20 11 44.5t26 38.5 l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339z" />
-<glyph unicode="&#xe110;" d="M941 800l-600 -600h-341v200h259l600 600h241v198l300 -295l-300 -300v197h-159zM381 678l141 142l-181 180h-341v-200h259zM1100 598l300 -295l-300 -300v197h-241l-181 181l141 142l122 -123h159v198z" />
-<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="M400 900h-300v300h300v-300zM1100 900h-300v300h300v-300zM1100 800v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5t-58 109.5t-31.5 116t-15 104t-3 83v200h300v-250q0 -113 6 -145 q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300z" />
-<glyph unicode="&#xe113;" d="M902 184l226 227l-578 579l-580 -579l227 -227l352 353z" />
-<glyph unicode="&#xe114;" d="M650 218l578 579l-226 227l-353 -353l-352 353l-227 -227z" />
-<glyph unicode="&#xe115;" d="M1198 400v600h-796l215 -200h381v-400h-198l299 -283l299 283h-200zM-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196z" />
-<glyph unicode="&#xe116;" d="M1050 1200h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35 q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43l-100 475q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.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="M201 800l-200 -400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000zM1501 700l-300 -700h-1200l300 700h1200z" />
-<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
-<glyph unicode="&#xe120;" d="M900 303v197h-600v-197l-300 297l300 298v-198h600v198l300 -298z" />
-<glyph unicode="&#xe121;" d="M31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM100 300h1000q41 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.5zM900 200h-100v-100h100v100z M1100 200h-100v-100h100v100z" />
-<glyph unicode="&#xe122;" d="M1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35zM325 800l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35q-56 337 -56 351v250v5 q0 13 0.5 18.5t2.5 13t8 10.5t15 3h200zM-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5z" />
-<glyph unicode="&#xe124;" d="M445 1180l-45 -233l-224 78l78 -225l-233 -44l179 -156l-179 -155l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180z" />
-<glyph unicode="&#xe125;" d="M700 1200h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400q0 -75 100 -75h61q123 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5zM700 925l-50 -225h450 v-125l-250 -375h-214l-136 100h-100v375l150 212l100 213h50v-175zM0 800v-600h200v600h-200z" />
-<glyph unicode="&#xe126;" d="M700 0h-50q-27 0 -51 20t-38 48l-96 198l-145 196q-20 26 -20 63v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5zM200 400h-200v600h200 v-600zM700 275l-50 225h450v125l-250 375h-214l-136 -100h-100v-375l150 -212l100 -213h50v175z" />
-<glyph unicode="&#xe127;" d="M364 873l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341q-7 0 -90 81t-83 94v525q0 17 14 35.5t28 28.5zM408 792v-503 l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83zM208 200h-200v600h200v-600z" />
-<glyph unicode="&#xe128;" d="M475 1104l365 -230q7 -4 16.5 -10.5t26 -26t16.5 -36.5v-526q0 -13 -85.5 -93.5t-93.5 -80.5h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-84 0 -139 39t-55 111t54 110t139 37h302l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6zM370 946 l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100h222q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l106 89v502l-342 237zM1199 201h-200v600h200v-600z" />
-<glyph unicode="&#xe129;" d="M1100 473v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90zM911 400h-503l-236 339 l83 86l183 -146q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294zM1000 200v-200h-600v200h600z" />
-<glyph unicode="&#xe130;" d="M305 1104v200h600v-200h-600zM605 310l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15l-230 -362q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85l-1 -302q0 -84 38.5 -138t110.5 -54t111 55t39 139v106z M905 804v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146l-83 86l237 339h503z" />
-<glyph unicode="&#xe131;" d="M603 1195q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5zM598 701h-298v-201h300l-2 -194l402 294l-402 298v-197z" />
-<glyph unicode="&#xe132;" d="M597 1195q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5zM200 600l400 -294v194h302v201h-300v197z" />
-<glyph unicode="&#xe133;" d="M603 1195q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5zM300 600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="&#xe134;" d="M603 1195q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5zM500 900v-300h-200l300 -400l300 400h-200v300h-200z" />
-<glyph unicode="&#xe135;" d="M603 1195q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5zM627 1101q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6 q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55 t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q102 -2 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7 q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5 t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23q-19 -3 -37 0zM613 994q0 -18 8 -42.5t16.5 -44t9.5 -23.5q-9 2 -31 5t-36 5t-32 8t-30 14q3 12 16 30t16 25q10 -10 18.5 -10 t14 6t14.5 14.5t16 12.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="M1100 1200v-100h-1000v100h1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
-<glyph unicode="&#xe140;" d="M329 729l142 142l-200 200l129 129h-400v-400l129 129zM1200 1200v-400l-129 129l-200 -200l-142 142l200 200l-129 129h400zM271 129l129 -129h-400v400l129 -129l200 200l142 -142zM1071 271l129 129v-400h-400l129 129l-200 200l142 142z" />
-<glyph unicode="&#xe141;" d="M596 1192q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM596 1010q-171 0 -292.5 -121.5t-121.5 -292.5q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5zM455 905 q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5t16 38.5t39 16.5zM708 821l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5 q0 32 20.5 56.5t51.5 29.5zM855 709q23 0 38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39q0 22 16 38t39 16zM345 709q23 0 39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39t15.5 38.5t38.5 15.5z" />
-<glyph unicode="&#xe143;" d="M649 54l-16 22q-90 125 -293 323q-71 70 -104.5 105.5t-77 89.5t-61 99t-17.5 91q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-203 -198 -293 -323zM844 524l12 12 q64 62 97.5 97t64.5 79t31 72q0 71 -48 119t-105 48q-74 0 -132 -82l-118 -171l-114 174q-51 79 -123 79q-60 0 -109.5 -49t-49.5 -118q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203z" />
-<glyph unicode="&#xe144;" d="M476 406l19 -17l105 105l-212 212l389 389l247 -247l-95 -96l18 -18q46 -46 77 -99l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159q0 -93 66 -159zM123 193l141 -141q66 -66 159 -66q95 0 159 66 l283 283q66 66 66 159t-66 159l-141 141q-12 12 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159q0 -94 66 -160z" />
-<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM900 1000h-600v-700h600v700zM600 46q43 0 73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5t-73.5 -30.5t-30.5 -73.5 t30.5 -73.5t73.5 -30.5z" />
-<glyph unicode="&#xe148;" d="M700 1029v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5h139q5 -77 48.5 -126.5t117.5 -64.5v335l-27 7q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5 t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5zM600 755v274q-61 -8 -97.5 -37.5t-36.5 -102.5q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3zM700 548 v-311q170 18 170 151q0 64 -44 99.5t-126 60.5z" />
-<glyph unicode="&#xe149;" d="M866 300l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5t-30 142.5h-221v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5 t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -11 2.5 -24.5t5.5 -24t9.5 -26.5t10.5 -25t14 -27.5t14 -25.5t15.5 -27t13.5 -24h242v-100h-197q8 -50 -2.5 -115t-31.5 -94 q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30z" />
-<glyph unicode="&#xe150;" d="M300 0l298 300h-198v900h-200v-900h-198zM900 1200l298 -300h-198v-900h-200v900h-198z" />
-<glyph unicode="&#xe151;" d="M400 300h198l-298 -300l-298 300h198v900h200v-900zM1000 1200v-500h-100v100h-100v-100h-100v500h300zM901 1100h-100v-200h100v200zM700 500h300v-200h-99v-100h-100v100h99v100h-200v100zM800 100h200v-100h-300v200h100v-100z" />
-<glyph unicode="&#xe152;" d="M400 300h198l-298 -300l-298 300h198v900h200v-900zM1000 1200v-200h-99v-100h-100v100h99v100h-200v100h300zM800 800h200v-100h-300v200h100v-100zM700 500h300v-500h-100v100h-100v-100h-100v500zM801 200h100v200h-100v-200z" />
-<glyph unicode="&#xe153;" d="M300 0l298 300h-198v900h-200v-900h-198zM900 1100h-100v100h200v-500h-100v400zM1100 500v-500h-100v100h-200v400h300zM1001 400h-100v-200h100v200z" />
-<glyph unicode="&#xe154;" d="M300 0l298 300h-198v900h-200v-900h-198zM1100 1200v-500h-100v100h-200v400h300zM1001 1100h-100v-200h100v200zM900 400h-100v100h200v-500h-100v400z" />
-<glyph unicode="&#xe155;" d="M300 0l298 300h-198v900h-200v-900h-198zM900 1000h-200v200h200v-200zM1000 700h-300v200h300v-200zM1100 400h-400v200h400v-200zM1200 100h-500v200h500v-200z" />
-<glyph unicode="&#xe156;" d="M300 0l298 300h-198v900h-200v-900h-198zM1200 1000h-500v200h500v-200zM1100 700h-400v200h400v-200zM1000 400h-300v200h300v-200zM900 100h-200v200h200v-200z" />
-<glyph unicode="&#xe157;" d="M400 1100h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5v300q0 165 117.5 282.5t282.5 117.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.5 t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5z" />
-<glyph unicode="&#xe158;" d="M700 0h-300q-163 0 -281.5 117.5t-118.5 282.5v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.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.5 t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5zM400 800v-500l333 250z" />
-<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM900 300v500q0 41 -29.5 70.5t-70.5 29.5h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5 t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5zM800 700h-500l250 -333z" />
-<glyph unicode="&#xe160;" d="M1100 700v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5zM900 300v500q0 41 -29.5 70.5t-70.5 29.5h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5 t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5zM550 733l-250 -333h500z" />
-<glyph unicode="&#xe161;" d="M500 1100h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200zM700 550l-400 -350v200h-300v300h300v200z" />
-<glyph unicode="&#xe162;" d="M403 2l9 -1q13 0 26 16l538 630q15 19 6 36q-8 18 -32 16h-300q1 4 78 219.5t79 227.5q2 17 -6 27l-8 8h-9q-16 0 -25 -15q-4 -5 -98.5 -111.5t-228 -257t-209.5 -238.5q-17 -19 -7 -40q10 -19 32 -19h302q-155 -438 -160 -458q-5 -21 4 -32z" />
-<glyph unicode="&#xe163;" d="M800 200h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185zM900 200v200h-300v300h300v200l400 -350z" />
-<glyph unicode="&#xe164;" d="M1200 700l-149 149l-342 -353l-213 213l353 342l-149 149h500v-500zM1022 571l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5v-300 q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98z" />
-<glyph unicode="&#xe165;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM600 794 q80 0 137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137t57 137t137 57z" />
-<glyph unicode="&#xe166;" d="M700 800v400h-300v-400h-300l445 -500l450 500h-295zM25 300h1048q11 0 19 -7.5t8 -17.5v-275h-1100v275q0 11 7 18t18 7zM1000 200h-100v-50h100v50z" />
-<glyph unicode="&#xe167;" d="M400 700v-300h300v300h295l-445 500l-450 -500h300zM25 300h1048q11 0 19 -7.5t8 -17.5v-275h-1100v275q0 11 7 18t18 7zM1000 200h-100v-50h100v50z" />
-<glyph unicode="&#xe168;" d="M405 400l596 596l-154 155l-442 -442l-150 151l-155 -155zM25 300h1048q11 0 19 -7.5t8 -17.5v-275h-1100v275q0 11 7 18t18 7zM1000 200h-100v-50h100v50z" />
-<glyph unicode="&#xe169;" d="M409 1103l-97 97l-212 -212l97 -98zM650 861l-149 149l-212 -212l149 -149l-238 -248h700v699zM25 300h1048q11 0 19 -7.5t8 -17.5v-275h-1100v275q0 11 7 18t18 7zM1000 200h-100v-50h100v50z" />
-<glyph unicode="&#xe170;" d="M539 950l-149 -149l212 -212l149 148l248 -237v700h-699zM297 709l-97 -97l212 -212l98 97zM25 300h1048q11 0 19 -7.5t8 -17.5v-275h-1100v275q0 11 7 18t18 7zM1000 200h-100v-50h100v50z" />
-<glyph unicode="&#xe171;" d="M1200 1199v-1079l-475 272l-310 -393v416h-392zM1166 1148l-672 -712v-226z" />
-<glyph unicode="&#xe172;" d="M1100 1000v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100zM700 1200h-100v-200h100v200z" />
-<glyph unicode="&#xe173;" d="M578 500h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120zM700 1200h-100v-200h100v200zM1300 538l-475 -476l-244 244l123 123l120 -120l353 352z" />
-<glyph unicode="&#xe174;" d="M529 500h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170zM700 1200h-100v-200h100v200zM1167 6l-170 170l-170 -170l-127 127l170 170l-170 170l127 127l170 -170l170 170l127 -128 l-170 -169l170 -170z" />
-<glyph unicode="&#xe175;" d="M700 500h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200zM700 1000h-100v200h100v-200zM1000 600h-200v-300h-200l300 -300l300 300h-200v300z" />
-<glyph unicode="&#xe176;" d="M602 500h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200zM700 1000h-100v200h100v-200zM1000 300h200l-300 300l-300 -300h200v-300h200v300z" />
-<glyph unicode="&#xe177;" d="M1200 900v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150h1200zM0 800v-550q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200zM100 500h400v-200h-400v200z" />
-<glyph unicode="&#xe178;" d="M500 1000h400v198l300 -298l-300 -298v198h-400v200zM100 800v200h100v-200h-100zM400 800h-100v200h100v-200zM700 300h-400v-198l-300 298l300 298v-198h400v-200zM800 500h100v-200h-100v200zM1000 500v-200h100v200h-100z" />
-<glyph unicode="&#xe179;" d="M1200 50v1106q0 31 -18 40.5t-44 -7.5l-276 -117q-25 -16 -43.5 -50.5t-18.5 -65.5v-359q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5zM550 1200l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447l-100 203v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300z" />
-<glyph unicode="&#xe180;" d="M1100 106v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394 q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5z" />
-<glyph unicode="&#xe181;" d="M675 1000l-100 100h-375l-100 -100h400l200 -200v-98l295 98h105v200h-425zM500 300v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5zM100 800h300v-200h-300v200zM700 565l400 133 v-163l-400 -133v163zM100 500h300v-200h-300v200zM805 300l295 98v-298h-425l-100 -100h-375l-100 100h400l200 200h105z" />
-<glyph unicode="&#xe182;" d="M179 1169l-162 -162q-1 -11 -0.5 -32.5t16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q16 17 13 40.5t-22 37.5l-192 136q-19 14 -45 12t-42 -19l-119 -118q-143 103 -267 227q-126 126 -227 268l118 118 q17 17 20 41.5t-11 44.5l-139 194q-14 19 -36.5 22t-40.5 -14z" />
-<glyph unicode="&#xe183;" d="M1200 712v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40t-53.5 -36.5t-31 -27.5l-9 -10v-200q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38 t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5zM800 650l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -15 -35.5t-35 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5 t30 -27.5t12 -24l1 -10v-50z" />
-<glyph unicode="&#xe184;" d="M175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250zM1200 100v-100h-1100v100h1100z" />
-<glyph unicode="&#xe185;" d="M600 1100h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300v1000q0 41 29.5 70.5t70.5 29.5zM1000 800h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300v700q0 41 29.5 70.5t70.5 29.5zM400 0v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400h300z" />
-<glyph unicode="&#xe186;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM200 800v-300h200v-100h-200v-100h300v300h-200v100h200v100h-300zM800 800h-200v-500h200v100h100v300h-100 v100zM800 700v-300h-100v300h100z" />
-<glyph unicode="&#xe187;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM400 600h-100v200h-100v-500h100v200h100v-200h100v500h-100v-200zM800 800h-200v-500h200v100h100v300h-100 v100zM800 700v-300h-100v300h100z" />
-<glyph unicode="&#xe188;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM200 800v-500h300v100h-200v300h200v100h-300zM600 800v-500h300v100h-200v300h200v100h-300z" />
-<glyph unicode="&#xe189;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM500 700l-300 -150l300 -150v300zM600 400l300 150l-300 150v-300z" />
-<glyph unicode="&#xe190;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM900 800v-500h-700v500h700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM800 700h-130 q-38 0 -66.5 -43t-28.5 -108t27 -107t68 -42h130v300z" />
-<glyph unicode="&#xe191;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM200 800v-300h200v-100h-200v-100h300v300h-200v100h200v100h-300zM800 300h100v500h-200v-100h100v-400z M601 300h100v100h-100v-100z" />
-<glyph unicode="&#xe192;" d="M1200 800v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212zM1000 900h-900v-700h900v700zM300 700v100h-100v-500h300v400h-200zM800 300h100v500h-200v-100h100v-400zM401 400h-100v200h100v-200z M601 300h100v100h-100v-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 88zM1000 900h-900v-700h900v700zM400 700h-200v100h300v-300h-99v-100h-100v100h99v200zM800 700h-100v100h200v-500h-100v400zM201 400h100v-100 h-100v100zM701 300h-100v100h100v-100z" />
-<glyph unicode="&#xe194;" d="M600 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM600 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM800 700h-300 v-200h300v-100h-300l-100 100v200l100 100h300v-100z" />
-<glyph unicode="&#xe195;" d="M596 1196q162 0 299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299t80 299t217 217t299 80zM596 1014q-171 0 -292.5 -121.5t-121.5 -292.5t121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5zM800 700v-100 h-100v100h-200v-100h200v-100h-200v-100h-100v400h300zM800 400h-100v100h100v-100z" />
-<glyph unicode="&#xe197;" d="M800 300h128q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5q0 -80 56.5 -137t135.5 -57h222v300h400v-300zM700 200h200l-300 -300 l-300 300h200v300h200v-300z" />
-<glyph unicode="&#xe198;" d="M600 714l403 -403q94 26 154.5 104t60.5 178q0 121 -85 207.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5q0 -80 56.5 -137t135.5 -57h8zM700 -100h-200v300h-200l300 300 l300 -300h-200v-300z" />
-<glyph unicode="&#xe199;" d="M700 200h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170l-270 -300h400v-155l-75 -45h350l-75 45v155z" />
-<glyph unicode="&#xe200;" d="M700 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -12t1 -11q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5 q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350z" />
-<glyph unicode="&#x1f4bc;" d="M800 1000h300q41 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.5h200q41 0 70.5 -29.5t29.5 -70.5v-100zM500 1000h200v100h-200v-100zM1200 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="&#x1f4c5;" d="M1100 900v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150h1100zM0 800v-750q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100zM100 600h100v-100h-100v100zM300 600h100v-100h-100v100z M500 600h100v-100h-100v100zM700 600h100v-100h-100v100zM900 600h100v-100h-100v100zM100 400h100v-100h-100v100zM300 400h100v-100h-100v100zM500 400h100v-100h-100v100zM700 400h100v-100h-100v100zM900 400h100v-100h-100v100zM100 200h100v-100h-100v100zM300 200 h100v-100h-100v100zM500 200h100v-100h-100v100zM700 200h100v-100h-100v100zM900 200h100v-100h-100v100z" />
-<glyph unicode="&#x1f4cc;" d="M902 1185l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207l-380 -303l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15z" />
-<glyph unicode="&#x1f4ce;" d="M518 119l69 -60l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163t35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84 t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348 q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256z" />
-<glyph unicode="&#x1f4f7;" d="M1200 200v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5z M1000 700h-100v100h100v-100zM844 500q0 -100 -72 -172t-172 -72t-172 72t-72 172t72 172t172 72t172 -72t72 -172zM706 500q0 44 -31 75t-75 31t-75 -31t-31 -75t31 -75t75 -31t75 31t31 75z" />
-<glyph unicode="&#x1f512;" d="M900 800h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
-<glyph unicode="&#x1f514;" d="M1062 400h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23t-167.5 -37t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94 q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327zM600 104q-54 0 -103 6q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6z" />
-<glyph unicode="&#x1f516;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="&#x1f525;" d="M400 755q2 -12 8 -41.5t8 -43t6 -39.5t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85t5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5 q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129 q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5z" />
-<glyph unicode="&#x1f527;" d="M948 778l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5t15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138z" />
-</font>
-</defs></svg> 
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.ttf b/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.ttf
deleted file mode 100644
index be784dc1d..000000000
Binary files a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.ttf and /dev/null differ
diff --git a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.woff b/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.woff
deleted file mode 100644
index 2cc3e4852..000000000
Binary files a/vendor/github.com/gocql/gocql/website/fonts/glyphicons-halflings-regular.woff and /dev/null differ
diff --git a/vendor/github.com/gocql/gocql/website/gocql.png b/vendor/github.com/gocql/gocql/website/gocql.png
deleted file mode 100644
index a32cccd4e..000000000
Binary files a/vendor/github.com/gocql/gocql/website/gocql.png and /dev/null differ
diff --git a/vendor/github.com/gocql/gocql/website/index.html b/vendor/github.com/gocql/gocql/website/index.html
deleted file mode 100644
index 7016b2a6d..000000000
--- a/vendor/github.com/gocql/gocql/website/index.html
+++ /dev/null
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>GoCQL</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta name="description" content="GoCQL - Modern Cassandra client for the Go">
-	<meta name="keywords" content="GoCQL, CQL, Cassandra, Go">
-	<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
-	<link rel="stylesheet" href="css/bootstrap.min.css">
-	<meta property="og:title" content="GoCQL">
-	<meta property="og:type" content="website">
-	<meta property="og:url" content="http://tux21b.org/gocql/">
-	<meta property="og:image" content="http://tux21b.org/gocql/gocql.png">
-	<meta property="og:description" content="GoCQL - Modern Cassandra client for the Go">
-	<style>
-	body { border-top: 4px solid #666; }
-	h1 { font-weight: bold; }
-	h2 { border-bottom: 1px solid #ccc; padding-bottom: .2em; }
-	div.footer { border-top: 1px solid #ccc; padding: 1em 0 .5em; margin-top: 3em; }
-	img.logo { margin-right: 1em; margin-top: 10px;}
-	</style>
-</head>
-<body>
-<div class="container">
-
-<div class="row" style="margin-top: 10px; margin-bottom: 20px;">
-<div class="col-lg-6">
-	<img src="gocql.png" alt="GoCQL logo" class="pull-left logo" />
-	<h1><a href="index.html">GoCQL</a> <small>tux21b.org/v1/gocql</small></h1>
-</div>
-<div class="col-lg-6">
-	<ul class="nav nav-pills pull-right" style="margin-top: 20px">
-		<li><a href="#">Tutorial</a></li>
-		<li><a href="http://godoc.org/tux21b.org/v1/gocql">Reference</a></li>
-		<li><a href="https://groups.google.com/forum/#!forum/gocql">Mailing List</a></li>
-		<li><a href="https://github.com/tux21b/gocql">Source</a></li>
-	</ul>
-</div>
-</div>
-
-<div class="alert alert-warning" style="margin: 1em 0 2em;">
-	<strong>Under Development:</strong> The GoCQL package is currently actively
-	developed and the API may change in the future.
-</div>
-
-
-<h2>Highlights<span class="glyphicon glyphicon-star pull-right"></span></h2>
-
-<div class="row">
-	<div class="col-lg-3">
-		<h3>Cluster Management</h3>
-		<p>GoCQL automatically discovers all data centers, racks and hosts
-		in your cluster, manages a pool of connections to them and distributes
-		queries in a reasonable and efficient way.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Type Conversation</h3>
-		<p>Automatic and safe type conversation between Cassandra and Go without
-		any loss of precision. Basic types, collections and UUIDs are supported
-		by default and custom types can implement their own marshaling logic.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Synchronous and Concurrent</h3>
-		<p>Synchronous API with an asynchronous and concurrent back-end. Each
-		connection can handle up to 128 concurrent queries and may receive
-		server side push events at any time.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Failover Management</h3>
-		<p>TODO :(</p>
-	</div>
-</div>
-
-<div class="row">
-	<div class="col-lg-3">
-		<h3>Result Paging</h3>
-		<p>Iterate over large results sets and let GoCQL fetch one page after
-		another. The next page is automatically pre-fetched in the background
-		once the iterator has passed a certain threshold.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Atomic Batches</h3>
-		<p>Execute a batch of related updates in a single query. GoCQL supports
-		logged, unlogged and counter batches.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Query Tracing</h3>
-		<p>Trace queries to obtain a detailed output of all events that
-		happened during the query execution from Cassandra. The output might
-		help to identify bugs and performance bottlenecks in your
-		application.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Frame Compression</h3>
-		<p>Speed up and reduce the network traffic by compressing the frames
-		that are sent to Cassandra.
-		<a href="https://code.google.com/p/snappy/">Snappy</a>, a
-		compression algorithm that aims for very high speeds and reasonable
-		compression, is enabled by default.</p>
-	</div>
-</div>
-
-<div class="row">
-	<div class="col-lg-3">
-		<h3>Multiple Cassandra Versions</h3>
-		<p>GoCQL supports multiple Cassandra version. Currently Cassandra 1.2
-		and Cassandra 2.0 are fully supported.</p>
-	</div>
-
-	<div class="col-lg-3">
-		<h3>Thoroughly Tested</h3>
-		<p>TODO :(</p>
-	</div>
-
-	<div class="col-lg-3">
-	<h3>BSD License</h3>
-		<p>Completely open source. Browse the source on
-		<a href="https://github.com/tux21b/gocql">GitHub</a> and start
-		contributing today.</p>
-	</div>
-</div>
-
-<div class="footer">
-	<p>@ 2013 The GoCQL Authors. All rights reserved.</p>
-</div>
-</body>
-</html>
diff --git a/vendor/github.com/gocql/gocql/website/js/bootstrap.js b/vendor/github.com/gocql/gocql/website/js/bootstrap.js
deleted file mode 100644
index 2c6425714..000000000
--- a/vendor/github.com/gocql/gocql/website/js/bootstrap.js
+++ /dev/null
@@ -1,1999 +0,0 @@
-/**
-* bootstrap.js v3.0.0 by @fat and @mdo
-* Copyright 2013 Twitter Inc.
-* http://www.apache.org/licenses/LICENSE-2.0
-*/
-if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
-
-/* ========================================================================
- * Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd'
-    , 'MozTransition'    : 'transitionend'
-    , 'OTransition'      : 'oTransitionEnd otransitionend'
-    , 'transition'       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el = this
-    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: alert.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#alerts
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // ALERT CLASS DEFINITION
-  // ======================
-
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
-
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
-
-    var $parent = $(selector)
-
-    if (e) e.preventDefault()
-
-    if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
-    }
-
-    $parent.trigger(e = $.Event('close.bs.alert'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one($.support.transition.end, removeElement)
-        .emulateTransitionEnd(150) :
-      removeElement()
-  }
-
-
-  // ALERT PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.alert
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
-
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
-  // ALERT NO CONFLICT
-  // =================
-
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
-
-
-  // ALERT DATA-API
-  // ==============
-
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: button.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#buttons
- * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
-
-  var Button = function (element, options) {
-    this.$element = $(element)
-    this.options  = $.extend({}, Button.DEFAULTS, options)
-  }
-
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
-
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
-
-    state = state + 'Text'
-
-    if (!data.resetText) $el.data('resetText', $el[val]())
-
-    $el[val](data[state] || this.options[state])
-
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d);
-    }, 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
-
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-        .prop('checked', !this.$element.hasClass('active'))
-        .trigger('change')
-      if ($input.prop('type') === 'radio') $parent.find('.active').removeClass('active')
-    }
-
-    this.$element.toggleClass('active')
-  }
-
-
-  // BUTTON PLUGIN DEFINITION
-  // ========================
-
-  var old = $.fn.button
-
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
-
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.Constructor = Button
-
-
-  // BUTTON NO CONFLICT
-  // ==================
-
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
-
-
-  // BUTTON DATA-API
-  // ===============
-
-  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-    e.preventDefault()
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: carousel.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#carousel
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // CAROUSEL CLASS DEFINITION
-  // =========================
-
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      =
-    this.sliding     =
-    this.interval    =
-    this.$active     =
-    this.$items      = null
-
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.DEFAULTS = {
-    interval: 5000
-  , pause: 'hover'
-  , wrap: true
-  }
-
-  Carousel.prototype.cycle =  function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getActiveIndex = function () {
-    this.$active = this.$element.find('.item.active')
-    this.$items  = this.$active.parent().children()
-
-    return this.$items.index(this.$active)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getActiveIndex()
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid', function () { that.to(pos) })
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || $active[type]()
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var fallback  = type == 'next' ? 'first' : 'last'
-    var that      = this
-
-    if (!$next.length) {
-      if (!this.options.wrap) return
-      $next = this.$element.find('.item')[fallback]()
-    }
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
-
-    if ($next.hasClass('active')) return
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid', function () {
-        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-        $nextIndicator && $nextIndicator.addClass('active')
-      })
-    }
-
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-        .emulateTransitionEnd(600)
-    } else {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger('slid')
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this   = $(this), href
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  })
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      $carousel.carousel($carousel.data())
-    })
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: collapse.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#collapse
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
-
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.transitioning = null
-
-    if (this.options.parent) this.$parent = $(this.options.parent)
-    if (this.options.toggle) this.toggle()
-  }
-
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
-
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
-
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var actives = this.$parent && this.$parent.find('> .panel > .in')
-
-    if (actives && actives.length) {
-      var hasData = actives.data('bs.collapse')
-      if (hasData && hasData.transitioning) return
-      actives.collapse('hide')
-      hasData || actives.data('bs.collapse', null)
-    }
-
-    var dimension = this.dimension()
-
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')
-      [dimension](0)
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('in')
-        [dimension]('auto')
-      this.transitioning = 0
-      this.$element.trigger('shown.bs.collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
-
-    this.$element
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-      [dimension](this.$element[0][scrollSize])
-  }
-
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
-
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
-
-    var dimension = this.dimension()
-
-    this.$element
-      [dimension](this.$element[dimension]())
-      [0].offsetHeight
-
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse')
-      .removeClass('in')
-
-    this.transitioning = 1
-
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .trigger('hidden.bs.collapse')
-        .removeClass('collapsing')
-        .addClass('collapse')
-    }
-
-    if (!$.support.transition) return complete.call(this)
-
-    this.$element
-      [dimension](0)
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-  }
-
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
-
-
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.collapse
-
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
-  // COLLAPSE NO CONFLICT
-  // ====================
-
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
-
-
-  // COLLAPSE DATA-API
-  // =================
-
-  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this   = $(this), href
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-    var $target = $(target)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
-
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    }
-
-    $target.collapse(option)
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#dropdowns
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // DROPDOWN CLASS DEFINITION
-  // =========================
-
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle=dropdown]'
-  var Dropdown = function (element) {
-    var $el = $(element).on('click.bs.dropdown', this.toggle)
-  }
-
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    clearMenus()
-
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we we use a backdrop because click events don't delegate
-        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
-      }
-
-      $parent.trigger(e = $.Event('show.bs.dropdown'))
-
-      if (e.isDefaultPrevented()) return
-
-      $parent
-        .toggleClass('open')
-        .trigger('shown.bs.dropdown')
-
-      $this.focus()
-    }
-
-    return false
-  }
-
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27)/.test(e.keyCode)) return
-
-    var $this = $(this)
-
-    e.preventDefault()
-    e.stopPropagation()
-
-    if ($this.is('.disabled, :disabled')) return
-
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
-
-    if (!isActive || (isActive && e.keyCode == 27)) {
-      if (e.which == 27) $parent.find(toggle).focus()
-      return $this.click()
-    }
-
-    var $items = $('[role=menu] li:not(.divider):visible a', $parent)
-
-    if (!$items.length) return
-
-    var index = $items.index($items.filter(':focus'))
-
-    if (e.keyCode == 38 && index > 0)                 index--                        // up
-    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-    if (!~index)                                      index=0
-
-    $items.eq(index).focus()
-  }
-
-  function clearMenus() {
-    $(backdrop).remove()
-    $(toggle).each(function (e) {
-      var $parent = getParent($(this))
-      if (!$parent.hasClass('open')) return
-      $parent.trigger(e = $.Event('hide.bs.dropdown'))
-      if (e.isDefaultPrevented()) return
-      $parent.removeClass('open').trigger('hidden.bs.dropdown')
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    var $parent = selector && $(selector)
-
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
-
-
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.dropdown
-
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('dropdown')
-
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  // DROPDOWN NO CONFLICT
-  // ====================
-
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
-
-
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
-
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: modal.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#modals
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options   = options
-    this.$element  = $(element)
-    this.$backdrop =
-    this.isShown   = null
-
-    if (this.options.remote) this.$element.load(this.options.remote)
-  }
-
-  Modal.DEFAULTS = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.escape()
-
-    this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(document.body) // don't move modals dom position
-      }
-
-      that.$element.show()
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element
-        .addClass('in')
-        .attr('aria-hidden', false)
-
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
-
-      transition ?
-        that.$element.find('.modal-dialog') // wait for modal to slide in
-          .one($.support.transition.end, function () {
-            that.$element.focus().trigger(e)
-          })
-          .emulateTransitionEnd(300) :
-        that.$element.focus().trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
-
-    this.$element.trigger(e)
-
-    if (!this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = false
-
-    this.escape()
-
-    $(document).off('focusin.bs.modal')
-
-    this.$element
-      .removeClass('in')
-      .attr('aria-hidden', true)
-      .off('click.dismiss.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one($.support.transition.end, $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(300) :
-      this.hideModal()
-  }
-
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.focus()
-        }
-      }, this))
-  }
-
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keyup.dismiss.bs.modal')
-    }
-  }
-
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.removeBackdrop()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
-
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
-
-  Modal.prototype.backdrop = function (callback) {
-    var that    = this
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
-
-      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-        .appendTo(document.body)
-
-      this.$element.on('click.dismiss.modal', $.proxy(function (e) {
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus.call(this.$element[0])
-          : this.hide.call(this)
-      }, this))
-
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-      this.$backdrop.addClass('in')
-
-      if (!callback) return
-
-      doAnimate ?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
-
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      $.support.transition && this.$element.hasClass('fade')?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
-
-    } else if (callback) {
-      callback()
-    }
-  }
-
-
-  // MODAL PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.modal
-
-  $.fn.modal = function (option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
-
-
-  // MODAL DATA-API
-  // ==============
-
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option, this)
-      .one('hide', function () {
-        $this.is(':visible') && $this.focus()
-      })
-  })
-
-  $(document)
-    .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
-    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       =
-    this.options    =
-    this.enabled    =
-    this.timeout    =
-    this.hoverState =
-    this.$element   = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.DEFAULTS = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled  = true
-    this.type     = type
-    this.$element = $(element)
-    this.options  = this.getOptions(options)
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focus'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay
-      , hide: options.delay
-      }
-    }
-
-    return options
-  }
-
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
-
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
-
-    return options
-  }
-
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'in'
-
-    if (!self.options.delay || !self.options.delay.show) return self.show()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
-
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
-
-    clearTimeout(self.timeout)
-
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
-
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.'+ this.type)
-
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      var $tip = this.tip()
-
-      this.setContent()
-
-      if (this.options.animation) $tip.addClass('fade')
-
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
-
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
-
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
-
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
-
-      if (autoPlace) {
-        var $parent = this.$element.parent()
-
-        var orgPlacement = placement
-        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
-        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
-        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
-        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
-
-        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
-                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
-                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
-                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
-                    placement
-
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
-
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
-
-      this.applyPlacement(calculatedOffset, placement)
-      this.$element.trigger('shown.bs.' + this.type)
-    }
-  }
-
-  Tooltip.prototype.applyPlacement = function(offset, placement) {
-    var replace
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
-
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
-
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
-
-    offset.top  = offset.top  + marginTop
-    offset.left = offset.left + marginLeft
-
-    $tip
-      .offset(offset)
-      .addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      replace = true
-      offset.top = offset.top + height - actualHeight
-    }
-
-    if (/bottom|top/.test(placement)) {
-      var delta = 0
-
-      if (offset.left < 0) {
-        delta       = offset.left * -2
-        offset.left = 0
-
-        $tip.offset(offset)
-
-        actualWidth  = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-      }
-
-      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-    } else {
-      this.replaceArrow(actualHeight - height, actualHeight, 'top')
-    }
-
-    if (replace) $tip.offset(offset)
-  }
-
-  Tooltip.prototype.replaceArrow = function(delta, dimension, position) {
-    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function () {
-    var that = this
-    var $tip = this.tip()
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && this.$tip.hasClass('fade') ?
-      $tip
-        .one($.support.transition.end, complete)
-        .emulateTransitionEnd(150) :
-      complete()
-
-    this.$element.trigger('hidden.bs.' + this.type)
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
-
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
-
-  Tooltip.prototype.getPosition = function () {
-    var el = this.$element[0]
-    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth
-    , height: el.offsetHeight
-    }, this.$element.offset())
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
-  }
-
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
-
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-    return title
-  }
-
-  Tooltip.prototype.tip = function () {
-    return this.$tip = this.$tip || $(this.options.template)
-  }
-
-  Tooltip.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
-  }
-
-  Tooltip.prototype.validate = function () {
-    if (!this.$element[0].parentNode) {
-      this.hide()
-      this.$element = null
-      this.options  = null
-    }
-  }
-
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
-
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
-
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
-
-  Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
-    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-  }
-
-  Tooltip.prototype.destroy = function () {
-    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
-  }
-
-
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.tooltip
-
-  $.fn.tooltip = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: popover.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#popovers
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
-
-  Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
-
-
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
-
-  Popover.prototype.constructor = Popover
-
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
-
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
-
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
-
-    $tip.removeClass('fade top bottom left right in')
-
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
-
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
-
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
-
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
-
-  Popover.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.arrow')
-  }
-
-  Popover.prototype.tip = function () {
-    if (!this.$tip) this.$tip = $(this.options.template)
-    return this.$tip
-  }
-
-
-  // POPOVER PLUGIN DEFINITION
-  // =========================
-
-  var old = $.fn.popover
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-
-  // POPOVER NO CONFLICT
-  // ===================
-
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#scrollspy
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    var href
-    var process  = $.proxy(this.process, this)
-
-    this.$element       = $(element).is('body') ? $(window) : $(element)
-    this.$body          = $('body')
-    this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.offsets        = $([])
-    this.targets        = $([])
-    this.activeTarget   = null
-
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
-
-    this.offsets = $([])
-    this.targets = $([])
-
-    var self     = this
-    var $targets = this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#\w/.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        self.offsets.push(this[0])
-        self.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-    var maxScroll    = scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets.last()[0]) && this.activate(i)
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-        && this.activate( targets[i] )
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    $(this.selector)
-      .parents('.active')
-      .removeClass('active')
-
-    var selector = this.selector
-      + '[data-target="' + target + '"],'
-      + this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length)  {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // TAB CLASS DEFINITION
-  // ====================
-
-  var Tab = function (element) {
-    this.element = $(element)
-  }
-
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.attr('data-target')
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    if ($this.parent('li').hasClass('active')) return
-
-    var previous = $ul.find('.active:last a')[0]
-    var e        = $.Event('show.bs.tab', {
-      relatedTarget: previous
-    })
-
-    $this.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    var $target = $(selector)
-
-    this.activate($this.parent('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $this.trigger({
-        type: 'shown.bs.tab'
-      , relatedTarget: previous
-      })
-    })
-  }
-
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && $active.hasClass('fade')
-
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-        .removeClass('active')
-
-      element.addClass('active')
-
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
-
-      if (element.parent('.dropdown-menu')) {
-        element.closest('li.dropdown').addClass('active')
-      }
-
-      callback && callback()
-    }
-
-    transition ?
-      $active
-        .one($.support.transition.end, next)
-        .emulateTransitionEnd(150) :
-      next()
-
-    $active.removeClass('in')
-  }
-
-
-  // TAB PLUGIN DEFINITION
-  // =====================
-
-  var old = $.fn.tab
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
-
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
-  // TAB NO CONFLICT
-  // ===============
-
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
-
-
-  // TAB DATA-API
-  // ============
-
-  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
-
-}(window.jQuery);
-
-/* ========================================================================
- * Bootstrap: affix.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
- * ========================================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================================== */
-
-
-+function ($) { "use strict";
-
-  // AFFIX CLASS DEFINITION
-  // ======================
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-    this.$window = $(window)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
-
-    this.$element = $(element)
-    this.affixed  =
-    this.unpin    = null
-
-    this.checkPosition()
-  }
-
-  Affix.RESET = 'affix affix-top affix-bottom'
-
-  Affix.DEFAULTS = {
-    offset: 0
-  }
-
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-    var scrollTop    = this.$window.scrollTop()
-    var position     = this.$element.offset()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
-
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
-
-    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
-
-    this.affixed = affix
-    this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
-
-    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
-
-    if (affix == 'bottom') {
-      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
-    }
-  }
-
-
-  // AFFIX PLUGIN DEFINITION
-  // =======================
-
-  var old = $.fn.affix
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-
-  // AFFIX NO CONFLICT
-  // =================
-
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
-
-
-  // AFFIX DATA-API
-  // ==============
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop)    data.offset.top    = data.offsetTop
-
-      $spy.affix(data)
-    })
-  })
-
-}(window.jQuery);
diff --git a/vendor/github.com/gocql/gocql/website/js/bootstrap.min.js b/vendor/github.com/gocql/gocql/website/js/bootstrap.min.js
deleted file mode 100644
index 1765631f4..000000000
--- a/vendor/github.com/gocql/gocql/website/js/bootstrap.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
-* bootstrap.js v3.0.0 by @fat and @mdo
-* Copyright 2013 Twitter Inc.
-* http://www.apache.org/licenses/LICENSE-2.0
-*/
-if(!jQuery)throw new Error("Bootstrap requires 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]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,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()})}(window.jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]');if(a.length){var b=this.$element.find("input").prop("checked",!this.$element.hasClass("active")).trigger("change");"radio"===b.prop("type")&&a.find(".active").removeClass("active")}this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(window.jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.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},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.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").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(window.jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i<h.length-1&&i++,~i||(i=0),h.eq(i).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("dropdown");d||c.data("dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu]",f.prototype.keydown)}(window.jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.load(this.options.remote)};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show(),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.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(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.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.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(window.jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);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":"focus",i="hover"==g?"mouseleave":"blur";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()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.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},b.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},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h<o?"right":d,c.removeClass(k).addClass(d)}var p=this.getCalculatedOffset(d,g,h,i);this.applyPlacement(p,d),this.$element.trigger("shown.bs."+this.type)}},b.prototype.applyPlacement=function(a,b){var c,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),a.top=a.top+g,a.left=a.left+h,d.offset(a).addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;if("top"==b&&j!=f&&(c=!0,a.top=a.top+f-j),/bottom|top/.test(b)){var k=0;a.left<0&&(k=-2*a.left,a.left=0,d.offset(a),i=d[0].offsetWidth,j=d[0].offsetHeight),this.replaceArrow(k-e+i,i,"left")}else this.replaceArrow(j-f,j,"top");c&&d.offset(a)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.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")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach()}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.$element.trigger("hidden.bs."+this.type),this)},b.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","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.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}},b.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)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(window.jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.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")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.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)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(window.jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");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")};var c=a.fn.scrollspy;a.fn.scrollspy=function(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]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("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")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(window.jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).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(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(window.jQuery);
\ No newline at end of file
diff --git a/vendor/github.com/gocql/gocql/wiki_test.go b/vendor/github.com/gocql/gocql/wiki_test.go
deleted file mode 100644
index bfc509094..000000000
--- a/vendor/github.com/gocql/gocql/wiki_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// +build all integration
-
-package gocql
-
-import (
-	"fmt"
-	"reflect"
-	"sort"
-	"gopkg.in/inf.v0"
-	"testing"
-	"time"
-)
-
-type WikiPage struct {
-	Title       string
-	RevId       UUID
-	Body        string
-	Views       int64
-	Protected   bool
-	Modified    time.Time
-	Rating      *inf.Dec
-	Tags        []string
-	Attachments map[string]WikiAttachment
-}
-
-type WikiAttachment []byte
-
-var wikiTestData = []*WikiPage{
-	&WikiPage{
-		Title:    "Frontpage",
-		RevId:    TimeUUID(),
-		Body:     "Welcome to this wiki page!",
-		Rating:   inf.NewDec(131, 3),
-		Modified: time.Date(2013, time.August, 13, 9, 52, 3, 0, time.UTC),
-		Tags:     []string{"start", "important", "test"},
-		Attachments: map[string]WikiAttachment{
-			"logo":    WikiAttachment("\x00company logo\x00"),
-			"favicon": WikiAttachment("favicon.ico"),
-		},
-	},
-	&WikiPage{
-		Title:    "Foobar",
-		RevId:    TimeUUID(),
-		Body:     "foo::Foo f = new foo::Foo(foo::Foo::INIT);",
-		Modified: time.Date(2013, time.August, 13, 9, 52, 3, 0, time.UTC),
-	},
-}
-
-type WikiTest struct {
-	session *Session
-	tb      testing.TB
-}
-
-func (w *WikiTest) CreateSchema() {
-
-	if err := w.session.Query(`DROP TABLE wiki_page`).Exec(); err != nil && err.Error() != "unconfigured columnfamily wiki_page" {
-		w.tb.Fatal("CreateSchema:", err)
-	}
-	err := createTable(w.session, `CREATE TABLE wiki_page (
-			title       varchar,
-			revid       timeuuid,
-			body        varchar,
-			views       bigint,
-			protected   boolean,
-			modified    timestamp,
-			rating      decimal,
-			tags        set<varchar>,
-			attachments map<varchar, blob>,
-			PRIMARY KEY (title, revid)
-		)`)
-	if *clusterSize > 1 {
-		// wait for table definition to propogate
-		time.Sleep(250 * time.Millisecond)
-	}
-	if err != nil {
-		w.tb.Fatal("CreateSchema:", err)
-	}
-}
-
-func (w *WikiTest) CreatePages(n int) {
-	var page WikiPage
-	t0 := time.Now()
-	for i := 0; i < n; i++ {
-		page.Title = fmt.Sprintf("generated_%d", (i&16)+1)
-		page.Modified = t0.Add(time.Duration(i-n) * time.Minute)
-		page.RevId = UUIDFromTime(page.Modified)
-		page.Body = fmt.Sprintf("text %d", i)
-		if err := w.InsertPage(&page); err != nil {
-			w.tb.Error("CreatePages:", err)
-		}
-	}
-}
-
-func (w *WikiTest) InsertPage(page *WikiPage) error {
-	return w.session.Query(`INSERT INTO wiki_page
-		(title, revid, body, views, protected, modified, rating, tags, attachments)
-		VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-		page.Title, page.RevId, page.Body, page.Views, page.Protected,
-		page.Modified, page.Rating, page.Tags, page.Attachments).Exec()
-}
-
-func (w *WikiTest) SelectPage(page *WikiPage, title string, revid UUID) error {
-	return w.session.Query(`SELECT title, revid, body, views, protected,
-		modified,tags, attachments, rating
-		FROM wiki_page WHERE title = ? AND revid = ? LIMIT 1`,
-		title, revid).Scan(&page.Title, &page.RevId,
-		&page.Body, &page.Views, &page.Protected, &page.Modified, &page.Tags,
-		&page.Attachments, &page.Rating)
-}
-
-func (w *WikiTest) GetPageCount() int {
-	var count int
-	if err := w.session.Query(`SELECT COUNT(*) FROM wiki_page`).Scan(&count); err != nil {
-		w.tb.Error("GetPageCount", err)
-	}
-	return count
-}
-
-func TestWikiCreateSchema(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	w := WikiTest{session, t}
-	w.CreateSchema()
-}
-
-func BenchmarkWikiCreateSchema(b *testing.B) {
-	b.StopTimer()
-	session := createSession(b)
-	defer func() {
-		b.StopTimer()
-		session.Close()
-	}()
-	w := WikiTest{session, b}
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		w.CreateSchema()
-	}
-}
-
-func TestWikiCreatePages(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	w := WikiTest{session, t}
-	w.CreateSchema()
-	numPages := 5
-	w.CreatePages(numPages)
-	if count := w.GetPageCount(); count != numPages {
-		t.Errorf("expected %d pages, got %d pages.", numPages, count)
-	}
-}
-
-func BenchmarkWikiCreatePages(b *testing.B) {
-	b.StopTimer()
-	session := createSession(b)
-	defer func() {
-		b.StopTimer()
-		session.Close()
-	}()
-	w := WikiTest{session, b}
-	w.CreateSchema()
-	b.StartTimer()
-
-	w.CreatePages(b.N)
-}
-
-func BenchmarkWikiSelectAllPages(b *testing.B) {
-	b.StopTimer()
-	session := createSession(b)
-	defer func() {
-		b.StopTimer()
-		session.Close()
-	}()
-	w := WikiTest{session, b}
-	w.CreateSchema()
-	w.CreatePages(100)
-	b.StartTimer()
-
-	var page WikiPage
-	for i := 0; i < b.N; i++ {
-		iter := session.Query(`SELECT title, revid, body, views, protected,
-			modified, tags, attachments, rating
-			FROM wiki_page`).Iter()
-		for iter.Scan(&page.Title, &page.RevId, &page.Body, &page.Views,
-			&page.Protected, &page.Modified, &page.Tags, &page.Attachments,
-			&page.Rating) {
-			// pass
-		}
-		if err := iter.Close(); err != nil {
-			b.Error(err)
-		}
-	}
-}
-
-func BenchmarkWikiSelectSinglePage(b *testing.B) {
-	b.StopTimer()
-	session := createSession(b)
-	defer func() {
-		b.StopTimer()
-		session.Close()
-	}()
-	w := WikiTest{session, b}
-	w.CreateSchema()
-	pages := make([]WikiPage, 100)
-	w.CreatePages(len(pages))
-	iter := session.Query(`SELECT title, revid FROM wiki_page`).Iter()
-	for i := 0; i < len(pages); i++ {
-		if !iter.Scan(&pages[i].Title, &pages[i].RevId) {
-			pages = pages[:i]
-			break
-		}
-	}
-	if err := iter.Close(); err != nil {
-		b.Error(err)
-	}
-	b.StartTimer()
-
-	var page WikiPage
-	for i := 0; i < b.N; i++ {
-		p := &pages[i%len(pages)]
-		if err := w.SelectPage(&page, p.Title, p.RevId); err != nil {
-			b.Error(err)
-		}
-	}
-}
-
-func BenchmarkWikiSelectPageCount(b *testing.B) {
-	b.StopTimer()
-	session := createSession(b)
-	defer func() {
-		b.StopTimer()
-		session.Close()
-	}()
-	w := WikiTest{session, b}
-	w.CreateSchema()
-	numPages := 10
-	w.CreatePages(numPages)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		if count := w.GetPageCount(); count != numPages {
-			b.Errorf("expected %d pages, got %d pages.", numPages, count)
-		}
-	}
-}
-
-func TestWikiTypicalCRUD(t *testing.T) {
-	session := createSession(t)
-	defer session.Close()
-
-	w := WikiTest{session, t}
-	w.CreateSchema()
-	for _, page := range wikiTestData {
-		if err := w.InsertPage(page); err != nil {
-			t.Error("InsertPage:", err)
-		}
-	}
-	if count := w.GetPageCount(); count != len(wikiTestData) {
-		t.Errorf("count: expected %d, got %d\n", len(wikiTestData), count)
-	}
-	for _, original := range wikiTestData {
-		page := new(WikiPage)
-		if err := w.SelectPage(page, original.Title, original.RevId); err != nil {
-			t.Error("SelectPage:", err)
-			continue
-		}
-		sort.Sort(sort.StringSlice(page.Tags))
-		sort.Sort(sort.StringSlice(original.Tags))
-		if !reflect.DeepEqual(page, original) {
-			t.Errorf("page: expected %#v, got %#v\n", original, page)
-		}
-	}
-}
diff --git a/vendor/github.com/gogo/protobuf/proto/Makefile b/vendor/github.com/gogo/protobuf/proto/Makefile
new file mode 100644
index 000000000..ba28d87a3
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/Makefile
@@ -0,0 +1,43 @@
+# 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=.:../../../../ proto3_proto/proto3.proto
+	make
diff --git a/vendor/github.com/gogo/protobuf/proto/clone.go b/vendor/github.com/gogo/protobuf/proto/clone.go
new file mode 100644
index 000000000..ba3e94bb9
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/clone.go
@@ -0,0 +1,202 @@
+// 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) {
+	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))
+	}
+
+	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...))
+	}
+}
+
+func mergeAny(out, in reflect.Value) {
+	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:
+		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))
+			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())
+	case reflect.Slice:
+		if in.IsNil() {
+			return
+		}
+		if in.Type().Elem().Kind() == reflect.Uint8 {
+			// []byte is a scalar bytes field, not a repeated field.
+			// 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))
+				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))
+			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/vendor/github.com/gogo/protobuf/proto/decode.go b/vendor/github.com/gogo/protobuf/proto/decode.go
new file mode 100644
index 000000000..8bba59414
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/decode.go
@@ -0,0 +1,826 @@
+// 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_Map(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])
+		}
+	}
+
+	v.SetMapIndex(keyptr.Elem(), valptr.Elem())
+	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/vendor/github.com/gogo/protobuf/proto/decode_gogo.go b/vendor/github.com/gogo/protobuf/proto/decode_gogo.go
new file mode 100644
index 000000000..6a77aad76
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/decode_gogo.go
@@ -0,0 +1,175 @@
+// 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/vendor/github.com/gogo/protobuf/proto/encode.go b/vendor/github.com/gogo/protobuf/proto/encode.go
new file mode 100644
index 000000000..d1abc3328
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/encode.go
@@ -0,0 +1,1288 @@
+// 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 nil
+	}
+
+	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_Map(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)
+
+		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_Map(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/vendor/github.com/gogo/protobuf/proto/encode_gogo.go b/vendor/github.com/gogo/protobuf/proto/encode_gogo.go
new file mode 100644
index 000000000..f77cfb1ee
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/encode_gogo.go
@@ -0,0 +1,354 @@
+// 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/vendor/github.com/gogo/protobuf/proto/equal.go b/vendor/github.com/gogo/protobuf/proto/equal.go
new file mode 100644
index 000000000..d8673a3e9
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/equal.go
@@ -0,0 +1,256 @@
+// 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/vendor/github.com/gogo/protobuf/proto/extensions.go b/vendor/github.com/gogo/protobuf/proto/extensions.go
new file mode 100644
index 000000000..50e04e59f
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/extensions.go
@@ -0,0 +1,481 @@
+// 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 {
+			return nil, ErrMissingExtension
+		}
+		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
+		}
+	}
+	panic("unreachable")
+}
+
+// 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/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
new file mode 100644
index 000000000..bd55fb68b
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/extensions_gogo.go
@@ -0,0 +1,221 @@
+// 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/vendor/github.com/gogo/protobuf/proto/lib.go b/vendor/github.com/gogo/protobuf/proto/lib.go
new file mode 100644
index 000000000..9e254e5ac
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/lib.go
@@ -0,0 +1,790 @@
+// 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"
+	"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 (o *Buffer) DebugPrint(s string, b []byte) {
+	var u uint64
+
+	obuf := o.buf
+	index := o.index
+	o.buf = b
+	o.index = 0
+	depth := 0
+
+	fmt.Printf("\n--- %s ---\n", s)
+
+out:
+	for {
+		for i := 0; i < depth; i++ {
+			fmt.Print("  ")
+		}
+
+		index := o.index
+		if index == len(o.buf) {
+			break
+		}
+
+		op, err := o.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 = o.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 = o.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 = o.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 = o.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", o.index, depth)
+	}
+	fmt.Printf("\n")
+
+	o.buf = obuf
+	o.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
+
+		var canHaveDefault, nestedMessage 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 {
+				dm.nested = append(dm.nested, fi)
+			}
+			continue
+		}
+
+		sf := scalarField{
+			index: fi,
+			kind:  ft.Elem().Kind(),
+		}
+
+		// scalar fields without defaults
+		if !prop.HasDefault {
+			dm.scalars = append(dm.scalars, sf)
+			continue
+		}
+
+		// a scalar field: either *T or []byte
+		switch ft.Elem().Kind() {
+		case reflect.Bool:
+			x, err := strconv.ParseBool(prop.Default)
+			if err != nil {
+				log.Printf("proto: bad default bool %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = x
+		case reflect.Float32:
+			x, err := strconv.ParseFloat(prop.Default, 32)
+			if err != nil {
+				log.Printf("proto: bad default float32 %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = float32(x)
+		case reflect.Float64:
+			x, err := strconv.ParseFloat(prop.Default, 64)
+			if err != nil {
+				log.Printf("proto: bad default float64 %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = x
+		case reflect.Int32:
+			x, err := strconv.ParseInt(prop.Default, 10, 32)
+			if err != nil {
+				log.Printf("proto: bad default int32 %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = int32(x)
+		case reflect.Int64:
+			x, err := strconv.ParseInt(prop.Default, 10, 64)
+			if err != nil {
+				log.Printf("proto: bad default int64 %q: %v", prop.Default, err)
+				continue
+			}
+			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 {
+				log.Printf("proto: bad default uint32 %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = uint32(x)
+		case reflect.Uint64:
+			x, err := strconv.ParseUint(prop.Default, 10, 64)
+			if err != nil {
+				log.Printf("proto: bad default uint64 %q: %v", prop.Default, err)
+				continue
+			}
+			sf.value = x
+		default:
+			log.Printf("proto: unhandled def kind %v", ft.Elem().Kind())
+			continue
+		}
+
+		dm.scalars = append(dm.scalars, sf)
+	}
+
+	return dm
+}
+
+// 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.
+
+type mapKeys []reflect.Value
+
+func (s mapKeys) Len() int      { return len(s) }
+func (s mapKeys) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
+func (s mapKeys) Less(i, j int) bool {
+	return fmt.Sprint(s[i].Interface()) < fmt.Sprint(s[j].Interface())
+}
diff --git a/vendor/github.com/gogo/protobuf/proto/lib_gogo.go b/vendor/github.com/gogo/protobuf/proto/lib_gogo.go
new file mode 100644
index 000000000..a6c2c06b2
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/lib_gogo.go
@@ -0,0 +1,40 @@
+// 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/vendor/github.com/gogo/protobuf/proto/message_set.go b/vendor/github.com/gogo/protobuf/proto/message_set.go
new file mode 100644
index 000000000..9d912bce1
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/message_set.go
@@ -0,0 +1,287 @@
+// 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/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go b/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
new file mode 100644
index 000000000..c68b12525
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_reflect.go
@@ -0,0 +1,479 @@
+// 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)
+}
+
+// Map returns the reflect.Value for the address of a map field in the struct.
+func structPointer_Map(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/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
new file mode 100644
index 000000000..48bc0fa48
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe.go
@@ -0,0 +1,266 @@
+// 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)))
+}
+
+// Map returns the reflect.Value for the address of a map field in the struct.
+func structPointer_Map(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/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
new file mode 100644
index 000000000..6bc85fa98
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/pointer_unsafe_gogo.go
@@ -0,0 +1,108 @@
+// 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/vendor/github.com/gogo/protobuf/proto/properties.go b/vendor/github.com/gogo/protobuf/proto/properties.go
new file mode 100644
index 000000000..13245c00d
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/properties.go
@@ -0,0 +1,815 @@
+// 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/vendor/github.com/gogo/protobuf/proto/properties_gogo.go b/vendor/github.com/gogo/protobuf/proto/properties_gogo.go
new file mode 100644
index 000000000..8daf9f776
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/properties_gogo.go
@@ -0,0 +1,64 @@
+// 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/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
new file mode 100644
index 000000000..2f2da4604
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.pb.go
@@ -0,0 +1,122 @@
+// 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/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
new file mode 100644
index 000000000..ca670015a
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/proto3_proto/proto3.proto
@@ -0,0 +1,68 @@
+// 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/vendor/github.com/gogo/protobuf/proto/skip_gogo.go b/vendor/github.com/gogo/protobuf/proto/skip_gogo.go
new file mode 100644
index 000000000..d8683c8ed
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/skip_gogo.go
@@ -0,0 +1,117 @@
+// 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 wire uint64
+				var start int = index
+				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)
+				if wireType == 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/vendor/github.com/gogo/protobuf/proto/text.go b/vendor/github.com/gogo/protobuf/proto/text.go
new file mode 100644
index 000000000..9f13e1d54
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text.go
@@ -0,0 +1,824 @@
+// 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"
+	"os"
+	"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() // TODO: should we sort these for deterministic output?
+			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
+				}
+				// 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
+			switch fv.Kind() {
+			case reflect.Bool:
+				if !fv.Bool() {
+					continue
+				}
+			case reflect.Int32, reflect.Int64:
+				if fv.Int() == 0 {
+					continue
+				}
+			case reflect.Uint32, reflect.Uint64:
+				if fv.Uint() == 0 {
+					continue
+				}
+			case reflect.Float32, reflect.Float64:
+				if fv.Float() == 0 {
+					continue
+				}
+			case reflect.String:
+				if fv.String() == "" {
+					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.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.
+	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 {
+			if _, err := fmt.Fprintln(os.Stderr, "proto: failed getting extension: ", err); err != nil {
+				return err
+			}
+			continue
+		}
+
+		// 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/vendor/github.com/gogo/protobuf/proto/text_gogo.go b/vendor/github.com/gogo/protobuf/proto/text_gogo.go
new file mode 100644
index 000000000..cdb23373c
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text_gogo.go
@@ -0,0 +1,55 @@
+// 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/vendor/github.com/gogo/protobuf/proto/text_parser.go b/vendor/github.com/gogo/protobuf/proto/text_parser.go
new file mode 100644
index 000000000..f769937bd
--- /dev/null
+++ b/vendor/github.com/gogo/protobuf/proto/text_parser.go
@@ -0,0 +1,800 @@
+// 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 %v", p.s[0:i+1])
+			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.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.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--
+			}
+		}
+
+		// For backward compatibility, permit a semicolon or comma after a field.
+		tok = p.next()
+		if tok.err != nil {
+			return tok.err
+		}
+		if tok.value != ";" && tok.value != "," {
+			p.back()
+		}
+	}
+
+	if reqCount > 0 {
+		return p.missingRequiredFieldError(sv)
+	}
+	return reqFieldErr
+}
+
+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/vendor/github.com/golang/groupcache/lru/lru_test.go b/vendor/github.com/golang/groupcache/lru/lru_test.go
deleted file mode 100644
index 98a2656e8..000000000
--- a/vendor/github.com/golang/groupcache/lru/lru_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright 2013 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package lru
-
-import (
-	"testing"
-)
-
-type simpleStruct struct {
-	int
-	string
-}
-
-type complexStruct struct {
-	int
-	simpleStruct
-}
-
-var getTests = []struct {
-	name       string
-	keyToAdd   interface{}
-	keyToGet   interface{}
-	expectedOk bool
-}{
-	{"string_hit", "myKey", "myKey", true},
-	{"string_miss", "myKey", "nonsense", false},
-	{"simple_struct_hit", simpleStruct{1, "two"}, simpleStruct{1, "two"}, true},
-	{"simeple_struct_miss", simpleStruct{1, "two"}, simpleStruct{0, "noway"}, false},
-	{"complex_struct_hit", complexStruct{1, simpleStruct{2, "three"}},
-		complexStruct{1, simpleStruct{2, "three"}}, true},
-}
-
-func TestGet(t *testing.T) {
-	for _, tt := range getTests {
-		lru := New(0)
-		lru.Add(tt.keyToAdd, 1234)
-		val, ok := lru.Get(tt.keyToGet)
-		if ok != tt.expectedOk {
-			t.Fatalf("%s: cache hit = %v; want %v", tt.name, ok, !ok)
-		} else if ok && val != 1234 {
-			t.Fatalf("%s expected get to return 1234 but got %v", tt.name, val)
-		}
-	}
-}
-
-func TestRemove(t *testing.T) {
-	lru := New(0)
-	lru.Add("myKey", 1234)
-	if val, ok := lru.Get("myKey"); !ok {
-		t.Fatal("TestRemove returned no match")
-	} else if val != 1234 {
-		t.Fatalf("TestRemove failed.  Expected %d, got %v", 1234, val)
-	}
-
-	lru.Remove("myKey")
-	if _, ok := lru.Get("myKey"); ok {
-		t.Fatal("TestRemove returned a removed entry")
-	}
-}
diff --git a/vendor/github.com/golang/snappy/AUTHORS b/vendor/github.com/golang/snappy/AUTHORS
deleted file mode 100644
index 824bf2e14..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/CONTRIBUTORS b/vendor/github.com/golang/snappy/CONTRIBUTORS
deleted file mode 100644
index 9f54f21ff..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/LICENSE b/vendor/github.com/golang/snappy/LICENSE
deleted file mode 100644
index 6050c10f4..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/README b/vendor/github.com/golang/snappy/README
deleted file mode 100644
index 5074bbab8..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/decode.go b/vendor/github.com/golang/snappy/decode.go
deleted file mode 100644
index e7f1259a3..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/encode.go b/vendor/github.com/golang/snappy/encode.go
deleted file mode 100644
index f3b5484bc..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/snappy.go b/vendor/github.com/golang/snappy/snappy.go
deleted file mode 100644
index e98653acf..000000000
--- a/vendor/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/vendor/github.com/golang/snappy/snappy_test.go b/vendor/github.com/golang/snappy/snappy_test.go
deleted file mode 100644
index f8188f11e..000000000
--- a/vendor/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/vendor/github.com/gorilla/websocket/.gitignore b/vendor/github.com/gorilla/websocket/.gitignore
deleted file mode 100644
index 00268614f..000000000
--- a/vendor/github.com/gorilla/websocket/.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/vendor/github.com/gorilla/websocket/.travis.yml b/vendor/github.com/gorilla/websocket/.travis.yml
deleted file mode 100644
index 8687342e9..000000000
--- a/vendor/github.com/gorilla/websocket/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: go
-
-go:
-  - 1.1
-  - 1.2
-  - tip
diff --git a/vendor/github.com/gorilla/websocket/LICENSE b/vendor/github.com/gorilla/websocket/LICENSE
deleted file mode 100644
index 09e5be61d..000000000
--- a/vendor/github.com/gorilla/websocket/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2013, Gorilla web toolkit
-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.
\ No newline at end of file
diff --git a/vendor/github.com/gorilla/websocket/README.md b/vendor/github.com/gorilla/websocket/README.md
deleted file mode 100644
index 627e20609..000000000
--- a/vendor/github.com/gorilla/websocket/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Gorilla WebSocket 
-
-Gorilla WebSocket is a [Go](http://golang.org/) implementation of the
-[WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol.
-
-### Documentation
-
-* [Reference](http://godoc.org/github.com/gorilla/websocket)
-* [Chat example](https://github.com/gorilla/websocket/tree/master/examples/chat)
-
-### Status
-
-The Gorilla WebSocket package provides a complete and tested implementation of
-the [WebSocket](http://www.rfc-editor.org/rfc/rfc6455.txt) protocol. The
-package API is stable. 
-
-### Installation
-
-    go get github.com/gorilla/websocket
-
-### Protocol Compliance
-
-The Gorilla WebSocket package passes the server tests in the [Autobahn WebSockets Test
-Suite](http://autobahn.ws/testsuite) using the application in the [examples/autobahn
-subdirectory](https://github.com/gorilla/websocket/tree/master/examples/autobahn).
-
-### Gorilla WebSocket compared with other packages
-
-<table>
-<tr>
-<th></th>
-<th><a href="http://godoc.org/github.com/gorilla/websocket">gorilla</a></th>
-<th><a href="http://godoc.org/code.google.com/p/go.net/websocket">go.net</a></th>
-</tr>
-<tr>
-<tr><td>Protocol support</td><td>RFC 6455</td><td>RFC 6455</td></tr>
-<tr><td>Limit size of received message</td><td>Yes</td><td>No</td></tr>
-<tr><td>Send pings and receive pongs</td><td>Yes</td><td>No</td></tr>
-<tr><td>Send close message</td><td>Yes</td><td>No</td></tr>
-<tr><td>Read message using io.Reader</td><td>Yes</td><td>No, see note</td></tr>
-<tr><td>Write message using io.WriteCloser</td><td>Yes</td><td>No, see note</td></tr>
-<tr><td>Encode, decode JSON message</td><td>Yes</td><td>Yes</td></tr>
-</table>
-
-Note: The go.net io.Reader and io.Writer operate across WebSocket message
-boundaries. Read returns when the input buffer is full or a message boundary is
-encountered, Each call to Write sends a message. The Gorilla io.Reader and
-io.WriteCloser operate on a single WebSocket message.
-
diff --git a/vendor/github.com/gorilla/websocket/client.go b/vendor/github.com/gorilla/websocket/client.go
deleted file mode 100644
index 15d57eafd..000000000
--- a/vendor/github.com/gorilla/websocket/client.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2013 Gary Burd. 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 (
-	"crypto/tls"
-	"errors"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-)
-
-// ErrBadHandshake is returned when the server response to opening handshake is
-// invalid.
-var ErrBadHandshake = errors.New("websocket: bad handshake")
-
-// NewClient creates a new client connection using the given net connection.
-// The URL u specifies the host and request URI. Use requestHeader to specify
-// the origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies
-// (Cookie). Use the response.Header to get the selected subprotocol
-// (Sec-WebSocket-Protocol) and cookies (Set-Cookie).
-//
-// If the WebSocket handshake fails, ErrBadHandshake is returned along with a
-// non-nil *http.Response so that callers can handle redirects, authentication,
-// etc.
-func NewClient(netConn net.Conn, u *url.URL, requestHeader http.Header, readBufSize, writeBufSize int) (c *Conn, response *http.Response, err error) {
-	challengeKey, err := generateChallengeKey()
-	if err != nil {
-		return nil, nil, err
-	}
-	acceptKey := computeAcceptKey(challengeKey)
-
-	c = newConn(netConn, false, readBufSize, writeBufSize)
-	p := c.writeBuf[:0]
-	p = append(p, "GET "...)
-	p = append(p, u.RequestURI()...)
-	p = append(p, " HTTP/1.1\r\nHost: "...)
-	p = append(p, u.Host...)
-	// "Upgrade" is capitalized for servers that do not use case insensitive
-	// comparisons on header tokens.
-	p = append(p, "\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: "...)
-	p = append(p, challengeKey...)
-	p = append(p, "\r\n"...)
-	for k, vs := range requestHeader {
-		for _, v := range vs {
-			p = append(p, k...)
-			p = append(p, ": "...)
-			p = append(p, v...)
-			p = append(p, "\r\n"...)
-		}
-	}
-	p = append(p, "\r\n"...)
-
-	if _, err := netConn.Write(p); err != nil {
-		return nil, nil, err
-	}
-
-	resp, err := http.ReadResponse(c.br, &http.Request{Method: "GET", URL: u})
-	if err != nil {
-		return nil, nil, err
-	}
-	if resp.StatusCode != 101 ||
-		!strings.EqualFold(resp.Header.Get("Upgrade"), "websocket") ||
-		!strings.EqualFold(resp.Header.Get("Connection"), "upgrade") ||
-		resp.Header.Get("Sec-Websocket-Accept") != acceptKey {
-		return nil, resp, ErrBadHandshake
-	}
-	c.subprotocol = resp.Header.Get("Sec-Websocket-Protocol")
-	return c, resp, nil
-}
-
-// A Dialer contains options for connecting to WebSocket server.
-type Dialer struct {
-	// NetDial specifies the dial function for creating TCP connections. If
-	// NetDial is nil, net.Dial is used.
-	NetDial func(network, addr string) (net.Conn, error)
-
-	// TLSClientConfig specifies the TLS configuration to use with tls.Client.
-	// If nil, the default configuration is used.
-	TLSClientConfig *tls.Config
-
-	// HandshakeTimeout specifies the duration for the handshake to complete.
-	HandshakeTimeout time.Duration
-
-	// Input and output buffer sizes. If the buffer size is zero, then a
-	// default value of 4096 is used.
-	ReadBufferSize, WriteBufferSize int
-
-	// Subprotocols specifies the client's requested subprotocols.
-	Subprotocols []string
-}
-
-var errMalformedURL = errors.New("malformed ws or wss URL")
-
-func parseURL(u string) (useTLS bool, host, port, opaque string, err error) {
-	// From the RFC:
-	//
-	// ws-URI = "ws:" "//" host [ ":" port ] path [ "?" query ]
-	// wss-URI = "wss:" "//" host [ ":" port ] path [ "?" query ]
-	//
-	// We don't use the net/url parser here because the dialer interface does
-	// not provide a way for applications to work around percent deocding in
-	// the net/url parser.
-
-	switch {
-	case strings.HasPrefix(u, "ws://"):
-		u = u[len("ws://"):]
-	case strings.HasPrefix(u, "wss://"):
-		u = u[len("wss://"):]
-		useTLS = true
-	default:
-		return false, "", "", "", errMalformedURL
-	}
-
-	hostPort := u
-	opaque = "/"
-	if i := strings.Index(u, "/"); i >= 0 {
-		hostPort = u[:i]
-		opaque = u[i:]
-	}
-
-	host = hostPort
-	port = ":80"
-	if i := strings.LastIndex(hostPort, ":"); i > strings.LastIndex(hostPort, "]") {
-		host = hostPort[:i]
-		port = hostPort[i:]
-	} else if useTLS {
-		port = ":443"
-	}
-
-	return useTLS, host, port, opaque, nil
-}
-
-// DefaultDialer is a dialer with all fields set to the default zero values.
-var DefaultDialer *Dialer
-
-// Dial creates a new client connection. Use requestHeader to specify the
-// origin (Origin), subprotocols (Sec-WebSocket-Protocol) and cookies (Cookie).
-// Use the response.Header to get the selected subprotocol
-// (Sec-WebSocket-Protocol) and cookies (Set-Cookie).
-//
-// If the WebSocket handshake fails, ErrBadHandshake is returned along with a
-// non-nil *http.Response so that callers can handle redirects, authentication,
-// etc.
-func (d *Dialer) Dial(urlStr string, requestHeader http.Header) (*Conn, *http.Response, error) {
-
-	useTLS, host, port, opaque, err := parseURL(urlStr)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if d == nil {
-		d = &Dialer{}
-	}
-
-	var deadline time.Time
-	if d.HandshakeTimeout != 0 {
-		deadline = time.Now().Add(d.HandshakeTimeout)
-	}
-
-	netDial := d.NetDial
-	if netDial == nil {
-		netDialer := &net.Dialer{Deadline: deadline}
-		netDial = netDialer.Dial
-	}
-
-	netConn, err := netDial("tcp", host+port)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	defer func() {
-		if netConn != nil {
-			netConn.Close()
-		}
-	}()
-
-	if err := netConn.SetDeadline(deadline); err != nil {
-		return nil, nil, err
-	}
-
-	if useTLS {
-		cfg := d.TLSClientConfig
-		if cfg == nil {
-			cfg = &tls.Config{ServerName: host}
-		} else if cfg.ServerName == "" {
-			shallowCopy := *cfg
-			cfg = &shallowCopy
-			cfg.ServerName = host
-		}
-		tlsConn := tls.Client(netConn, cfg)
-		netConn = tlsConn
-		if err := tlsConn.Handshake(); err != nil {
-			return nil, nil, err
-		}
-		if !cfg.InsecureSkipVerify {
-			if err := tlsConn.VerifyHostname(cfg.ServerName); err != nil {
-				return nil, nil, err
-			}
-		}
-	}
-
-	readBufferSize := d.ReadBufferSize
-	if readBufferSize == 0 {
-		readBufferSize = 4096
-	}
-
-	writeBufferSize := d.WriteBufferSize
-	if writeBufferSize == 0 {
-		writeBufferSize = 4096
-	}
-
-	if len(d.Subprotocols) > 0 {
-		h := http.Header{}
-		for k, v := range requestHeader {
-			h[k] = v
-		}
-		h.Set("Sec-Websocket-Protocol", strings.Join(d.Subprotocols, ", "))
-		requestHeader = h
-	}
-
-	conn, resp, err := NewClient(
-		netConn,
-		&url.URL{Host: host + port, Opaque: opaque},
-		requestHeader, readBufferSize, writeBufferSize)
-	if err != nil {
-		return nil, resp, err
-	}
-
-	netConn.SetDeadline(time.Time{})
-	netConn = nil // to avoid close in defer.
-	return conn, resp, nil
-}
diff --git a/vendor/github.com/gorilla/websocket/client_server_test.go b/vendor/github.com/gorilla/websocket/client_server_test.go
deleted file mode 100644
index 50ee84dbd..000000000
--- a/vendor/github.com/gorilla/websocket/client_server_test.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2013 Gary Burd. 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 (
-	"crypto/tls"
-	"crypto/x509"
-	"io"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"reflect"
-	"testing"
-	"time"
-)
-
-type handshakeHandler struct {
-	*testing.T
-}
-
-func (t handshakeHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Method not allowed", 405)
-		t.Logf("method = %s, want GET", r.Method)
-		return
-	}
-	if origin := r.Header.Get("Origin"); origin != "http://"+r.Host {
-		http.Error(w, "Origin not allowed", 403)
-		t.Logf("Origin = %s, want %s", origin, r.Host)
-		return
-	}
-	subprotos := Subprotocols(r)
-	if !reflect.DeepEqual(subprotos, handshakeDialer.Subprotocols) {
-		http.Error(w, "bad protocol", 400)
-		t.Logf("Subprotocols = %v, want %v", subprotos, handshakeDialer.Subprotocols)
-		return
-	}
-	ws, err := Upgrade(w, r, http.Header{
-		"Set-Cookie":             {"sessionID=1234"},
-		"Sec-Websocket-Protocol": {subprotos[0]},
-	}, 1024, 1024)
-	if _, ok := err.(HandshakeError); ok {
-		t.Logf("bad handshake: %v", err)
-		http.Error(w, "Not a websocket handshake", 400)
-		return
-	} else if err != nil {
-		t.Logf("upgrade error: %v", err)
-		return
-	}
-	defer ws.Close()
-
-	if ws.Subprotocol() != subprotos[0] {
-		t.Logf("ws.Subprotocol() = %s, want %s", ws.Subprotocol(), subprotos[0])
-		return
-	}
-
-	for {
-		op, r, err := ws.NextReader()
-		if err != nil {
-			if err != io.EOF {
-				t.Logf("NextReader: %v", err)
-			}
-			return
-		}
-		w, err := ws.NextWriter(op)
-		if err != nil {
-			t.Logf("NextWriter: %v", err)
-			return
-		}
-		if _, err = io.Copy(w, r); err != nil {
-			t.Logf("Copy: %v", err)
-			return
-		}
-		if err := w.Close(); err != nil {
-			t.Logf("Close: %v", err)
-			return
-		}
-	}
-}
-
-var handshakeDialer = &Dialer{
-	Subprotocols:    []string{"p1", "p2"},
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024,
-}
-
-func TestHandshake(t *testing.T) {
-	s := httptest.NewServer(handshakeHandler{t})
-	defer s.Close()
-	ws, resp, err := handshakeDialer.Dial(httpToWs(s.URL), http.Header{"Origin": {s.URL}})
-	if err != nil {
-		t.Fatalf("Dial: %v", err)
-	}
-	defer ws.Close()
-
-	var sessionID string
-	for _, c := range resp.Cookies() {
-		if c.Name == "sessionID" {
-			sessionID = c.Value
-		}
-	}
-	if sessionID != "1234" {
-		t.Error("Set-Cookie not received from the server.")
-	}
-
-	if ws.Subprotocol() != handshakeDialer.Subprotocols[0] {
-		t.Errorf("ws.Subprotocol() = %s, want %s", ws.Subprotocol(), handshakeDialer.Subprotocols[0])
-	}
-
-	sendRecv(t, ws)
-}
-
-type dialHandler struct {
-	*testing.T
-}
-
-func (t dialHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	ws, err := Upgrade(w, r, nil, 1024, 1024)
-	if _, ok := err.(HandshakeError); ok {
-		t.Logf("bad handshake: %v", err)
-		http.Error(w, "Not a websocket handshake", 400)
-		return
-	} else if err != nil {
-		t.Logf("upgrade error: %v", err)
-		return
-	}
-	defer ws.Close()
-	for {
-		mt, p, err := ws.ReadMessage()
-		if err != nil {
-			if err != io.EOF {
-				t.Logf("ReadMessage: %v", err)
-			}
-			return
-		}
-		if err := ws.WriteMessage(mt, p); err != nil {
-			t.Logf("WriteMessage: %v", err)
-			return
-		}
-	}
-}
-
-func sendRecv(t *testing.T, ws *Conn) {
-	const message = "Hello World!"
-	if err := ws.SetWriteDeadline(time.Now().Add(time.Second)); err != nil {
-		t.Fatalf("SetWriteDeadline: %v", err)
-	}
-	if err := ws.WriteMessage(TextMessage, []byte(message)); err != nil {
-		t.Fatalf("WriteMessage: %v", err)
-	}
-	if err := ws.SetReadDeadline(time.Now().Add(time.Second)); err != nil {
-		t.Fatalf("SetReadDeadline: %v", err)
-	}
-	_, p, err := ws.ReadMessage()
-	if err != nil {
-		t.Fatalf("ReadMessage: %v", err)
-	}
-	if string(p) != message {
-		t.Fatalf("message=%s, want %s", p, message)
-	}
-}
-
-func httpToWs(u string) string {
-	return "ws" + u[len("http"):]
-}
-
-func TestDial(t *testing.T) {
-	s := httptest.NewServer(dialHandler{t})
-	defer s.Close()
-	ws, _, err := DefaultDialer.Dial(httpToWs(s.URL), nil)
-	if err != nil {
-		t.Fatalf("Dial() returned error %v", err)
-	}
-	defer ws.Close()
-	sendRecv(t, ws)
-}
-
-func TestDialTLS(t *testing.T) {
-	s := httptest.NewTLSServer(dialHandler{t})
-	defer s.Close()
-
-	certs := x509.NewCertPool()
-	for _, c := range s.TLS.Certificates {
-		roots, err := x509.ParseCertificates(c.Certificate[len(c.Certificate)-1])
-		if err != nil {
-			t.Fatalf("error parsing server's root cert: %v", err)
-		}
-		for _, root := range roots {
-			certs.AddCert(root)
-		}
-	}
-
-	u, _ := url.Parse(s.URL)
-	d := &Dialer{
-		NetDial:         func(network, addr string) (net.Conn, error) { return net.Dial(network, u.Host) },
-		TLSClientConfig: &tls.Config{RootCAs: certs},
-	}
-	ws, _, err := d.Dial("wss://example.com/", nil)
-	if err != nil {
-		t.Fatalf("Dial() returned error %v", err)
-	}
-	defer ws.Close()
-	sendRecv(t, ws)
-}
-
-func TestDialTLSBadCert(t *testing.T) {
-	s := httptest.NewTLSServer(dialHandler{t})
-	defer s.Close()
-	_, _, err := DefaultDialer.Dial(httpToWs(s.URL), nil)
-	if err == nil {
-		t.Fatalf("Dial() did not return error")
-	}
-}
-
-func TestDialTLSNoVerify(t *testing.T) {
-	s := httptest.NewTLSServer(dialHandler{t})
-	defer s.Close()
-	d := &Dialer{TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}
-	ws, _, err := d.Dial(httpToWs(s.URL), nil)
-	if err != nil {
-		t.Fatalf("Dial() returned error %v", err)
-	}
-	defer ws.Close()
-	sendRecv(t, ws)
-}
-
-func TestDialTimeout(t *testing.T) {
-	s := httptest.NewServer(dialHandler{t})
-	defer s.Close()
-	d := &Dialer{
-		HandshakeTimeout: -1,
-	}
-	_, _, err := d.Dial(httpToWs(s.URL), nil)
-	if err == nil {
-		t.Fatalf("Dial() did not return error")
-	}
-}
-
-func TestDialBadScheme(t *testing.T) {
-	s := httptest.NewServer(dialHandler{t})
-	defer s.Close()
-	_, _, err := DefaultDialer.Dial(s.URL, nil)
-	if err == nil {
-		t.Fatalf("Dial() did not return error")
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/conn.go b/vendor/github.com/gorilla/websocket/conn.go
deleted file mode 100644
index 050d8bc98..000000000
--- a/vendor/github.com/gorilla/websocket/conn.go
+++ /dev/null
@@ -1,774 +0,0 @@
-// Copyright 2013 Gary Burd. 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"
-	"encoding/binary"
-	"errors"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"strconv"
-	"time"
-)
-
-// Close codes defined in RFC 6455, section 11.7.
-const (
-	CloseNormalClosure           = 1000
-	CloseGoingAway               = 1001
-	CloseProtocolError           = 1002
-	CloseUnsupportedData         = 1003
-	CloseNoStatusReceived        = 1005
-	CloseAbnormalClosure         = 1006
-	CloseInvalidFramePayloadData = 1007
-	ClosePolicyViolation         = 1008
-	CloseMessageTooBig           = 1009
-	CloseMandatoryExtension      = 1010
-	CloseInternalServerErr       = 1011
-	CloseTLSHandshake            = 1015
-)
-
-// The message types are defined in RFC 6455, section 11.8.
-const (
-	// TextMessage denotes a text data message. The text message payload is
-	// interpreted as UTF-8 encoded text data.
-	TextMessage = 1
-
-	// BinaryMessage denotes a binary data message.
-	BinaryMessage = 2
-
-	// CloseMessage denotes a close control message. The optional message
-	// payload contains a numeric code and text. Use the FormatCloseMessage
-	// function to format a close message payload.
-	CloseMessage = 8
-
-	// PingMessage denotes a ping control message. The optional message payload
-	// is UTF-8 encoded text.
-	PingMessage = 9
-
-	// PongMessage denotes a ping control message. The optional message payload
-	// is UTF-8 encoded text.
-	PongMessage = 10
-)
-
-var (
-	continuationFrame = 0
-	noFrame           = -1
-)
-
-var (
-	ErrCloseSent = errors.New("websocket: close sent")
-	ErrReadLimit = errors.New("websocket: read limit exceeded")
-)
-
-type websocketError struct {
-	msg       string
-	temporary bool
-	timeout   bool
-}
-
-func (e *websocketError) Error() string   { return e.msg }
-func (e *websocketError) Temporary() bool { return e.temporary }
-func (e *websocketError) Timeout() bool   { return e.timeout }
-
-var (
-	errWriteTimeout        = &websocketError{msg: "websocket: write timeout", timeout: true}
-	errBadWriteOpCode      = errors.New("websocket: bad write message type")
-	errWriteClosed         = errors.New("websocket: write closed")
-	errInvalidControlFrame = errors.New("websocket: invalid control frame")
-)
-
-const (
-	maxFrameHeaderSize         = 2 + 8 + 4 // Fixed header + length + mask
-	maxControlFramePayloadSize = 125
-	finalBit                   = 1 << 7
-	maskBit                    = 1 << 7
-	writeWait                  = time.Second
-)
-
-func isControl(frameType int) bool {
-	return frameType == CloseMessage || frameType == PingMessage || frameType == PongMessage
-}
-
-func isData(frameType int) bool {
-	return frameType == TextMessage || frameType == BinaryMessage
-}
-
-func maskBytes(key [4]byte, pos int, b []byte) int {
-	for i := range b {
-		b[i] ^= key[pos&3]
-		pos += 1
-	}
-	return pos & 3
-}
-
-func newMaskKey() [4]byte {
-	n := rand.Uint32()
-	return [4]byte{byte(n), byte(n >> 8), byte(n >> 16), byte(n >> 32)}
-}
-
-// Conn represents a WebSocket connection.
-type Conn struct {
-	conn        net.Conn
-	isServer    bool
-	subprotocol string
-
-	// Write fields
-	mu        chan bool // used as mutex to protect write to conn and closeSent
-	closeSent bool      // true if close message was sent
-
-	// Message writer fields.
-	writeErr       error
-	writeBuf       []byte // frame is constructed in this buffer.
-	writePos       int    // end of data in writeBuf.
-	writeFrameType int    // type of the current frame.
-	writeSeq       int    // incremented to invalidate message writers.
-	writeDeadline  time.Time
-
-	// Read fields
-	readErr       error
-	br            *bufio.Reader
-	readRemaining int64 // bytes remaining in current frame.
-	readFinal     bool  // true the current message has more frames.
-	readSeq       int   // incremented to invalidate message readers.
-	readLength    int64 // Message size.
-	readLimit     int64 // Maximum message size.
-	readMaskPos   int
-	readMaskKey   [4]byte
-	handlePong    func(string) error
-	handlePing    func(string) error
-}
-
-func newConn(conn net.Conn, isServer bool, readBufSize, writeBufSize int) *Conn {
-	mu := make(chan bool, 1)
-	mu <- true
-
-	c := &Conn{
-		isServer:       isServer,
-		br:             bufio.NewReaderSize(conn, readBufSize),
-		conn:           conn,
-		mu:             mu,
-		readFinal:      true,
-		writeBuf:       make([]byte, writeBufSize+maxFrameHeaderSize),
-		writeFrameType: noFrame,
-		writePos:       maxFrameHeaderSize,
-	}
-	c.SetPingHandler(nil)
-	c.SetPongHandler(nil)
-	return c
-}
-
-// Subprotocol returns the negotiated protocol for the connection.
-func (c *Conn) Subprotocol() string {
-	return c.subprotocol
-}
-
-// Close closes the underlying network connection without sending or waiting for a close frame.
-func (c *Conn) Close() error {
-	return c.conn.Close()
-}
-
-// LocalAddr returns the local network address.
-func (c *Conn) LocalAddr() net.Addr {
-	return c.conn.LocalAddr()
-}
-
-// RemoteAddr returns the remote network address.
-func (c *Conn) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-// Write methods
-
-func (c *Conn) write(frameType int, deadline time.Time, bufs ...[]byte) error {
-	<-c.mu
-	defer func() { c.mu <- true }()
-
-	if c.closeSent {
-		return ErrCloseSent
-	} else if frameType == CloseMessage {
-		c.closeSent = true
-	}
-
-	c.conn.SetWriteDeadline(deadline)
-	for _, buf := range bufs {
-		if len(buf) > 0 {
-			n, err := c.conn.Write(buf)
-			if n != len(buf) {
-				// Close on partial write.
-				c.conn.Close()
-			}
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// WriteControl writes a control message with the given deadline. The allowed
-// message types are CloseMessage, PingMessage and PongMessage.
-func (c *Conn) WriteControl(messageType int, data []byte, deadline time.Time) error {
-	if !isControl(messageType) {
-		return errBadWriteOpCode
-	}
-	if len(data) > maxControlFramePayloadSize {
-		return errInvalidControlFrame
-	}
-
-	b0 := byte(messageType) | finalBit
-	b1 := byte(len(data))
-	if !c.isServer {
-		b1 |= maskBit
-	}
-
-	buf := make([]byte, 0, maxFrameHeaderSize+maxControlFramePayloadSize)
-	buf = append(buf, b0, b1)
-
-	if c.isServer {
-		buf = append(buf, data...)
-	} else {
-		key := newMaskKey()
-		buf = append(buf, key[:]...)
-		buf = append(buf, data...)
-		maskBytes(key, 0, buf[6:])
-	}
-
-	d := time.Hour * 1000
-	if !deadline.IsZero() {
-		d = deadline.Sub(time.Now())
-		if d < 0 {
-			return errWriteTimeout
-		}
-	}
-
-	timer := time.NewTimer(d)
-	select {
-	case <-c.mu:
-		timer.Stop()
-	case <-timer.C:
-		return errWriteTimeout
-	}
-	defer func() { c.mu <- true }()
-
-	if c.closeSent {
-		return ErrCloseSent
-	} else if messageType == CloseMessage {
-		c.closeSent = true
-	}
-
-	c.conn.SetWriteDeadline(deadline)
-	n, err := c.conn.Write(buf)
-	if n != 0 && n != len(buf) {
-		c.conn.Close()
-	}
-	return err
-}
-
-// NextWriter returns a writer for the next message to send.  The writer's
-// Close method flushes the complete message to the network.
-//
-// There can be at most one open writer on a connection. NextWriter closes the
-// previous writer if the application has not already done so.
-//
-// The NextWriter method and the writers returned from the method cannot be
-// accessed by more than one goroutine at a time.
-func (c *Conn) NextWriter(messageType int) (io.WriteCloser, error) {
-	if c.writeErr != nil {
-		return nil, c.writeErr
-	}
-
-	if c.writeFrameType != noFrame {
-		if err := c.flushFrame(true, nil); err != nil {
-			return nil, err
-		}
-	}
-
-	if !isControl(messageType) && !isData(messageType) {
-		return nil, errBadWriteOpCode
-	}
-
-	c.writeFrameType = messageType
-	return messageWriter{c, c.writeSeq}, nil
-}
-
-func (c *Conn) flushFrame(final bool, extra []byte) error {
-	length := c.writePos - maxFrameHeaderSize + len(extra)
-
-	// Check for invalid control frames.
-	if isControl(c.writeFrameType) &&
-		(!final || length > maxControlFramePayloadSize) {
-		c.writeSeq += 1
-		c.writeFrameType = noFrame
-		c.writePos = maxFrameHeaderSize
-		return errInvalidControlFrame
-	}
-
-	b0 := byte(c.writeFrameType)
-	if final {
-		b0 |= finalBit
-	}
-	b1 := byte(0)
-	if !c.isServer {
-		b1 |= maskBit
-	}
-
-	// Assume that the frame starts at beginning of c.writeBuf.
-	framePos := 0
-	if c.isServer {
-		// Adjust up if mask not included in the header.
-		framePos = 4
-	}
-
-	switch {
-	case length >= 65536:
-		c.writeBuf[framePos] = b0
-		c.writeBuf[framePos+1] = b1 | 127
-		binary.BigEndian.PutUint64(c.writeBuf[framePos+2:], uint64(length))
-	case length > 125:
-		framePos += 6
-		c.writeBuf[framePos] = b0
-		c.writeBuf[framePos+1] = b1 | 126
-		binary.BigEndian.PutUint16(c.writeBuf[framePos+2:], uint16(length))
-	default:
-		framePos += 8
-		c.writeBuf[framePos] = b0
-		c.writeBuf[framePos+1] = b1 | byte(length)
-	}
-
-	if !c.isServer {
-		key := newMaskKey()
-		copy(c.writeBuf[maxFrameHeaderSize-4:], key[:])
-		maskBytes(key, 0, c.writeBuf[maxFrameHeaderSize:c.writePos])
-		if len(extra) > 0 {
-			c.writeErr = errors.New("websocket: internal error, extra used in client mode")
-			return c.writeErr
-		}
-	}
-
-	// Write the buffers to the connection.
-	c.writeErr = c.write(c.writeFrameType, c.writeDeadline, c.writeBuf[framePos:c.writePos], extra)
-
-	// Setup for next frame.
-	c.writePos = maxFrameHeaderSize
-	c.writeFrameType = continuationFrame
-	if final {
-		c.writeSeq += 1
-		c.writeFrameType = noFrame
-	}
-	return c.writeErr
-}
-
-type messageWriter struct {
-	c   *Conn
-	seq int
-}
-
-func (w messageWriter) err() error {
-	c := w.c
-	if c.writeSeq != w.seq {
-		return errWriteClosed
-	}
-	if c.writeErr != nil {
-		return c.writeErr
-	}
-	return nil
-}
-
-func (w messageWriter) ncopy(max int) (int, error) {
-	n := len(w.c.writeBuf) - w.c.writePos
-	if n <= 0 {
-		if err := w.c.flushFrame(false, nil); err != nil {
-			return 0, err
-		}
-		n = len(w.c.writeBuf) - w.c.writePos
-	}
-	if n > max {
-		n = max
-	}
-	return n, nil
-}
-
-func (w messageWriter) write(final bool, p []byte) (int, error) {
-	if err := w.err(); err != nil {
-		return 0, err
-	}
-
-	if len(p) > 2*len(w.c.writeBuf) && w.c.isServer {
-		// Don't buffer large messages.
-		err := w.c.flushFrame(final, p)
-		if err != nil {
-			return 0, err
-		}
-		return len(p), nil
-	}
-
-	nn := len(p)
-	for len(p) > 0 {
-		n, err := w.ncopy(len(p))
-		if err != nil {
-			return 0, err
-		}
-		copy(w.c.writeBuf[w.c.writePos:], p[:n])
-		w.c.writePos += n
-		p = p[n:]
-	}
-	return nn, nil
-}
-
-func (w messageWriter) Write(p []byte) (int, error) {
-	return w.write(false, p)
-}
-
-func (w messageWriter) WriteString(p string) (int, error) {
-	if err := w.err(); err != nil {
-		return 0, err
-	}
-
-	nn := len(p)
-	for len(p) > 0 {
-		n, err := w.ncopy(len(p))
-		if err != nil {
-			return 0, err
-		}
-		copy(w.c.writeBuf[w.c.writePos:], p[:n])
-		w.c.writePos += n
-		p = p[n:]
-	}
-	return nn, nil
-}
-
-func (w messageWriter) ReadFrom(r io.Reader) (nn int64, err error) {
-	if err := w.err(); err != nil {
-		return 0, err
-	}
-	for {
-		if w.c.writePos == len(w.c.writeBuf) {
-			err = w.c.flushFrame(false, nil)
-			if err != nil {
-				break
-			}
-		}
-		var n int
-		n, err = r.Read(w.c.writeBuf[w.c.writePos:])
-		w.c.writePos += n
-		nn += int64(n)
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			break
-		}
-	}
-	return nn, err
-}
-
-func (w messageWriter) Close() error {
-	if err := w.err(); err != nil {
-		return err
-	}
-	return w.c.flushFrame(true, nil)
-}
-
-// WriteMessage is a helper method for getting a writer using NextWriter,
-// writing the message and closing the writer.
-func (c *Conn) WriteMessage(messageType int, data []byte) error {
-	wr, err := c.NextWriter(messageType)
-	if err != nil {
-		return err
-	}
-	w := wr.(messageWriter)
-	if _, err := w.write(true, data); err != nil {
-		return err
-	}
-	if c.writeSeq == w.seq {
-		if err := c.flushFrame(true, nil); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// SetWriteDeadline sets the deadline for future calls to NextWriter and the
-// io.WriteCloser returned from NextWriter. If the deadline is reached, the
-// call will fail with a timeout instead of blocking. A zero value for t means
-// Write will not time out. Even if Write times out, it may return n > 0,
-// indicating that some of the data was successfully written.
-func (c *Conn) SetWriteDeadline(t time.Time) error {
-	c.writeDeadline = t
-	return nil
-}
-
-// Read methods
-
-func (c *Conn) advanceFrame() (int, error) {
-
-	// 1. Skip remainder of previous frame.
-
-	if c.readRemaining > 0 {
-		if _, err := io.CopyN(ioutil.Discard, c.br, c.readRemaining); err != nil {
-			return noFrame, err
-		}
-	}
-
-	// 2. Read and parse first two bytes of frame header.
-
-	var b [8]byte
-	if err := c.read(b[:2]); err != nil {
-		return noFrame, err
-	}
-
-	final := b[0]&finalBit != 0
-	frameType := int(b[0] & 0xf)
-	reserved := int((b[0] >> 4) & 0x7)
-	mask := b[1]&maskBit != 0
-	c.readRemaining = int64(b[1] & 0x7f)
-
-	if reserved != 0 {
-		return noFrame, c.handleProtocolError("unexpected reserved bits " + strconv.Itoa(reserved))
-	}
-
-	switch frameType {
-	case CloseMessage, PingMessage, PongMessage:
-		if c.readRemaining > maxControlFramePayloadSize {
-			return noFrame, c.handleProtocolError("control frame length > 125")
-		}
-		if !final {
-			return noFrame, c.handleProtocolError("control frame not final")
-		}
-	case TextMessage, BinaryMessage:
-		if !c.readFinal {
-			return noFrame, c.handleProtocolError("message start before final message frame")
-		}
-		c.readFinal = final
-	case continuationFrame:
-		if c.readFinal {
-			return noFrame, c.handleProtocolError("continuation after final message frame")
-		}
-		c.readFinal = final
-	default:
-		return noFrame, c.handleProtocolError("unknown opcode " + strconv.Itoa(frameType))
-	}
-
-	// 3. Read and parse frame length.
-
-	switch c.readRemaining {
-	case 126:
-		if err := c.read(b[:2]); err != nil {
-			return noFrame, err
-		}
-		c.readRemaining = int64(binary.BigEndian.Uint16(b[:2]))
-	case 127:
-		if err := c.read(b[:8]); err != nil {
-			return noFrame, err
-		}
-		c.readRemaining = int64(binary.BigEndian.Uint64(b[:8]))
-	}
-
-	// 4. Handle frame masking.
-
-	if mask != c.isServer {
-		return noFrame, c.handleProtocolError("incorrect mask flag")
-	}
-
-	if mask {
-		c.readMaskPos = 0
-		if err := c.read(c.readMaskKey[:]); err != nil {
-			return noFrame, err
-		}
-	}
-
-	// 5. For text and binary messages, enforce read limit and return.
-
-	if frameType == continuationFrame || frameType == TextMessage || frameType == BinaryMessage {
-
-		c.readLength += c.readRemaining
-		if c.readLimit > 0 && c.readLength > c.readLimit {
-			c.WriteControl(CloseMessage, FormatCloseMessage(CloseMessageTooBig, ""), time.Now().Add(writeWait))
-			return noFrame, ErrReadLimit
-		}
-
-		return frameType, nil
-	}
-
-	// 6. Read control frame payload.
-
-	payload := make([]byte, c.readRemaining)
-	c.readRemaining = 0
-	if err := c.read(payload); err != nil {
-		return noFrame, err
-	}
-	maskBytes(c.readMaskKey, 0, payload)
-
-	// 7. Process control frame payload.
-
-	switch frameType {
-	case PongMessage:
-		if err := c.handlePong(string(payload)); err != nil {
-			return noFrame, err
-		}
-	case PingMessage:
-		if err := c.handlePing(string(payload)); err != nil {
-			return noFrame, err
-		}
-	case CloseMessage:
-		c.WriteControl(CloseMessage, []byte{}, time.Now().Add(writeWait))
-		if len(payload) < 2 {
-			return noFrame, io.EOF
-		}
-		closeCode := binary.BigEndian.Uint16(payload)
-		switch closeCode {
-		case CloseNormalClosure, CloseGoingAway:
-			return noFrame, io.EOF
-		default:
-			return noFrame, errors.New("websocket: close " +
-				strconv.Itoa(int(closeCode)) + " " +
-				string(payload[2:]))
-		}
-	}
-
-	return frameType, nil
-}
-
-func (c *Conn) handleProtocolError(message string) error {
-	c.WriteControl(CloseMessage, FormatCloseMessage(CloseProtocolError, message), time.Now().Add(writeWait))
-	return errors.New("websocket: " + message)
-}
-
-func (c *Conn) read(buf []byte) error {
-	var err error
-	for len(buf) > 0 && err == nil {
-		var nn int
-		nn, err = c.br.Read(buf)
-		buf = buf[nn:]
-	}
-	if err == io.EOF {
-		if len(buf) == 0 {
-			err = nil
-		} else {
-			err = io.ErrUnexpectedEOF
-		}
-	}
-	return err
-}
-
-// NextReader returns the next data message received from the peer. The
-// returned messageType is either TextMessage or BinaryMessage.
-//
-// There can be at most one open reader on a connection. NextReader discards
-// the previous message if the application has not already consumed it.
-//
-// The NextReader method and the readers returned from the method cannot be
-// accessed by more than one goroutine at a time.
-func (c *Conn) NextReader() (messageType int, r io.Reader, err error) {
-
-	c.readSeq += 1
-	c.readLength = 0
-
-	for c.readErr == nil {
-		var frameType int
-		frameType, c.readErr = c.advanceFrame()
-		if frameType == TextMessage || frameType == BinaryMessage {
-			return frameType, messageReader{c, c.readSeq}, nil
-		}
-	}
-	return noFrame, nil, c.readErr
-}
-
-type messageReader struct {
-	c   *Conn
-	seq int
-}
-
-func (r messageReader) Read(b []byte) (n int, err error) {
-
-	if r.seq != r.c.readSeq {
-		return 0, io.EOF
-	}
-
-	for r.c.readErr == nil {
-
-		if r.c.readRemaining > 0 {
-			if int64(len(b)) > r.c.readRemaining {
-				b = b[:r.c.readRemaining]
-			}
-			r.c.readErr = r.c.read(b)
-			r.c.readMaskPos = maskBytes(r.c.readMaskKey, r.c.readMaskPos, b)
-			r.c.readRemaining -= int64(len(b))
-			return len(b), r.c.readErr
-		}
-
-		if r.c.readFinal {
-			r.c.readSeq += 1
-			return 0, io.EOF
-		}
-
-		var frameType int
-		frameType, r.c.readErr = r.c.advanceFrame()
-
-		if frameType == TextMessage || frameType == BinaryMessage {
-			r.c.readErr = errors.New("websocket: internal error, unexpected text or binary in Reader")
-		}
-	}
-	return 0, r.c.readErr
-}
-
-// ReadMessage is a helper method for getting a reader using NextReader and
-// reading from that reader to a buffer.
-func (c *Conn) ReadMessage() (messageType int, p []byte, err error) {
-	var r io.Reader
-	messageType, r, err = c.NextReader()
-	if err != nil {
-		return messageType, nil, err
-	}
-	p, err = ioutil.ReadAll(r)
-	return messageType, p, err
-}
-
-// SetReadDeadline sets the deadline for future calls to NextReader and the
-// io.Reader returned from NextReader. If the deadline is reached, the call
-// will fail with a timeout instead of blocking. A zero value for t means that
-// the methods will not time out.
-func (c *Conn) SetReadDeadline(t time.Time) error {
-	return c.conn.SetReadDeadline(t)
-}
-
-// SetReadLimit sets the maximum size for a message read from the peer. If a
-// message exceeds the limit, the connection sends a close frame to the peer
-// and returns ErrReadLimit to the application.
-func (c *Conn) SetReadLimit(limit int64) {
-	c.readLimit = limit
-}
-
-// SetPingHandler sets the handler for ping messages received from the peer.
-// The default ping handler sends a pong to the peer.
-func (c *Conn) SetPingHandler(h func(string) error) {
-	if h == nil {
-		h = func(message string) error {
-			c.WriteControl(PongMessage, []byte(message), time.Now().Add(writeWait))
-			return nil
-		}
-	}
-	c.handlePing = h
-}
-
-// SetPongHandler sets then handler for pong messages received from the peer.
-// The default pong handler does nothing.
-func (c *Conn) SetPongHandler(h func(string) error) {
-	if h == nil {
-		h = func(string) error { return nil }
-	}
-	c.handlePong = h
-}
-
-// FormatCloseMessage formats closeCode and text as a WebSocket close message.
-func FormatCloseMessage(closeCode int, text string) []byte {
-	buf := make([]byte, 2+len(text))
-	binary.BigEndian.PutUint16(buf, uint16(closeCode))
-	copy(buf[2:], text)
-	return buf
-}
diff --git a/vendor/github.com/gorilla/websocket/conn_test.go b/vendor/github.com/gorilla/websocket/conn_test.go
deleted file mode 100644
index bd588e357..000000000
--- a/vendor/github.com/gorilla/websocket/conn_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2013 Gary Burd. 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"
-	"io/ioutil"
-	"net"
-	"testing"
-	"testing/iotest"
-	"time"
-)
-
-var timeoutErrImplementsNetError net.Error = errWriteTimeout
-
-type fakeNetConn struct {
-	io.Reader
-	io.Writer
-}
-
-func (c fakeNetConn) Close() error                       { return nil }
-func (c fakeNetConn) LocalAddr() net.Addr                { return nil }
-func (c fakeNetConn) RemoteAddr() net.Addr               { return nil }
-func (c fakeNetConn) SetDeadline(t time.Time) error      { return nil }
-func (c fakeNetConn) SetReadDeadline(t time.Time) error  { return nil }
-func (c fakeNetConn) SetWriteDeadline(t time.Time) error { return nil }
-
-func TestFraming(t *testing.T) {
-	frameSizes := []int{0, 1, 2, 124, 125, 126, 127, 128, 129, 65534, 65535, 65536, 65537}
-	var readChunkers = []struct {
-		name string
-		f    func(io.Reader) io.Reader
-	}{
-		{"half", iotest.HalfReader},
-		{"one", iotest.OneByteReader},
-		{"asis", func(r io.Reader) io.Reader { return r }},
-	}
-
-	writeBuf := make([]byte, 65537)
-	for i := range writeBuf {
-		writeBuf[i] = byte(i)
-	}
-
-	for _, isServer := range []bool{true, false} {
-		for _, chunker := range readChunkers {
-
-			var connBuf bytes.Buffer
-			wc := newConn(fakeNetConn{Reader: nil, Writer: &connBuf}, isServer, 1024, 1024)
-			rc := newConn(fakeNetConn{Reader: chunker.f(&connBuf), Writer: nil}, !isServer, 1024, 1024)
-
-			for _, n := range frameSizes {
-				for _, iocopy := range []bool{true, false} {
-					name := fmt.Sprintf("s:%v, r:%s, n:%d c:%v", isServer, chunker.name, n, iocopy)
-
-					w, err := wc.NextWriter(TextMessage)
-					if err != nil {
-						t.Errorf("%s: wc.NextWriter() returned %v", name, err)
-						continue
-					}
-					var nn int
-					if iocopy {
-						var n64 int64
-						n64, err = io.Copy(w, bytes.NewReader(writeBuf[:n]))
-						nn = int(n64)
-					} else {
-						nn, err = w.Write(writeBuf[:n])
-					}
-					if err != nil || nn != n {
-						t.Errorf("%s: w.Write(writeBuf[:n]) returned %d, %v", name, nn, err)
-						continue
-					}
-					err = w.Close()
-					if err != nil {
-						t.Errorf("%s: w.Close() returned %v", name, err)
-						continue
-					}
-
-					opCode, r, err := rc.NextReader()
-					if err != nil || opCode != TextMessage {
-						t.Errorf("%s: NextReader() returned %d, r, %v", name, opCode, err)
-						continue
-					}
-					rbuf, err := ioutil.ReadAll(r)
-					if err != nil {
-						t.Errorf("%s: ReadFull() returned rbuf, %v", name, err)
-						continue
-					}
-
-					if len(rbuf) != n {
-						t.Errorf("%s: len(rbuf) is %d, want %d", name, len(rbuf), n)
-						continue
-					}
-
-					for i, b := range rbuf {
-						if byte(i) != b {
-							t.Errorf("%s: bad byte at offset %d", name, i)
-							break
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-func TestReadLimit(t *testing.T) {
-
-	const readLimit = 512
-	message := make([]byte, readLimit+1)
-
-	var b1, b2 bytes.Buffer
-	wc := newConn(fakeNetConn{Reader: nil, Writer: &b1}, false, 1024, readLimit-2)
-	rc := newConn(fakeNetConn{Reader: &b1, Writer: &b2}, true, 1024, 1024)
-	rc.SetReadLimit(readLimit)
-
-	// Send message at the limit with interleaved pong.
-	w, _ := wc.NextWriter(BinaryMessage)
-	w.Write(message[:readLimit-1])
-	wc.WriteControl(PongMessage, []byte("this is a pong"), time.Now().Add(10*time.Second))
-	w.Write(message[:1])
-	w.Close()
-
-	// Send message larger than the limit.
-	wc.WriteMessage(BinaryMessage, message[:readLimit+1])
-
-	op, _, err := rc.NextReader()
-	if op != BinaryMessage || err != nil {
-		t.Fatalf("1: NextReader() returned %d, %v", op, err)
-	}
-	op, r, err := rc.NextReader()
-	if op != BinaryMessage || err != nil {
-		t.Fatalf("2: NextReader() returned %d, %v", op, err)
-	}
-	_, err = io.Copy(ioutil.Discard, r)
-	if err != ErrReadLimit {
-		t.Fatalf("io.Copy() returned %v", err)
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/doc.go b/vendor/github.com/gorilla/websocket/doc.go
deleted file mode 100644
index 3851cb795..000000000
--- a/vendor/github.com/gorilla/websocket/doc.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2013 Gary Burd. 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 the WebSocket protocol defined in RFC 6455.
-//
-// Overview
-//
-// The Conn type represents a WebSocket connection. A server application calls
-// the Upgrade function from an HTTP request handler to get a pointer to a
-// Conn:
-//
-//  func handler(w http.ResponseWriter, r *http.Request) {
-//      ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
-//      if _, ok := err.(websocket.HandshakeError); ok {
-//          http.Error(w, "Not a websocket handshake", 400)
-//          return
-//      } else if err != nil {
-//          log.Println(err)
-//          return
-//      }
-//      ... Use conn to send and receive messages.
-//  }
-//
-// Call the connection WriteMessage and ReadMessages methods to send and
-// receive messages as a slice of bytes. This snippet of code shows how to echo
-// messages using these methods:
-//
-//  for {
-//      messageType, p, err := conn.ReadMessage()
-//      if err != nil {
-//          return
-//      }
-//      if err = conn.WriteMessage(messageType, p); err != nil {
-//          return err
-//      }
-//  }
-//
-// In above snippet of code, p is a []byte and messageType is an int with value
-// websocket.BinaryMessage or websocket.TextMessage.
-//
-// An application can also send and receive messages using the io.WriteCloser
-// and io.Reader interfaces. To send a message, call the connection NextWriter
-// method to get an io.WriteCloser, write the message to the writer and close
-// the writer when done. To receive a message, call the connection NextReader
-// method to get an io.Reader and read until io.EOF is returned. This snippet
-// snippet shows how to echo messages using the NextWriter and NextReader
-// methods:
-//
-//  for {
-//      messageType, r, err := conn.NextReader()
-//      if err != nil {
-//          return
-//      }
-//      w, err := conn.NextWriter(messageType)
-//      if err != nil {
-//          return err
-//      }
-//      if _, err := io.Copy(w, r); err != nil {
-//          return err
-//      }
-//      if err := w.Close(); err != nil {
-//          return err
-//      }
-//  }
-//
-// Data Messages
-//
-// The WebSocket protocol distinguishes between text and binary data messages.
-// Text messages are interpreted as UTF-8 encoded text. The interpretation of
-// binary messages is left to the application.
-//
-// This package uses the TextMessage and BinaryMessage integer constants to
-// identify the two data message types. The ReadMessage and NextReader methods
-// return the type of the received message. The messageType argument to the
-// WriteMessage and NextWriter methods specifies the type of a sent message.
-//
-// It is the application's responsibility to ensure that text messages are
-// valid UTF-8 encoded text.
-//
-// Control Messages
-//
-// The WebSocket protocol defines three types of control messages: close, ping
-// and pong. Call the connection WriteControl, WriteMessage or NextWriter
-// methods to send a control message to the peer.
-//
-// Connections handle received ping and pong messages by invoking a callback
-// function set with SetPingHandler and SetPongHandler methods. These callback
-// functions can be invoked from the ReadMessage method, the NextReader method
-// or from a call to the data message reader returned from NextReader.
-//
-// Connections handle received close messages by returning an error from the
-// ReadMessage method, the NextReader method or from a call to the data message
-// reader returned from NextReader.
-//
-// Concurrency
-//
-// A Conn supports a single concurrent caller to the write methods (NextWriter,
-// SetWriteDeadline, WriteMessage) and a single concurrent caller to the read
-// methods (NextReader, SetReadDeadline, ReadMessage). The Close and
-// WriteControl methods can be called concurrently with all other methods.
-//
-package websocket
diff --git a/vendor/github.com/gorilla/websocket/examples/autobahn/README.md b/vendor/github.com/gorilla/websocket/examples/autobahn/README.md
deleted file mode 100644
index 68a7ea3b5..000000000
--- a/vendor/github.com/gorilla/websocket/examples/autobahn/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Test
-
-Clients and servers for the [Autobahn WebSockets Test Suite](http://autobahn.ws/testsuite).
-
-To test different code paths in the package, the test server echoes messages two ways:
-
-- Read the entire message using io.ReadAll and write the message in one chunk.
-- Copy the message in parts using io.Copy
-
-To test the server, run it
-
-    go run server.go
-
-and start the client test driver
-
-    wstest -m fuzzingclient -s fuzzingclient.json
-
-When the client completes, it writes a report to reports/servers/index.html.
diff --git a/vendor/github.com/gorilla/websocket/examples/autobahn/fuzzingclient.json b/vendor/github.com/gorilla/websocket/examples/autobahn/fuzzingclient.json
deleted file mode 100644
index 27d5a5b14..000000000
--- a/vendor/github.com/gorilla/websocket/examples/autobahn/fuzzingclient.json
+++ /dev/null
@@ -1,14 +0,0 @@
-
-{
-   "options": {"failByDrop": false},
-   "outdir": "./reports/clients",
-   "servers": [
-        {"agent": "ReadAllWriteMessage", "url": "ws://localhost:9000/m", "options": {"version": 18}},
-        {"agent": "ReadAllWrite", "url": "ws://localhost:9000/r", "options": {"version": 18}},
-        {"agent": "CopyFull", "url": "ws://localhost:9000/f", "options": {"version": 18}},
-        {"agent": "CopyWriterOnly", "url": "ws://localhost:9000/c", "options": {"version": 18}}
-    ],
-   "cases": ["*"],
-   "exclude-cases": [],
-   "exclude-agent-cases": {}
-}
diff --git a/vendor/github.com/gorilla/websocket/examples/autobahn/server.go b/vendor/github.com/gorilla/websocket/examples/autobahn/server.go
deleted file mode 100644
index bca8e8377..000000000
--- a/vendor/github.com/gorilla/websocket/examples/autobahn/server.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2012 Gary Burd
-//
-// 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.
-
-// Command server is a test server for the Autobahn WebSockets Test Suite.
-package main
-
-import (
-	"errors"
-	"flag"
-	"github.com/gorilla/websocket"
-	"io"
-	"log"
-	"net/http"
-	"time"
-	"unicode/utf8"
-)
-
-// echoCopy echoes messages from the client using io.Copy.
-func echoCopy(w http.ResponseWriter, r *http.Request, writerOnly bool) {
-	conn, err := websocket.Upgrade(w, r, nil, 4096, 4096)
-	if err != nil {
-		log.Println("Upgrade:", err)
-		http.Error(w, "Bad request", 400)
-		return
-	}
-	defer conn.Close()
-	for {
-		mt, r, err := conn.NextReader()
-		if err != nil {
-			if err != io.EOF {
-				log.Println("NextReader:", err)
-			}
-			return
-		}
-		if mt == websocket.TextMessage {
-			r = &validator{r: r}
-		}
-		w, err := conn.NextWriter(mt)
-		if err != nil {
-			log.Println("NextWriter:", err)
-			return
-		}
-		if mt == websocket.TextMessage {
-			r = &validator{r: r}
-		}
-		if writerOnly {
-			_, err = io.Copy(struct{ io.Writer }{w}, r)
-		} else {
-			_, err = io.Copy(w, r)
-		}
-		if err != nil {
-			if err == errInvalidUTF8 {
-				conn.WriteControl(websocket.CloseMessage,
-					websocket.FormatCloseMessage(websocket.CloseInvalidFramePayloadData, ""),
-					time.Time{})
-			}
-			log.Println("Copy:", err)
-			return
-		}
-		err = w.Close()
-		if err != nil {
-			log.Println("Close:", err)
-			return
-		}
-	}
-}
-
-func echoCopyWriterOnly(w http.ResponseWriter, r *http.Request) {
-	echoCopy(w, r, true)
-}
-
-func echoCopyFull(w http.ResponseWriter, r *http.Request) {
-	echoCopy(w, r, false)
-}
-
-// echoReadAll echoes messages from the client by reading the entire message
-// with ioutil.ReadAll.
-func echoReadAll(w http.ResponseWriter, r *http.Request, writeMessage bool) {
-	conn, err := websocket.Upgrade(w, r, nil, 4096, 4096)
-	if err != nil {
-		log.Println("Upgrade:", err)
-		http.Error(w, "Bad request", 400)
-		return
-	}
-	defer conn.Close()
-	for {
-		mt, b, err := conn.ReadMessage()
-		if err != nil {
-			if err != io.EOF {
-				log.Println("NextReader:", err)
-			}
-			return
-		}
-		if mt == websocket.TextMessage {
-			if !utf8.Valid(b) {
-				conn.WriteControl(websocket.CloseMessage,
-					websocket.FormatCloseMessage(websocket.CloseInvalidFramePayloadData, ""),
-					time.Time{})
-				log.Println("ReadAll: invalid utf8")
-			}
-		}
-		if writeMessage {
-			err = conn.WriteMessage(mt, b)
-			if err != nil {
-				log.Println("WriteMessage:", err)
-			}
-		} else {
-			w, err := conn.NextWriter(mt)
-			if err != nil {
-				log.Println("NextWriter:", err)
-				return
-			}
-			if _, err := w.Write(b); err != nil {
-				log.Println("Writer:", err)
-				return
-			}
-			if err := w.Close(); err != nil {
-				log.Println("Close:", err)
-				return
-			}
-		}
-	}
-}
-
-func echoReadAllWriter(w http.ResponseWriter, r *http.Request) {
-	echoReadAll(w, r, false)
-}
-
-func echoReadAllWriteMessage(w http.ResponseWriter, r *http.Request) {
-	echoReadAll(w, r, true)
-}
-
-func serveHome(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/" {
-		http.Error(w, "Not found.", 404)
-		return
-	}
-	if r.Method != "GET" {
-		http.Error(w, "Method not allowed", 405)
-		return
-	}
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	io.WriteString(w, "<html><body>Echo Server</body></html")
-}
-
-var addr = flag.String("addr", ":9000", "http service address")
-
-func main() {
-	flag.Parse()
-	http.HandleFunc("/", serveHome)
-	http.HandleFunc("/c", echoCopyWriterOnly)
-	http.HandleFunc("/f", echoCopyFull)
-	http.HandleFunc("/r", echoReadAllWriter)
-	http.HandleFunc("/m", echoReadAllWriteMessage)
-	err := http.ListenAndServe(*addr, nil)
-	if err != nil {
-		log.Fatal("ListenAndServe: ", err)
-	}
-}
-
-type validator struct {
-	state int
-	x     rune
-	r     io.Reader
-}
-
-var errInvalidUTF8 = errors.New("invalid utf8")
-
-func (r *validator) Read(p []byte) (int, error) {
-	n, err := r.r.Read(p)
-	state := r.state
-	x := r.x
-	for _, b := range p[:n] {
-		state, x = decode(state, x, b)
-		if state == utf8Reject {
-			break
-		}
-	}
-	r.state = state
-	r.x = x
-	if state == utf8Reject || (err == io.EOF && state != utf8Accept) {
-		return n, errInvalidUTF8
-	}
-	return n, err
-}
-
-// UTF-8 decoder from http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-//
-// Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-//
-// 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.
-var utf8d = [...]byte{
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1f
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3f
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5f
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7f
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9f
-	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // a0..bf
-	8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // c0..df
-	0xa, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // e0..ef
-	0xb, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // f0..ff
-	0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
-	1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
-	1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
-	1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // s7..s8
-}
-
-const (
-	utf8Accept = 0
-	utf8Reject = 1
-)
-
-func decode(state int, x rune, b byte) (int, rune) {
-	t := utf8d[b]
-	if state != utf8Accept {
-		x = rune(b&0x3f) | (x << 6)
-	} else {
-		x = rune((0xff >> t) & b)
-	}
-	state = int(utf8d[256+state*16+int(t)])
-	return state, x
-}
diff --git a/vendor/github.com/gorilla/websocket/examples/chat/README.md b/vendor/github.com/gorilla/websocket/examples/chat/README.md
deleted file mode 100644
index 08fc3e65c..000000000
--- a/vendor/github.com/gorilla/websocket/examples/chat/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Chat Example
-
-This application shows how to use use the
-[websocket](https://github.com/gorilla/websocket) package and
-[jQuery](http://jquery.com) to implement a simple web chat application.
-
-## Running the example
-
-The example requires a working Go development environment. The [Getting
-Started](http://golang.org/doc/install) page describes how to install the
-development environment.
-
-Once you have Go up and running, you can download, build and run the example
-using the following commands.
-
-    $ go get github.com/gorilla/websocket
-    $ cd `go list -f '{{.Dir}}' github.com/gorilla/websocket/examples/chat`
-    $ go run *.go
-
diff --git a/vendor/github.com/gorilla/websocket/examples/chat/conn.go b/vendor/github.com/gorilla/websocket/examples/chat/conn.go
deleted file mode 100644
index aaa617e11..000000000
--- a/vendor/github.com/gorilla/websocket/examples/chat/conn.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2013 Gary Burd. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/gorilla/websocket"
-	"log"
-	"net/http"
-	"time"
-)
-
-const (
-	// Time allowed to write a message to the peer.
-	writeWait = 10 * time.Second
-
-	// Time allowed to read the next pong message from the peer.
-	pongWait = 60 * time.Second
-
-	// Send pings to peer with this period. Must be less than pongWait.
-	pingPeriod = (pongWait * 9) / 10
-
-	// Maximum message size allowed from peer.
-	maxMessageSize = 512
-)
-
-// connection is an middleman between the websocket connection and the hub.
-type connection struct {
-	// The websocket connection.
-	ws *websocket.Conn
-
-	// Buffered channel of outbound messages.
-	send chan []byte
-}
-
-// readPump pumps messages from the websocket connection to the hub.
-func (c *connection) readPump() {
-	defer func() {
-		h.unregister <- c
-		c.ws.Close()
-	}()
-	c.ws.SetReadLimit(maxMessageSize)
-	c.ws.SetReadDeadline(time.Now().Add(pongWait))
-	c.ws.SetPongHandler(func(string) error { c.ws.SetReadDeadline(time.Now().Add(pongWait)); return nil })
-	for {
-		_, message, err := c.ws.ReadMessage()
-		if err != nil {
-			break
-		}
-		h.broadcast <- message
-	}
-}
-
-// write writes a message with the given message type and payload.
-func (c *connection) write(mt int, payload []byte) error {
-	c.ws.SetWriteDeadline(time.Now().Add(writeWait))
-	return c.ws.WriteMessage(mt, payload)
-}
-
-// writePump pumps messages from the hub to the websocket connection.
-func (c *connection) writePump() {
-	ticker := time.NewTicker(pingPeriod)
-	defer func() {
-		ticker.Stop()
-		c.ws.Close()
-	}()
-	for {
-		select {
-		case message, ok := <-c.send:
-			if !ok {
-				c.write(websocket.CloseMessage, []byte{})
-				return
-			}
-			if err := c.write(websocket.TextMessage, message); err != nil {
-				return
-			}
-		case <-ticker.C:
-			if err := c.write(websocket.PingMessage, []byte{}); err != nil {
-				return
-			}
-		}
-	}
-}
-
-// serverWs handles webocket requests from the peer.
-func serveWs(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "Method not allowed", 405)
-		return
-	}
-	if r.Header.Get("Origin") != "http://"+r.Host {
-		http.Error(w, "Origin not allowed", 403)
-		return
-	}
-	ws, err := websocket.Upgrade(w, r, nil, 1024, 1024)
-	if _, ok := err.(websocket.HandshakeError); ok {
-		http.Error(w, "Not a websocket handshake", 400)
-		return
-	} else if err != nil {
-		log.Println(err)
-		return
-	}
-	c := &connection{send: make(chan []byte, 256), ws: ws}
-	h.register <- c
-	go c.writePump()
-	c.readPump()
-}
diff --git a/vendor/github.com/gorilla/websocket/examples/chat/home.html b/vendor/github.com/gorilla/websocket/examples/chat/home.html
deleted file mode 100644
index 29599225c..000000000
--- a/vendor/github.com/gorilla/websocket/examples/chat/home.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>Chat Example</title>
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
-<script type="text/javascript">
-    $(function() {
-
-    var conn;
-    var msg = $("#msg");
-    var log = $("#log");
-
-    function appendLog(msg) {
-        var d = log[0]
-        var doScroll = d.scrollTop == d.scrollHeight - d.clientHeight;
-        msg.appendTo(log)
-        if (doScroll) {
-            d.scrollTop = d.scrollHeight - d.clientHeight;
-        }
-    }
-
-    $("#form").submit(function() {
-        if (!conn) {
-            return false;
-        }
-        if (!msg.val()) {
-            return false;
-        }
-        conn.send(msg.val());
-        msg.val("");
-        return false
-    });
-
-    if (window["WebSocket"]) {
-        conn = new WebSocket("ws://{{$}}/ws");
-        conn.onclose = function(evt) {
-            appendLog($("<div><b>Connection closed.</b></div>"))
-        }
-        conn.onmessage = function(evt) {
-            appendLog($("<div/>").text(evt.data))
-        }
-    } else {
-        appendLog($("<div><b>Your browser does not support WebSockets.</b></div>"))
-    }
-    });
-</script>
-<style type="text/css">
-html {
-    overflow: hidden;
-}
-
-body {
-    overflow: hidden;
-    padding: 0;
-    margin: 0;
-    width: 100%;
-    height: 100%;
-    background: gray;
-}
-
-#log {
-    background: white;
-    margin: 0;
-    padding: 0.5em 0.5em 0.5em 0.5em;
-    position: absolute;
-    top: 0.5em;
-    left: 0.5em;
-    right: 0.5em;
-    bottom: 3em;
-    overflow: auto;
-}
-
-#form {
-    padding: 0 0.5em 0 0.5em;
-    margin: 0;
-    position: absolute;
-    bottom: 1em;
-    left: 0px;
-    width: 100%;
-    overflow: hidden;
-}
-
-</style>
-</head>
-<body>
-<div id="log"></div>
-<form id="form">
-    <input type="submit" value="Send" />
-    <input type="text" id="msg" size="64"/>
-</form>
-</body>
-</html>
diff --git a/vendor/github.com/gorilla/websocket/examples/chat/hub.go b/vendor/github.com/gorilla/websocket/examples/chat/hub.go
deleted file mode 100644
index 1bab0ed36..000000000
--- a/vendor/github.com/gorilla/websocket/examples/chat/hub.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Gary Burd. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-// hub maintains the set of active connections and broadcasts messages to the
-// connections.
-type hub struct {
-	// Registered connections.
-	connections map[*connection]bool
-
-	// Inbound messages from the connections.
-	broadcast chan []byte
-
-	// Register requests from the connections.
-	register chan *connection
-
-	// Unregister requests from connections.
-	unregister chan *connection
-}
-
-var h = hub{
-	broadcast:   make(chan []byte),
-	register:    make(chan *connection),
-	unregister:  make(chan *connection),
-	connections: make(map[*connection]bool),
-}
-
-func (h *hub) run() {
-	for {
-		select {
-		case c := <-h.register:
-			h.connections[c] = true
-		case c := <-h.unregister:
-			delete(h.connections, c)
-			close(c.send)
-		case m := <-h.broadcast:
-			for c := range h.connections {
-				select {
-				case c.send <- m:
-				default:
-					close(c.send)
-					delete(h.connections, c)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/examples/chat/main.go b/vendor/github.com/gorilla/websocket/examples/chat/main.go
deleted file mode 100644
index 7c2515bf5..000000000
--- a/vendor/github.com/gorilla/websocket/examples/chat/main.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 Gary Burd. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-	"log"
-	"net/http"
-	"text/template"
-)
-
-var addr = flag.String("addr", ":8080", "http service address")
-var homeTempl = template.Must(template.ParseFiles("home.html"))
-
-func serveHome(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/" {
-		http.Error(w, "Not found", 404)
-		return
-	}
-	if r.Method != "GET" {
-		http.Error(w, "Method nod allowed", 405)
-		return
-	}
-	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	homeTempl.Execute(w, r.Host)
-}
-
-func main() {
-	flag.Parse()
-	go h.run()
-	http.HandleFunc("/", serveHome)
-	http.HandleFunc("/ws", serveWs)
-	err := http.ListenAndServe(*addr, nil)
-	if err != nil {
-		log.Fatal("ListenAndServe: ", err)
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/json.go b/vendor/github.com/gorilla/websocket/json.go
deleted file mode 100644
index 594e9f3e6..000000000
--- a/vendor/github.com/gorilla/websocket/json.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2013 Gary Burd. 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 (
-	"encoding/json"
-)
-
-// WriteJSON is deprecated, use c.WriteJSON instead.
-func WriteJSON(c *Conn, v interface{}) error {
-	return c.WriteJSON(v)
-}
-
-// WriteJSON writes the JSON encoding of v to the connection.
-//
-// See the documentation for encoding/json Marshal for details about the
-// conversion of Go values to JSON.
-func (c *Conn) WriteJSON(v interface{}) error {
-	w, err := c.NextWriter(TextMessage)
-	if err != nil {
-		return err
-	}
-	err1 := json.NewEncoder(w).Encode(v)
-	err2 := w.Close()
-	if err1 != nil {
-		return err1
-	}
-	return err2
-}
-
-// ReadJSON is deprecated, use c.ReadJSON instead.
-func ReadJSON(c *Conn, v interface{}) error {
-	return c.ReadJSON(v)
-}
-
-// ReadJSON reads the next JSON-encoded message from the connection and stores
-// it in the value pointed to by v.
-//
-// See the documentation for the encoding/json Marshal function for details
-// about the conversion of JSON to a Go value.
-func (c *Conn) ReadJSON(v interface{}) error {
-	_, r, err := c.NextReader()
-	if err != nil {
-		return err
-	}
-	return json.NewDecoder(r).Decode(v)
-}
diff --git a/vendor/github.com/gorilla/websocket/json_test.go b/vendor/github.com/gorilla/websocket/json_test.go
deleted file mode 100644
index f1b7e51da..000000000
--- a/vendor/github.com/gorilla/websocket/json_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2013 Gary Burd. 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"
-	"reflect"
-	"testing"
-)
-
-func TestJSON(t *testing.T) {
-	var buf bytes.Buffer
-	c := fakeNetConn{&buf, &buf}
-	wc := newConn(c, true, 1024, 1024)
-	rc := newConn(c, false, 1024, 1024)
-
-	var actual, expect struct {
-		A int
-		B string
-	}
-	expect.A = 1
-	expect.B = "hello"
-
-	if err := wc.WriteJSON(&expect); err != nil {
-		t.Fatal("write", err)
-	}
-
-	if err := rc.ReadJSON(&actual); err != nil {
-		t.Fatal("read", err)
-	}
-
-	if !reflect.DeepEqual(&actual, &expect) {
-		t.Fatal("equal", actual, expect)
-	}
-}
-
-func TestDeprecatedJSON(t *testing.T) {
-	var buf bytes.Buffer
-	c := fakeNetConn{&buf, &buf}
-	wc := newConn(c, true, 1024, 1024)
-	rc := newConn(c, false, 1024, 1024)
-
-	var actual, expect struct {
-		A int
-		B string
-	}
-	expect.A = 1
-	expect.B = "hello"
-
-	if err := WriteJSON(wc, &expect); err != nil {
-		t.Fatal("write", err)
-	}
-
-	if err := ReadJSON(rc, &actual); err != nil {
-		t.Fatal("read", err)
-	}
-
-	if !reflect.DeepEqual(&actual, &expect) {
-		t.Fatal("equal", actual, expect)
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/server.go b/vendor/github.com/gorilla/websocket/server.go
deleted file mode 100644
index fe2342578..000000000
--- a/vendor/github.com/gorilla/websocket/server.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2013 Gary Burd. 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"
-	"errors"
-	"net"
-	"net/http"
-	"strings"
-)
-
-// HandshakeError describes an error with the handshake from the peer.
-type HandshakeError struct {
-	message string
-}
-
-func (e HandshakeError) Error() string { return e.message }
-
-// Upgrade upgrades the HTTP server connection to the WebSocket protocol.
-//
-// The application is responsible for checking the request origin before
-// calling Upgrade. An example implementation of the same origin policy is:
-//
-//	if req.Header.Get("Origin") != "http://"+req.Host {
-//		http.Error(w, "Origin not allowed", 403)
-//		return
-//	}
-//
-// If the endpoint supports subprotocols, then the application is responsible
-// for negotiating the protocol used on the connection. Use the Subprotocols()
-// function to get the subprotocols requested by the client. Use the
-// Sec-Websocket-Protocol response header to specify the subprotocol selected
-// by the application.
-//
-// The responseHeader is included in the response to the client's upgrade
-// request. Use the responseHeader to specify cookies (Set-Cookie) and the
-// negotiated subprotocol (Sec-Websocket-Protocol).
-//
-// The connection buffers IO to the underlying network connection. The
-// readBufSize and writeBufSize parameters specify the size of the buffers to
-// use. Messages can be larger than the buffers.
-//
-// If the request is not a valid WebSocket handshake, then Upgrade returns an
-// error of type HandshakeError. Applications should handle this error by
-// replying to the client with an HTTP error response.
-func Upgrade(w http.ResponseWriter, r *http.Request, responseHeader http.Header, readBufSize, writeBufSize int) (*Conn, error) {
-
-	if values := r.Header["Sec-Websocket-Version"]; len(values) == 0 || values[0] != "13" {
-		return nil, HandshakeError{"websocket: version != 13"}
-	}
-
-	if !tokenListContainsValue(r.Header, "Connection", "upgrade") {
-		return nil, HandshakeError{"websocket: connection header != upgrade"}
-	}
-
-	if !tokenListContainsValue(r.Header, "Upgrade", "websocket") {
-		return nil, HandshakeError{"websocket: upgrade != websocket"}
-	}
-
-	var challengeKey string
-	values := r.Header["Sec-Websocket-Key"]
-	if len(values) == 0 || values[0] == "" {
-		return nil, HandshakeError{"websocket: key missing or blank"}
-	}
-	challengeKey = values[0]
-
-	var (
-		netConn net.Conn
-		br      *bufio.Reader
-		err     error
-	)
-
-	h, ok := w.(http.Hijacker)
-	if !ok {
-		return nil, errors.New("websocket: response does not implement http.Hijacker")
-	}
-	var rw *bufio.ReadWriter
-	netConn, rw, err = h.Hijack()
-	br = rw.Reader
-
-	if br.Buffered() > 0 {
-		netConn.Close()
-		return nil, errors.New("websocket: client sent data before handshake is complete")
-	}
-
-	c := newConn(netConn, true, readBufSize, writeBufSize)
-	if responseHeader != nil {
-		c.subprotocol = responseHeader.Get("Sec-Websocket-Protocol")
-	}
-
-	p := c.writeBuf[:0]
-	p = append(p, "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: "...)
-	p = append(p, computeAcceptKey(challengeKey)...)
-	p = append(p, "\r\n"...)
-	for k, vs := range responseHeader {
-		for _, v := range vs {
-			p = append(p, k...)
-			p = append(p, ": "...)
-			for i := 0; i < len(v); i++ {
-				b := v[i]
-				if b <= 31 {
-					// prevent response splitting.
-					b = ' '
-				}
-				p = append(p, b)
-			}
-			p = append(p, "\r\n"...)
-		}
-	}
-	p = append(p, "\r\n"...)
-
-	if _, err = netConn.Write(p); err != nil {
-		netConn.Close()
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// Subprotocols returns the subprotocols requested by the client in the
-// Sec-Websocket-Protocol header.
-func Subprotocols(r *http.Request) []string {
-	h := strings.TrimSpace(r.Header.Get("Sec-Websocket-Protocol"))
-	if h == "" {
-		return nil
-	}
-	protocols := strings.Split(h, ",")
-	for i := range protocols {
-		protocols[i] = strings.TrimSpace(protocols[i])
-	}
-	return protocols
-}
diff --git a/vendor/github.com/gorilla/websocket/server_test.go b/vendor/github.com/gorilla/websocket/server_test.go
deleted file mode 100644
index 709ee04d3..000000000
--- a/vendor/github.com/gorilla/websocket/server_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 Gary Burd. 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 (
-	"net/http"
-	"reflect"
-	"testing"
-)
-
-var subprotocolTests = []struct {
-	h         string
-	protocols []string
-}{
-	{"", nil},
-	{"foo", []string{"foo"}},
-	{"foo,bar", []string{"foo", "bar"}},
-	{"foo, bar", []string{"foo", "bar"}},
-	{" foo, bar", []string{"foo", "bar"}},
-	{" foo, bar ", []string{"foo", "bar"}},
-}
-
-func TestSubprotocols(t *testing.T) {
-	for _, st := range subprotocolTests {
-		r := http.Request{Header: http.Header{"Sec-Websocket-Protocol": {st.h}}}
-		protocols := Subprotocols(&r)
-		if !reflect.DeepEqual(st.protocols, protocols) {
-			t.Errorf("SubProtocols(%q) returned %#v, want %#v", st.h, protocols, st.protocols)
-		}
-	}
-}
diff --git a/vendor/github.com/gorilla/websocket/util.go b/vendor/github.com/gorilla/websocket/util.go
deleted file mode 100644
index a9cfbf976..000000000
--- a/vendor/github.com/gorilla/websocket/util.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2013 Gary Burd. 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 (
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/base64"
-	"io"
-	"net/http"
-	"strings"
-)
-
-// tokenListContainsValue returns true if the 1#token header with the given
-// name contains token.
-func tokenListContainsValue(header http.Header, name string, value string) bool {
-	for _, v := range header[name] {
-		for _, s := range strings.Split(v, ",") {
-			if strings.EqualFold(value, strings.TrimSpace(s)) {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-var keyGUID = []byte("258EAFA5-E914-47DA-95CA-C5AB0DC85B11")
-
-func computeAcceptKey(challengeKey string) string {
-	h := sha1.New()
-	h.Write([]byte(challengeKey))
-	h.Write(keyGUID)
-	return base64.StdEncoding.EncodeToString(h.Sum(nil))
-}
-
-func generateChallengeKey() (string, error) {
-	p := make([]byte, 16)
-	if _, err := io.ReadFull(rand.Reader, p); err != nil {
-		return "", err
-	}
-	return base64.StdEncoding.EncodeToString(p), nil
-}
diff --git a/vendor/github.com/kr/s3/License b/vendor/github.com/kr/s3/License
deleted file mode 100644
index 4abc74889..000000000
--- a/vendor/github.com/kr/s3/License
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 Keith Rarick.
-
-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/vendor/github.com/kr/s3/Readme b/vendor/github.com/kr/s3/Readme
deleted file mode 100644
index 93b535952..000000000
--- a/vendor/github.com/kr/s3/Readme
+++ /dev/null
@@ -1,4 +0,0 @@
-Package s3 signs HTTP requests for use with Amazon’s S3 API.
-
-Documentation:
-http://godoc.org/github.com/kr/s3
diff --git a/vendor/github.com/kr/s3/example_test.go b/vendor/github.com/kr/s3/example_test.go
deleted file mode 100644
index 2f6f10a5f..000000000
--- a/vendor/github.com/kr/s3/example_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package s3_test
-
-import (
-	"fmt"
-	"github.com/kr/s3"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-)
-
-func ExampleSign() {
-	keys := s3.Keys{
-		AccessKey: os.Getenv("S3_ACCESS_KEY"),
-		SecretKey: os.Getenv("S3_SECRET_KEY"),
-	}
-	data := strings.NewReader("hello, world")
-	r, _ := http.NewRequest("PUT", "https://example.s3.amazonaws.com/foo", data)
-	r.ContentLength = int64(data.Len())
-	r.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	r.Header.Set("X-Amz-Acl", "public-read")
-	s3.Sign(r, keys)
-	resp, err := http.DefaultClient.Do(r)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(resp.StatusCode)
-}
diff --git a/vendor/github.com/kr/s3/s3cp/.gitignore b/vendor/github.com/kr/s3/s3cp/.gitignore
deleted file mode 100644
index d436c50fb..000000000
--- a/vendor/github.com/kr/s3/s3cp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/s3cp
diff --git a/vendor/github.com/kr/s3/s3cp/Readme b/vendor/github.com/kr/s3/s3cp/Readme
deleted file mode 100644
index 03ab5b559..000000000
--- a/vendor/github.com/kr/s3/s3cp/Readme
+++ /dev/null
@@ -1,4 +0,0 @@
-Command s3cp copies a file to or from Amazon S3.
-
-Full documentation:
-http://godoc.org/github.com/kr/s3/s3cp
diff --git a/vendor/github.com/kr/s3/s3cp/main.go b/vendor/github.com/kr/s3/s3cp/main.go
deleted file mode 100644
index a1b5d6505..000000000
--- a/vendor/github.com/kr/s3/s3cp/main.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Command s3cp copies a file to or from Amazon S3.
-//
-// Usage:
-//
-//   s3cp file url
-//   s3cp url file
-//
-// The file does not need to be seekable or stat-able. You can use s3cp to
-// upload data of indeterminate length, such as from a pipe.
-//
-// Examples:
-//   $ s3cp file.txt https://mybucket.s3.amazonaws.com/file.txt
-//   $ gendata | s3cp /dev/stdin https://mybucket.s3.amazonaws.com/log
-//   $ s3cp https://mybucket.s3.amazonaws.com/image.jpg pic.jpg
-//
-// Environment:
-//
-// S3_ACCESS_KEY – an AWS Access Key Id (required)
-//
-// S3_SECRET_KEY – an AWS Secret Access Key (required)
-package main
-
-import (
-	"fmt"
-	"github.com/kr/s3/s3util"
-	"io"
-	"os"
-	"strings"
-)
-
-func main() {
-	s3util.DefaultConfig.AccessKey = os.Getenv("S3_ACCESS_KEY")
-	s3util.DefaultConfig.SecretKey = os.Getenv("S3_SECRET_KEY")
-	args := os.Args[1:]
-	if len(args) != 2 {
-		fmt.Fprintln(os.Stderr, "Usage: s3cp file url")
-		fmt.Fprintln(os.Stderr, "       s3cp url file")
-		os.Exit(1)
-	}
-
-	r, err := open(args[0])
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-
-	w, err := create(args[1])
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-
-	_, err = io.Copy(w, r)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-
-	err = w.Close()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func open(s string) (io.ReadCloser, error) {
-	if isURL(s) {
-		return s3util.Open(s, nil)
-	}
-	return os.Open(s)
-}
-
-func create(s string) (io.WriteCloser, error) {
-	if isURL(s) {
-		return s3util.Create(s, nil, nil)
-	}
-	return os.Create(s)
-}
-
-func isURL(s string) bool {
-	return strings.HasPrefix(s, "http://") || strings.HasPrefix(s, "https://")
-}
diff --git a/vendor/github.com/kr/s3/s3util/Readme b/vendor/github.com/kr/s3/s3util/Readme
deleted file mode 100644
index 97c4a9de3..000000000
--- a/vendor/github.com/kr/s3/s3util/Readme
+++ /dev/null
@@ -1,4 +0,0 @@
-Package s3util provides streaming transfers to and from Amazon S3.
-
-Full documentation:
-http://godoc.org/github.com/kr/s3/s3util
diff --git a/vendor/github.com/kr/s3/s3util/config.go b/vendor/github.com/kr/s3/s3util/config.go
deleted file mode 100644
index aeae14ac4..000000000
--- a/vendor/github.com/kr/s3/s3util/config.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Package s3util provides streaming transfers to and from Amazon S3.
-//
-// To use it, open or create an S3 object, read or write data,
-// and close the object.
-//
-// You must assign valid credentials to DefaultConfig.Keys before using
-// DefaultConfig. Be sure to close an io.WriteCloser returned by this package,
-// to flush buffers and complete the multipart upload process.
-package s3util
-
-// TODO(kr): parse error responses; return structured data
-
-import (
-	"github.com/kr/s3"
-	"net/http"
-)
-
-var DefaultConfig = &Config{
-	Service: s3.DefaultService,
-	Keys:    new(s3.Keys),
-}
-
-type Config struct {
-	*s3.Service
-	*s3.Keys
-	*http.Client // if nil, uses http.DefaultClient
-}
diff --git a/vendor/github.com/kr/s3/s3util/error.go b/vendor/github.com/kr/s3/s3util/error.go
deleted file mode 100644
index 8f512f468..000000000
--- a/vendor/github.com/kr/s3/s3util/error.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package s3util
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-type respError struct {
-	r *http.Response
-	b bytes.Buffer
-}
-
-func newRespError(r *http.Response) *respError {
-	e := new(respError)
-	e.r = r
-	io.Copy(&e.b, r.Body)
-	r.Body.Close()
-	return e
-}
-
-func (e *respError) Error() string {
-	return fmt.Sprintf(
-		"unwanted http status %d: %q",
-		e.r.StatusCode,
-		e.b.String(),
-	)
-}
diff --git a/vendor/github.com/kr/s3/s3util/example_test.go b/vendor/github.com/kr/s3/s3util/example_test.go
deleted file mode 100644
index 2073c15b6..000000000
--- a/vendor/github.com/kr/s3/s3util/example_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package s3util_test
-
-import (
-	"fmt"
-	"github.com/kr/s3/s3util"
-	"io"
-	"os"
-)
-
-func ExampleCreate() {
-	s3util.DefaultConfig.AccessKey = "...access key..."
-	s3util.DefaultConfig.SecretKey = "...secret key..."
-	r, _ := os.Open("/dev/stdin")
-	w, _ := s3util.Create("https://mybucket.s3.amazonaws.com/log.txt", nil, nil)
-	io.Copy(w, r)
-	w.Close()
-}
-
-func ExampleOpen() {
-	s3util.DefaultConfig.AccessKey = "...access key..."
-	s3util.DefaultConfig.SecretKey = "...secret key..."
-	r, _ := s3util.Open("https://mybucket.s3.amazonaws.com/log.txt", nil)
-	w, _ := os.Create("out.txt")
-	io.Copy(w, r)
-	w.Close()
-}
-
-func ExampleReaddir() {
-	s3util.DefaultConfig.AccessKey = os.Getenv("S3_ACCESS_KEY")
-	s3util.DefaultConfig.SecretKey = os.Getenv("S3_SECRET_KEY")
-	f, err := s3util.NewFile("https://examle.s3.amazonaws.com/foo", nil)
-	if err != nil {
-		panic(err)
-	}
-	var infos []os.FileInfo
-	for {
-		infos, err = f.Readdir(0)
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			panic(err)
-		}
-		for i, info := range infos {
-			c := info.Sys().(*s3util.Stat)
-			var etag string
-			if c != nil {
-				etag = c.ETag
-			}
-			fmt.Printf("%d: %v, %s\n", i, info, etag)
-		}
-	}
-}
diff --git a/vendor/github.com/kr/s3/s3util/open.go b/vendor/github.com/kr/s3/s3util/open.go
deleted file mode 100644
index 3f6ae9c5d..000000000
--- a/vendor/github.com/kr/s3/s3util/open.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package s3util
-
-import (
-	"io"
-	"net/http"
-	"time"
-)
-
-// Open requests the S3 object at url. An HTTP status other than 200 is
-// considered an error.
-//
-// If c is nil, Open uses DefaultConfig.
-func Open(url string, c *Config) (io.ReadCloser, error) {
-	if c == nil {
-		c = DefaultConfig
-	}
-	// TODO(kr): maybe parallel range fetching
-	r, _ := http.NewRequest("GET", url, nil)
-	r.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	c.Sign(r, *c.Keys)
-	client := c.Client
-	if client == nil {
-		client = http.DefaultClient
-	}
-	resp, err := client.Do(r)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != 200 {
-		return nil, newRespError(resp)
-	}
-	return resp.Body, nil
-}
diff --git a/vendor/github.com/kr/s3/s3util/readdir.go b/vendor/github.com/kr/s3/s3util/readdir.go
deleted file mode 100644
index d14d6002a..000000000
--- a/vendor/github.com/kr/s3/s3util/readdir.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package s3util
-
-import (
-	"bytes"
-	"encoding/xml"
-	"errors"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// File represents an S3 object or directory.
-type File struct {
-	url    string
-	prefix string
-	config *Config
-	result *listObjectsResult
-}
-
-type fileInfo struct {
-	name    string
-	size    int64
-	dir     bool
-	modTime time.Time
-	sys     *Stat
-}
-
-// Stat contains information about an S3 object or directory.
-// It is the "underlying data source" returned by method Sys
-// for each FileInfo produced by this package.
-//   fi.Sys().(*s3util.Stat)
-// For the meaning of these fields, see
-// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGET.html.
-type Stat struct {
-	Key          string
-	LastModified string
-	ETag         string // ETag value, without double quotes.
-	Size         string
-	StorageClass string
-	OwnerID      string `xml:"Owner>ID"`
-	OwnerName    string `xml:"Owner>DisplayName"`
-}
-
-type listObjectsResult struct {
-	IsTruncated bool
-	Contents    []Stat
-	Directories []string `xml:"CommonPrefixes>Prefix"` // Suffix "/" trimmed
-}
-
-func (f *fileInfo) Name() string { return f.name }
-func (f *fileInfo) Size() int64  { return f.size }
-func (f *fileInfo) Mode() os.FileMode {
-	if f.dir {
-		return 0755 | os.ModeDir
-	}
-	return 0644
-}
-func (f *fileInfo) ModTime() time.Time {
-	if f.modTime.IsZero() && f.sys != nil {
-		// we return the zero value if a parse error ever happens.
-		f.modTime, _ = time.Parse(time.RFC3339Nano, f.sys.LastModified)
-	}
-	return f.modTime
-}
-func (f *fileInfo) IsDir() bool      { return f.dir }
-func (f *fileInfo) Sys() interface{} { return f.sys }
-
-// NewFile returns a new File with the given URL and config.
-//
-// Set rawurl to a directory on S3, such as
-// https://mybucket.s3.amazonaws.com/myfolder.
-// The URL cannot have query parameters or a fragment.
-// If c is nil, DefaultConfig will be used.
-func NewFile(rawurl string, c *Config) (*File, error) {
-	u, err := url.Parse(rawurl)
-	if err != nil {
-		return nil, err
-	}
-	if u.RawQuery != "" {
-		return nil, errors.New("url cannot have raw query parameters.")
-	}
-	if u.Fragment != "" {
-		return nil, errors.New("url cannot have a fragment.")
-	}
-
-	prefix := strings.TrimLeft(u.Path, "/")
-	if prefix != "" && !strings.HasSuffix(prefix, "/") {
-		prefix += "/"
-	}
-	u.Path = ""
-	return &File{u.String(), prefix, c, nil}, nil
-}
-
-// Readdir requests a list of entries in the S3 directory
-// represented by f and returns a slice of up to n FileInfo
-// values, in alphabetical order. Subsequent calls
-// on the same File will yield further FileInfos.
-// Only direct children are returned, not deeper descendants.
-func (f *File) Readdir(n int) ([]os.FileInfo, error) {
-	if f.result != nil && !f.result.IsTruncated {
-		return make([]os.FileInfo, 0), io.EOF
-	}
-
-	reader, err := f.sendRequest(n)
-	if err != nil {
-		return nil, err
-	}
-	defer reader.Close()
-
-	return f.parseResponse(reader)
-}
-
-func (f *File) sendRequest(count int) (io.ReadCloser, error) {
-	c := f.config
-	if c == nil {
-		c = DefaultConfig
-	}
-	var buf bytes.Buffer
-	buf.WriteString(f.url)
-	buf.WriteString("?delimiter=%2F")
-	if f.prefix != "" {
-		buf.WriteString("&prefix=")
-		buf.WriteString(url.QueryEscape(f.prefix))
-	}
-	if count > 0 {
-		buf.WriteString("&max-keys=")
-		buf.WriteString(strconv.Itoa(count))
-	}
-	if f.result != nil && f.result.IsTruncated {
-		var lastDir, lastKey, marker string
-		if len(f.result.Directories) > 0 {
-			lastDir = f.result.Directories[len(f.result.Directories)-1]
-		}
-		if len(f.result.Contents) > 0 {
-			lastKey = f.result.Contents[len(f.result.Contents)-1].Key
-		}
-
-		if lastKey > lastDir {
-			marker = lastKey
-		} else {
-			marker = lastDir
-		}
-
-		if marker != "" {
-			buf.WriteString("&marker=")
-			buf.WriteString(url.QueryEscape(marker))
-		}
-	}
-	u := buf.String()
-	r, _ := http.NewRequest("GET", u, nil)
-	r.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	c.Sign(r, *c.Keys)
-	resp, err := http.DefaultClient.Do(r)
-	if err != nil {
-		return nil, err
-	}
-	if resp.StatusCode != 200 {
-		return nil, newRespError(resp)
-	}
-	return resp.Body, nil
-}
-
-func (f *File) parseResponse(reader io.Reader) ([]os.FileInfo, error) {
-	decoder := xml.NewDecoder(reader)
-	result := listObjectsResult{}
-	var err error
-	err = decoder.Decode(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	infos := make([]os.FileInfo, len(result.Contents)+len(result.Directories))
-	var size int64
-	var name string
-	var is_dir bool
-	for i, content := range result.Contents {
-		c := content
-		c.ETag = strings.Trim(c.ETag, `"`)
-		size, _ = strconv.ParseInt(c.Size, 10, 0)
-		if size == 0 && strings.HasSuffix(c.Key, "/") {
-			name = strings.TrimRight(c.Key, "/")
-			is_dir = true
-		} else {
-			name = c.Key
-			is_dir = false
-		}
-		infos[i] = &fileInfo{
-			name: name,
-			size: size,
-			dir:  is_dir,
-			sys:  &c,
-		}
-	}
-	for i, dir := range result.Directories {
-		infos[len(result.Contents)+i] = &fileInfo{
-			name: strings.TrimRight(dir, "/"),
-			size: 0,
-			dir:  true,
-		}
-	}
-	f.result = &result
-
-	return infos, nil
-}
diff --git a/vendor/github.com/kr/s3/s3util/uploader.go b/vendor/github.com/kr/s3/s3util/uploader.go
deleted file mode 100644
index 1a21511bd..000000000
--- a/vendor/github.com/kr/s3/s3util/uploader.go
+++ /dev/null
@@ -1,267 +0,0 @@
-package s3util
-
-import (
-	"bytes"
-	"encoding/xml"
-	"github.com/kr/s3"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"sync"
-	"syscall"
-	"time"
-)
-
-// defined by amazon
-const (
-	minPartSize = 5 * 1024 * 1024
-	maxPartSize = 1<<31 - 1 // for 32-bit use; amz max is 5GiB
-	maxObjSize  = 5 * 1024 * 1024 * 1024 * 1024
-	maxNPart    = 10000
-)
-
-const (
-	concurrency = 5
-	nTry        = 2
-)
-
-type part struct {
-	r   io.ReadSeeker
-	len int64
-
-	// read by xml encoder
-	PartNumber int
-	ETag       string
-}
-
-type uploader struct {
-	s3       s3.Service
-	keys     s3.Keys
-	url      string
-	client   *http.Client
-	UploadId string // written by xml decoder
-
-	bufsz  int64
-	buf    []byte
-	off    int
-	ch     chan *part
-	part   int
-	closed bool
-	err    error
-	wg     sync.WaitGroup
-
-	xml struct {
-		XMLName string `xml:"CompleteMultipartUpload"`
-		Part    []*part
-	}
-}
-
-// Create creates an S3 object at url and sends multipart upload requests as
-// data is written.
-//
-// If h is not nil, each of its entries is added to the HTTP request header.
-// If c is nil, Create uses DefaultConfig.
-func Create(url string, h http.Header, c *Config) (io.WriteCloser, error) {
-	if c == nil {
-		c = DefaultConfig
-	}
-	return newUploader(url, h, c)
-}
-
-// Sends an S3 multipart upload initiation request.
-// See http://docs.amazonwebservices.com/AmazonS3/latest/dev/mpuoverview.html.
-// This initial request returns an UploadId that we use to identify
-// subsequent PUT requests.
-func newUploader(url string, h http.Header, c *Config) (u *uploader, err error) {
-	u = new(uploader)
-	u.s3 = *c.Service
-	u.url = url
-	u.keys = *c.Keys
-	u.client = c.Client
-	if u.client == nil {
-		u.client = http.DefaultClient
-	}
-	u.bufsz = minPartSize
-	r, err := http.NewRequest("POST", url+"?uploads", nil)
-	if err != nil {
-		return nil, err
-	}
-	r.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	for k := range h {
-		for _, v := range h[k] {
-			r.Header.Add(k, v)
-		}
-	}
-	u.s3.Sign(r, u.keys)
-	resp, err := u.client.Do(r)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return nil, newRespError(resp)
-	}
-	err = xml.NewDecoder(resp.Body).Decode(u)
-	if err != nil {
-		return nil, err
-	}
-	u.ch = make(chan *part)
-	for i := 0; i < concurrency; i++ {
-		go u.worker()
-	}
-	return u, nil
-}
-
-func (u *uploader) Write(p []byte) (n int, err error) {
-	if u.closed {
-		return 0, syscall.EINVAL
-	}
-	if u.err != nil {
-		return 0, u.err
-	}
-	for n < len(p) {
-		if cap(u.buf) == 0 {
-			u.buf = make([]byte, int(u.bufsz))
-			// Increase part size (1.001x).
-			// This lets us reach the max object size (5TiB) while
-			// still doing minimal buffering for small objects.
-			u.bufsz = min(u.bufsz+u.bufsz/1000, maxPartSize)
-		}
-		r := copy(u.buf[u.off:], p[n:])
-		u.off += r
-		n += r
-		if u.off == len(u.buf) {
-			u.flush()
-		}
-	}
-	return n, nil
-}
-
-func (u *uploader) flush() {
-	u.wg.Add(1)
-	u.part++
-	p := &part{bytes.NewReader(u.buf[:u.off]), int64(u.off), u.part, ""}
-	u.xml.Part = append(u.xml.Part, p)
-	u.ch <- p
-	u.buf, u.off = nil, 0
-}
-
-func (u *uploader) worker() {
-	for p := range u.ch {
-		u.retryUploadPart(p)
-	}
-}
-
-// Calls putPart up to nTry times to recover from transient errors.
-func (u *uploader) retryUploadPart(p *part) {
-	defer u.wg.Done()
-	defer func() { p.r = nil }() // free the large buffer
-	var err error
-	for i := 0; i < nTry; i++ {
-		p.r.Seek(0, 0)
-		err = u.putPart(p)
-		if err == nil {
-			return
-		}
-	}
-	u.err = err
-}
-
-// Uploads part p, reading its contents from p.r.
-// Stores the ETag in p.ETag.
-func (u *uploader) putPart(p *part) error {
-	v := url.Values{}
-	v.Set("partNumber", strconv.Itoa(p.PartNumber))
-	v.Set("uploadId", u.UploadId)
-	req, err := http.NewRequest("PUT", u.url+"?"+v.Encode(), p.r)
-	if err != nil {
-		return err
-	}
-	req.ContentLength = p.len
-	req.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	u.s3.Sign(req, u.keys)
-	resp, err := u.client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return newRespError(resp)
-	}
-	s := resp.Header.Get("etag") // includes quote chars for some reason
-	if len(s) < 2 {
-		return fmt.Errorf("received invalid etag %q", s)
-	}
-	p.ETag = s[1 : len(s)-1]
-	return nil
-}
-
-func (u *uploader) Close() error {
-	if u.closed {
-		return syscall.EINVAL
-	}
-	if cap(u.buf) > 0 {
-		u.flush()
-	}
-	u.wg.Wait()
-	close(u.ch)
-	u.closed = true
-	if u.err != nil {
-		u.abort()
-		return u.err
-	}
-
-	body, err := xml.Marshal(u.xml)
-	if err != nil {
-		return err
-	}
-	b := bytes.NewBuffer(body)
-	v := url.Values{}
-	v.Set("uploadId", u.UploadId)
-	req, err := http.NewRequest("POST", u.url+"?"+v.Encode(), b)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	u.s3.Sign(req, u.keys)
-	resp, err := u.client.Do(req)
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != 200 {
-		return newRespError(resp)
-	}
-	resp.Body.Close()
-	return nil
-}
-
-func (u *uploader) abort() {
-	// TODO(kr): devise a reasonable way to report an error here in addition
-	// to the error that caused the abort.
-	v := url.Values{}
-	v.Set("uploadId", u.UploadId)
-	s := u.url + "?" + v.Encode()
-	req, err := http.NewRequest("DELETE", s, nil)
-	if err != nil {
-		return
-	}
-	req.Header.Set("Date", time.Now().UTC().Format(http.TimeFormat))
-	u.s3.Sign(req, u.keys)
-	resp, err := u.client.Do(req)
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return
-	}
-}
-
-func min(a, b int64) int64 {
-	if a < b {
-		return a
-	}
-	return b
-}
diff --git a/vendor/github.com/kr/s3/s3util/uploader_test.go b/vendor/github.com/kr/s3/s3util/uploader_test.go
deleted file mode 100644
index 77adbe88f..000000000
--- a/vendor/github.com/kr/s3/s3util/uploader_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package s3util
-
-import (
-	"io"
-	"io/ioutil"
-	"net/http"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func runUpload(t *testing.T, makeCloser func(io.Reader) io.ReadCloser) *uploader {
-	c := *DefaultConfig
-	c.Client = &http.Client{
-		Transport: RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-			var s string
-			switch q := req.URL.Query(); {
-			case req.Method == "PUT":
-			case req.Method == "POST" && q["uploads"] != nil:
-				s = `<UploadId>foo</UploadId>`
-			case req.Method == "POST" && q["uploadId"] != nil:
-				b, _ := ioutil.ReadAll(req.Body)
-				if !strings.Contains(string(b), "<ETag>foo</ETag>") {
-					t.Error("missing ETag")
-				}
-			default:
-				t.Fatal("unexpected request", req)
-			}
-			resp := &http.Response{
-				StatusCode: 200,
-				Body:       makeCloser(strings.NewReader(s)),
-				Header: http.Header{
-					"Etag": {`"foo"`},
-				},
-			}
-			return resp, nil
-		}),
-	}
-	u, err := newUploader("https://s3.amazonaws.com/foo/bar", nil, &c)
-	if err != nil {
-		t.Fatal("unexpected err", err)
-	}
-	const size = minPartSize + minPartSize/3
-	n, err := io.Copy(u, io.LimitReader(devZero, size))
-	if err != nil {
-		t.Fatal("unexpected err", err)
-	}
-	if n != size {
-		t.Fatal("wrote %d bytes want %d", n, size)
-	}
-	err = u.Close()
-	if err != nil {
-		t.Fatal("unexpected err", err)
-	}
-	return u
-}
-
-func TestUploaderCloseRespBody(t *testing.T) {
-	want := make(chan int, 100)
-	got := make(closeCounter, 100)
-	f := func(r io.Reader) io.ReadCloser {
-		want <- 1
-		return readClose{r, got}
-	}
-	runUpload(t, f)
-	if len(want) != len(got) {
-		t.Errorf("closes = %d want %d", len(got), len(want))
-	}
-}
-
-// Used in TestUploaderFreesBuffers to force liveness.
-var DummyUploader *uploader
-
-func TestUploaderFreesBuffers(t *testing.T) {
-	var m0, m1 runtime.MemStats
-	runtime.GC()
-	runtime.ReadMemStats(&m0)
-	u := runUpload(t, ioutil.NopCloser)
-	runtime.GC()
-	runtime.ReadMemStats(&m1)
-
-	// Make sure everything reachable from u is still live while reading m1.
-	// (Very aggressive cross-package optimization could hypothetically
-	// break this, rendering the test ineffective.)
-	DummyUploader = u
-
-	// The uploader never allocates buffers smaller than minPartSize,
-	// so if the increase is < minPartSize we know none are reachable.
-	inc := m1.Alloc - m0.Alloc
-	if m1.Alloc > m0.Alloc && inc >= minPartSize {
-		t.Errorf("inc = %d want <%d", inc, minPartSize)
-	}
-}
-
-type RoundTripperFunc func(*http.Request) (*http.Response, error)
-
-func (f RoundTripperFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return f(req)
-}
-
-type closeCounter chan int
-
-func (c closeCounter) Close() error {
-	c <- 1
-	return nil
-}
-
-type readClose struct {
-	io.Reader
-	io.Closer
-}
-
-var devZero io.Reader = repeatReader(0)
-
-type repeatReader byte
-
-func (r repeatReader) Read(p []byte) (int, error) {
-	for i := range p {
-		p[i] = byte(r)
-	}
-	return len(p), nil
-}
-
-func TestEmptyEtag(t *testing.T) {
-	defer func() {
-		if err := recover(); err != nil {
-			t.Fatal("uploader panic", err)
-		}
-	}()
-	body := readClose{
-		strings.NewReader(`<UploadId>foo</UploadId>`),
-		make(closeCounter, 100),
-	}
-	c := *DefaultConfig
-	c.Client = &http.Client{
-		Transport: RoundTripperFunc(func(req *http.Request) (*http.Response, error) {
-			resp := &http.Response{
-				StatusCode: 200,
-				Body: body,
-				Header: http.Header{
-					"Etag": {""},
-				},
-			}
-			return resp, nil
-		}),
-	}
-	u, err := newUploader("https://s3.amazonaws.com/foo/bar", nil, &c)
-	if err != nil {
-		t.Fatal("unexpected err", err)
-	}
-	const size = minPartSize + minPartSize/3
-	n, err := io.Copy(u, io.LimitReader(devZero, size))
-	if err == nil || err.Error() != `received invalid etag ""` {
-		t.Fatalf("expected err: %q", err)
-	}
-	if n != minPartSize {
-		t.Fatalf("wrote %d bytes want %d", n, minPartSize)
-	}
-	err = u.Close()
-	if err == nil || err.Error() != `received invalid etag ""` {
-		t.Fatalf("expected err: %q", err)
-	}
-}
diff --git a/vendor/github.com/kr/s3/sign.go b/vendor/github.com/kr/s3/sign.go
deleted file mode 100644
index 0ff2d483b..000000000
--- a/vendor/github.com/kr/s3/sign.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Package s3 signs HTTP requests for Amazon S3 and compatible services.
-package s3
-
-// See
-// http://docs.amazonwebservices.com/AmazonS3/2006-03-01/dev/RESTAuthentication.html.
-
-import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"encoding/base64"
-	"io"
-	"net/http"
-	"sort"
-	"strings"
-)
-
-var signParams = map[string]bool{
-	"acl":                          true,
-	"delete":                       true,
-	"lifecycle":                    true,
-	"location":                     true,
-	"logging":                      true,
-	"notification":                 true,
-	"partNumber":                   true,
-	"policy":                       true,
-	"requestPayment":               true,
-	"response-cache-control":       true,
-	"response-content-disposition": true,
-	"response-content-encoding":    true,
-	"response-content-language":    true,
-	"response-content-type":        true,
-	"response-expires":             true,
-	"restore":                      true,
-	"torrent":                      true,
-	"uploadId":                     true,
-	"uploads":                      true,
-	"versionId":                    true,
-	"versioning":                   true,
-	"versions":                     true,
-	"website":                      true,
-}
-
-// Keys holds a set of Amazon Security Credentials.
-type Keys struct {
-	AccessKey string
-	SecretKey string
-
-	// SecurityToken is used for temporary security credentials.
-	// If set, it will be added to header field X-Amz-Security-Token
-	// before signing a request.
-	SecurityToken string
-	// See http://docs.aws.amazon.com/AmazonS3/latest/dev/MakingRequests.html#TypesofSecurityCredentials
-}
-
-// IdentityBucket returns subdomain.
-// It is designed to be used with S3-compatible services that
-// treat the entire subdomain as the bucket name, for example
-// storage.io.
-func IdentityBucket(subdomain string) string {
-	return subdomain
-}
-
-// AmazonBucket returns everything up to the last '.' in subdomain.
-// It is designed to be used with the Amazon service.
-//   "johnsmith.s3"           becomes "johnsmith"
-//   "johnsmith.s3-eu-west-1" becomes "johnsmith"
-//   "www.example.com.s3"     becomes "www.example.com"
-func AmazonBucket(subdomain string) string {
-	if i := strings.LastIndex(subdomain, "."); i != -1 {
-		return subdomain[:i]
-	}
-	return ""
-}
-
-// DefaultService is the default Service used by Sign.
-var DefaultService = &Service{Domain: "amazonaws.com"}
-
-// Sign signs an HTTP request with the given S3 keys.
-//
-// This function is a wrapper around DefaultService.Sign.
-func Sign(r *http.Request, k Keys) {
-	DefaultService.Sign(r, k)
-}
-
-// Service represents an S3-compatible service.
-type Service struct {
-	// Domain is the service's root domain. It is used to extract
-	// the subdomain from an http.Request before passing the
-	// subdomain to Bucket.
-	Domain string
-
-	// Bucket derives the bucket name from a subdomain.
-	// If nil, AmazonBucket is used.
-	Bucket func(subdomain string) string
-}
-
-// Sign signs an HTTP request with the given S3 keys for use on service s.
-func (s *Service) Sign(r *http.Request, k Keys) {
-	if k.SecurityToken != "" {
-		r.Header.Set("X-Amz-Security-Token", k.SecurityToken)
-	}
-	h := hmac.New(sha1.New, []byte(k.SecretKey))
-	s.writeSigData(h, r)
-	sig := make([]byte, base64.StdEncoding.EncodedLen(h.Size()))
-	base64.StdEncoding.Encode(sig, h.Sum(nil))
-	r.Header.Set("Authorization", "AWS "+k.AccessKey+":"+string(sig))
-}
-
-func (s *Service) writeSigData(w io.Writer, r *http.Request) {
-	w.Write([]byte(r.Method))
-	w.Write([]byte{'\n'})
-	w.Write([]byte(r.Header.Get("content-md5")))
-	w.Write([]byte{'\n'})
-	w.Write([]byte(r.Header.Get("content-type")))
-	w.Write([]byte{'\n'})
-	if _, ok := r.Header["X-Amz-Date"]; !ok {
-		w.Write([]byte(r.Header.Get("date")))
-	}
-	w.Write([]byte{'\n'})
-	writeAmzHeaders(w, r)
-	s.writeResource(w, r)
-}
-
-func (s *Service) writeResource(w io.Writer, r *http.Request) {
-	s.writeVhostBucket(w, strings.ToLower(r.Host))
-	path := r.URL.RequestURI()
-	if r.URL.RawQuery != "" {
-		path = path[:len(path)-len(r.URL.RawQuery)-1]
-	}
-	w.Write([]byte(path))
-	s.writeSubResource(w, r)
-}
-
-func (s *Service) writeVhostBucket(w io.Writer, host string) {
-	if i := strings.Index(host, ":"); i != -1 {
-		host = host[:i]
-	}
-
-	if host == s.Domain {
-		// no vhost - do nothing
-	} else if strings.HasSuffix(host, "."+s.Domain) {
-		// vhost - bucket may be in prefix
-		b := s.Bucket
-		if b == nil {
-			b = AmazonBucket
-		}
-		bucket := b(host[:len(host)-len(s.Domain)-1])
-
-		if bucket != "" {
-			w.Write([]byte{'/'})
-			w.Write([]byte(bucket))
-		}
-	} else {
-		// cname - bucket is host
-		w.Write([]byte{'/'})
-		w.Write([]byte(host))
-	}
-}
-
-func (s *Service) writeSubResource(w io.Writer, r *http.Request) {
-	var a []string
-	for k, vs := range r.URL.Query() {
-		if signParams[k] {
-			for _, v := range vs {
-				if v == "" {
-					a = append(a, k)
-				} else {
-					a = append(a, k+"="+v)
-				}
-			}
-		}
-	}
-	sort.Strings(a)
-	var p byte = '?'
-	for _, s := range a {
-		w.Write([]byte{p})
-		w.Write([]byte(s))
-		p = '&'
-	}
-}
-
-func writeAmzHeaders(w io.Writer, r *http.Request) {
-	var keys []string
-	for k, _ := range r.Header {
-		if strings.HasPrefix(strings.ToLower(k), "x-amz-") {
-			keys = append(keys, k)
-		}
-	}
-
-	sort.Strings(keys)
-	var a []string
-	for _, k := range keys {
-		v := r.Header[k]
-		a = append(a, strings.ToLower(k)+":"+strings.Join(v, ","))
-	}
-	for _, h := range a {
-		w.Write([]byte(h))
-		w.Write([]byte{'\n'})
-	}
-}
diff --git a/vendor/github.com/kr/s3/sign_test.go b/vendor/github.com/kr/s3/sign_test.go
deleted file mode 100644
index cebac558d..000000000
--- a/vendor/github.com/kr/s3/sign_test.go
+++ /dev/null
@@ -1,313 +0,0 @@
-package s3
-
-import (
-	"bytes"
-	"net/http"
-	"testing"
-)
-
-var exKeys = Keys{
-	AccessKey: "AKIAIOSFODNN7EXAMPLE",
-	SecretKey: "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
-}
-
-// Temporary Credentials
-var tokenExKeys = Keys{
-	AccessKey:     "AKIAIOSFODNN7EXAMPLE",
-	SecretKey:     "wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY",
-	SecurityToken: "dummy",
-}
-
-var StorageIOService = &Service{
-	Domain: "storage.io",
-	Bucket: IdentityBucket,
-}
-
-var signTest = []struct {
-	service *Service
-	method  string
-	url     string
-	more    http.Header
-	expBuf  string
-	expSig  string
-}{
-	{
-		DefaultService,
-		"GET",
-		"http://johnsmith.s3.amazonaws.com/photos/puppy.jpg",
-		http.Header{
-			"Date": {"Tue, 27 Mar 2007 19:36:42 +0000"},
-		},
-		"GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/johnsmith/photos/puppy.jpg",
-		"AWS AKIAIOSFODNN7EXAMPLE:bWq2s1WEIj+Ydj0vQ697zp+IXMU=",
-	},
-	{
-		DefaultService,
-		"PUT",
-		"http://johnsmith.s3.amazonaws.com/photos/puppy.jpg",
-		http.Header{
-			"Content-Type":   {"image/jpeg"},
-			"Content-Length": {"94328"},
-			"Date":           {"Tue, 27 Mar 2007 21:15:45 +0000"},
-		},
-		"PUT\n\nimage/jpeg\nTue, 27 Mar 2007 21:15:45 +0000\n/johnsmith/photos/puppy.jpg",
-		"AWS AKIAIOSFODNN7EXAMPLE:MyyxeRY7whkBe+bq8fHCL/2kKUg=",
-	},
-	{
-		DefaultService,
-		"GET",
-		"http://johnsmith.s3.amazonaws.com/?prefix=photos&max-keys=50&marker=puppy",
-		http.Header{
-			"User-Agent": {"Mozilla/5.0"},
-			"Date":       {"Tue, 27 Mar 2007 19:42:41 +0000"},
-		},
-		"GET\n\n\nTue, 27 Mar 2007 19:42:41 +0000\n/johnsmith/",
-		"AWS AKIAIOSFODNN7EXAMPLE:htDYFYduRNen8P9ZfE/s9SuKy0U=",
-	},
-	{
-		DefaultService,
-		"GET",
-		"http://johnsmith.s3.amazonaws.com/?acl",
-		http.Header{
-			"Date": {"Tue, 27 Mar 2007 19:44:46 +0000"},
-		},
-		"GET\n\n\nTue, 27 Mar 2007 19:44:46 +0000\n/johnsmith/?acl",
-		"AWS AKIAIOSFODNN7EXAMPLE:c2WLPFtWHVgbEmeEG93a4cG37dM=",
-	},
-	{
-		DefaultService,
-		"DELETE",
-		"http://s3.amazonaws.com/johnsmith/photos/puppy.jpg",
-		http.Header{
-			"User-Agent": {"dotnet"},
-			"Date":       {"Tue, 27 Mar 2007 21:20:27 +0000"},
-			"x-amz-date": {"Tue, 27 Mar 2007 21:20:26 +0000"},
-		},
-		"DELETE\n\n\n\nx-amz-date:Tue, 27 Mar 2007 21:20:26 +0000\n/johnsmith/photos/puppy.jpg",
-
-		// The expected signature in Amazon's documentation,
-		// "AWS AKIAIOSFODNN7EXAMPLE:9b2sXq0KfxsxHtdZkzx/9Ngqyh8=",
-		// appears to be incorrect.
-		"AWS AKIAIOSFODNN7EXAMPLE:R4dJ53KECjStyBO5iTBJZ4XVOaI=",
-	},
-	{
-		DefaultService,
-		"PUT",
-		"http://static.johnsmith.net:8080/db-backup.dat.gz",
-		http.Header{
-			"User-Agent":                   {"curl/7.15.5"},
-			"Date":                         {"Tue, 27 Mar 2007 21:06:08 +0000"},
-			"x-amz-acl":                    {"public-read"},
-			"content-type":                 {"application/x-download"},
-			"Content-MD5":                  {"4gJE4saaMU4BqNR0kLY+lw=="},
-			"X-Amz-Meta-ReviewedBy":        {"joe@johnsmith.net", "jane@johnsmith.net"},
-			"X-Amz-Meta-FileChecksum":      {"0x02661779"},
-			"X-Amz-Meta-ChecksumAlgorithm": {"crc32"},
-			"Content-Disposition":          {"attachment; filename=database.dat"},
-			"Content-Encoding":             {"gzip"},
-			"Content-Length":               {"5913339"},
-		},
-		"PUT\n4gJE4saaMU4BqNR0kLY+lw==\napplication/x-download\nTue, 27 Mar 2007 21:06:08 +0000\nx-amz-acl:public-read\nx-amz-meta-checksumalgorithm:crc32\nx-amz-meta-filechecksum:0x02661779\nx-amz-meta-reviewedby:joe@johnsmith.net,jane@johnsmith.net\n/static.johnsmith.net/db-backup.dat.gz",
-		"AWS AKIAIOSFODNN7EXAMPLE:ilyl83RwaSoYIEdixDQcA4OnAnc=",
-	},
-	{
-		DefaultService,
-		"GET",
-		"http://s3.amazonaws.com/",
-		http.Header{
-			"Date": {"Wed, 28 Mar 2007 01:29:59 +0000"},
-		},
-		"GET\n\n\nWed, 28 Mar 2007 01:29:59 +0000\n/",
-		"AWS AKIAIOSFODNN7EXAMPLE:qGdzdERIC03wnaRNKh6OqZehG9s=",
-	},
-	{
-		DefaultService,
-		"GET",
-		// I've altered this example from the one documented by Amazon
-		// since package http never produces lower-case %-encodings.
-		"http://s3.amazonaws.com/dictionary/fran%C3%A7ais/pr%C3%A9f%C3%A8re",
-		http.Header{
-			"Date": {"Wed, 28 Mar 2007 01:49:49 +0000"},
-		},
-		"GET\n\n\nWed, 28 Mar 2007 01:49:49 +0000\n/dictionary/fran%C3%A7ais/pr%C3%A9f%C3%A8re",
-		"AWS AKIAIOSFODNN7EXAMPLE:81VEw/Bc3GDt/k65Xrrk3AdfI4c=",
-	},
-	{
-		DefaultService,
-		"POST",
-		// ?delete is required in CanonicalizedResource for:
-		// http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html
-		"http://bucketname.S3.amazonaws.com/?delete",
-		http.Header{
-			"x-amz-date":     {"Wed, 30 Nov 2011 03:39:05 GMT"},
-			"Content-MD5":    {"p5/WA/oEr30qrEEl21PAqw=="},
-			"Content-Length": {"125"},
-		},
-		"POST\np5/WA/oEr30qrEEl21PAqw==\n\n\nx-amz-date:Wed, 30 Nov 2011 03:39:05 GMT\n/bucketname/?delete",
-		// Doesn't match the example in the Amazon docs
-		"AWS AKIAIOSFODNN7EXAMPLE:DXGmXMY+1QnRGC7vicUqu1gTmK4=",
-	},
-	{
-		DefaultService,
-		"POST",
-		// object?restore is required in CanonicalizedResource for:
-		// http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html
-		"http://bucketname.S3.amazonaws.com/photo1.jpg?restore",
-		http.Header{
-			"x-amz-date":     {"Mon, 22 Oct 2012 01:49:52 GMT"},
-			"Content-MD5":    {"p5/WA/oEr30qrEEl21PAqw=="},
-			"Content-Length": {"125"},
-		},
-		"POST\np5/WA/oEr30qrEEl21PAqw==\n\n\nx-amz-date:Mon, 22 Oct 2012 01:49:52 GMT\n/bucketname/photo1.jpg?restore",
-		"AWS AKIAIOSFODNN7EXAMPLE:Yuldf0uSoOutFCGMkKYQzxVYeDk=",
-	},
-	{
-		StorageIOService,
-		"GET",
-		"http://bucket.storage.io/ubuntu-12.04.2-server-amd64.iso",
-		http.Header{
-			"Date": {"Tue, 27 Mar 2007 19:36:42 +0000"},
-		},
-		"GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/bucket/ubuntu-12.04.2-server-amd64.iso",
-		"AWS AKIAIOSFODNN7EXAMPLE:eLAv1CJmnBwV4DXj2z508eunQQs=",
-	},
-	{
-		StorageIOService,
-		"GET",
-		"http://storage.io/bucket/ubuntu-12.04.2-server-amd64.iso",
-		http.Header{
-			"Date": {"Tue, 27 Mar 2007 19:36:42 +0000"},
-		},
-		"GET\n\n\nTue, 27 Mar 2007 19:36:42 +0000\n/bucket/ubuntu-12.04.2-server-amd64.iso",
-		"AWS AKIAIOSFODNN7EXAMPLE:eLAv1CJmnBwV4DXj2z508eunQQs=",
-	},
-	{
-		DefaultService,
-		"PUT",
-		"http://static.johnsmith.net:8080/db-backup.dat.gz",
-		http.Header{
-			"Date":                    {"Tue, 27 Mar 2007 21:06:08 +0000"},
-			"X-Amz-Copy-Source":       {"other_object"},
-			"X-Amz-Copy-Source-Range": {"bytes=0-960463"},
-		},
-		"PUT\n\n\nTue, 27 Mar 2007 21:06:08 +0000\nx-amz-copy-source:other_object\nx-amz-copy-source-range:bytes=0-960463\n/static.johnsmith.net/db-backup.dat.gz",
-		"AWS AKIAIOSFODNN7EXAMPLE:rH0p5yotiFsFs8BnYl9cS/MBXvk=",
-	},
-}
-
-func TestSign(t *testing.T) {
-	for _, ts := range signTest {
-		r, err := http.NewRequest(ts.method, ts.url, nil)
-		if err != nil {
-			panic(err)
-		}
-
-		for k, vs := range ts.more {
-			for _, v := range vs {
-				r.Header.Add(k, v)
-			}
-		}
-		var buf bytes.Buffer
-		ts.service.writeSigData(&buf, r)
-		if buf.String() != ts.expBuf {
-			t.Errorf("in %s:", r.Method)
-			t.Logf("url %s", r.URL.String())
-			t.Logf("exp %q", ts.expBuf)
-			t.Logf("got %q", buf.String())
-		}
-
-		ts.service.Sign(r, exKeys)
-		if got := r.Header.Get("Authorization"); got != ts.expSig {
-			t.Errorf("in %s:", r.Method)
-			t.Logf("url %s", r.URL.String())
-			t.Logf("exp %q", ts.expSig)
-			t.Logf("got %q", got)
-		}
-
-		// Reset Auth header and test signing with temporary credentials
-		r.Header.Del("Authorization")
-		ts.service.Sign(r, tokenExKeys)
-		if got := r.Header.Get("X-Amz-Security-Token"); got != tokenExKeys.SecurityToken {
-			t.Errorf("in %s:", r.Method)
-			t.Logf("url %s", r.URL.String())
-			t.Logf("exp %q", tokenExKeys.SecurityToken)
-			t.Logf("got %q", got)
-		}
-	}
-}
-
-var bucketTest = []struct {
-	url string
-	svc *Service
-	w   string
-}{
-	{
-		"http://johnsmith.s3.amazonaws.com/photos/puppy.jpg",
-		&Service{Domain: "amazonaws.com"},
-		"/johnsmith",
-	},
-	{
-		"http://johnsmith.s3-ap-northeast-1.amazonaws.com/photos/puppy.jpg",
-		&Service{Domain: "amazonaws.com"},
-		"/johnsmith",
-	},
-	{
-		"http://johnsmith.s3.amazonaws.com/?prefix=photos&max-keys=50&marker=puppy",
-		&Service{Domain: "amazonaws.com"},
-		"/johnsmith",
-	},
-	{
-		"http://johnsmith.s3.amazonaws.com/?acl",
-		&Service{Domain: "amazonaws.com"},
-		"/johnsmith",
-	},
-	{
-		"http://s3.amazonaws.com/johnsmith/photos/puppy.jpg",
-		&Service{Domain: "amazonaws.com"},
-		"",
-	},
-	{
-		"http://static.johnsmith.net:8080/db-backup.dat.gz",
-		&Service{Domain: "amazonaws.com"},
-		"/static.johnsmith.net",
-	},
-	{
-		"http://s3.amazonaws.com/",
-		&Service{Domain: "amazonaws.com"},
-		"",
-	},
-	{
-		"http://s3.amazonaws.com/dictionary/fran%C3%A7ais/pr%C3%A9f%C3%A8re",
-		&Service{Domain: "amazonaws.com"},
-		"",
-	},
-	{
-		"http://bucketname.s3.amazonaws.com/?delete",
-		&Service{Domain: "amazonaws.com"},
-		"/bucketname",
-	},
-	{
-		"http://johnsmith.storage.io/photos/puppy.jpg",
-		&Service{Domain: "storage.io", Bucket: IdentityBucket},
-		"/johnsmith",
-	},
-	{
-		"http://static.johnsmith.net:8080/db-backup.dat.gz",
-		&Service{Domain: "storage.io", Bucket: IdentityBucket},
-		"/static.johnsmith.net",
-	},
-}
-
-func TestVhostBucket(t *testing.T) {
-	for i, ts := range bucketTest {
-		r, err := http.NewRequest("GET", ts.url, nil)
-		if err != nil {
-			panic(err)
-		}
-		var g bytes.Buffer
-		ts.svc.writeVhostBucket(&g, r.Host)
-		if g.String() != ts.w {
-			t.Errorf("test %d: want %q, got %q", i, ts.w, g.String())
-		}
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/.gitignore b/vendor/github.com/robertkrimen/otto/.gitignore
deleted file mode 100644
index dd700200a..000000000
--- a/vendor/github.com/robertkrimen/otto/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/.test
-/otto/otto
-/otto/otto-*
diff --git a/vendor/github.com/robertkrimen/otto/DESIGN.markdown b/vendor/github.com/robertkrimen/otto/DESIGN.markdown
deleted file mode 100644
index 288752987..000000000
--- a/vendor/github.com/robertkrimen/otto/DESIGN.markdown
+++ /dev/null
@@ -1 +0,0 @@
-* Designate the filename of "anonymous" source code by the hash (md5/sha1, etc.)
diff --git a/vendor/github.com/robertkrimen/otto/LICENSE b/vendor/github.com/robertkrimen/otto/LICENSE
deleted file mode 100644
index b6179fe38..000000000
--- a/vendor/github.com/robertkrimen/otto/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2012 Robert Krimen
-
-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/vendor/github.com/robertkrimen/otto/Makefile b/vendor/github.com/robertkrimen/otto/Makefile
deleted file mode 100644
index fe64ea57f..000000000
--- a/vendor/github.com/robertkrimen/otto/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-.PHONY: assets todo fixme otto run test-all release test-synopsis test262
-.PHONY: test test-race test-check test-all
-.PHONY: underscore
-
-TEST := -v --run
-TEST := .
-
-CHECK_GO := GOROOT= GOPATH=$(PWD)/.test/check/:$(GOPATH) $(HOME)/go/release/bin/go
-CHECK_OTTO := $(PWD)/.test/check/src/github.com/robertkrimen/otto
-
-test: inline.go
-	go test -i
-	go test $(TEST)
-
-assets:
-	mkdir -p .assets
-	for file in underscore/test/*.js; do tr "\`" "_" < $$file > .assets/`basename $$file`; done
-
-todo:
-	ack -l TODO *.go
-
-fixme:
-	ack -l FIXME *.go
-
-otto:
-	$(MAKE) -C otto
-
-run:
-	go run -a ./otto/main.go ./otto.js
-
-test-all: inline.go
-	go test -i
-	go test
-
-release: test-check test-race test-all test-synopsis
-	for package in . underscore registry; do (cd $$package && godocdown --signature > README.markdown); done
-
-test-race:
-	go test -race -i
-	go test -race
-
-test-check:
-	@mkdir -p $(CHECK_OTTO)
-	@find . -name \*.go ! -path ./.\* -maxdepth 2 | rsync -a --files-from -  ./ $(CHECK_OTTO)/
-	$(CHECK_GO) version
-	$(CHECK_GO) test -i
-	$(CHECK_GO) test
-
-test-synopsis: .test otto
-	$(MAKE) -C .test/synopsis 1>/dev/null
-
-test262: .test
-	$(MAKE) -C .test/test262 test
-
-underscore:
-	$(MAKE) -C $@
-
-inline.go: inline
-	./$< > $@
-
diff --git a/vendor/github.com/robertkrimen/otto/README.markdown b/vendor/github.com/robertkrimen/otto/README.markdown
deleted file mode 100644
index 064ec232b..000000000
--- a/vendor/github.com/robertkrimen/otto/README.markdown
+++ /dev/null
@@ -1,616 +0,0 @@
-# otto
---
-    import "github.com/robertkrimen/otto"
-
-Package otto is a JavaScript parser and interpreter written natively in Go.
-
-    // Create a new runtime
-    Otto := otto.New()
-
-    Otto.Run(`
-    	abc = 2 + 2
-    	console.log("The value of abc is " + abc)
-    	// The value of abc is 4
-    `)
-
-    value, err := Otto.Get("abc")
-    {
-    	// value is an int64 with a value of 4
-    	value, _ := value.ToInteger()
-    }
-
-    Otto.Set("def", 11)
-    Otto.Run(`
-    	console.log("The value of def is " + def)
-    	// The value of def is 11
-    `)
-
-    Otto.Set("xyzzy", "Nothing happens.")
-    Otto.Run(`
-    	console.log(xyzzy.length) // 16
-    `)
-
-    value, _ = Otto.Run("xyzzy.length")
-    {
-    	// value is an int64 with a value of 16
-    	value, _ := value.ToInteger()
-    }
-
-    value, err = Otto.Run("abcdefghijlmnopqrstuvwxyz.length")
-    if err != nil {
-    	// err = ReferenceError: abcdefghijlmnopqrstuvwxyz is not defined
-    	// If there is an error, then value.IsUndefined() is true
-    	...
-    }
-
-Embedding a Go function in JavaScript:
-
-    Otto.Set("sayHello", func(call otto.FunctionCall) otto.Value {
-    	fmt.Printf("Hello, %s.\n", call.Argument(0).String())
-    	return otto.UndefinedValue()
-    })
-
-    Otto.Set("twoPlus", func(call otto.FunctionCall) otto.Value {
-    	right, _ := call.Argument(0).ToInteger()
-    	result, _ := Otto.ToValue(2 + right)
-    	return result
-    })
-
-    result, _ = Otto.Run(`
-    	// First, say a greeting
-    	sayHello("Xyzzy") // Hello, Xyzzy.
-    	sayHello() // Hello, undefined
-
-    	result = twoPlus(2.0) // 4
-    `)
-
-You can run (Go) JavaScript from the commandline with:
-http://github.com/robertkrimen/otto/tree/master/otto
-
-    $ go get -v github.com/robertkrimen/otto/otto
-
-Run JavaScript by entering some source on stdin or by giving otto a filename:
-
-    $ otto example.js
-
-Optionally include the JavaScript utility-belt library, underscore, with this
-import:
-
-    import (
-    	"github.com/robertkrimen/otto"
-    	_ "github.com/robertkrimen/otto/underscore"
-    )
-
-    // Now every otto runtime will come loaded with underscore
-
-For more information: http://github.com/robertkrimen/otto/tree/master/underscore
-
-### Caveat Emptor
-
-    * For now, otto is a hybrid ECMA3/ECMA5 interpreter. Parts of the specification are still works in progress.
-    * For example, "use strict" will parse, but does nothing.
-    * Error reporting needs to be improved.
-    * Does not support the (?!) or (?=) regular expression syntax (because Go does not)
-    * JavaScript considers a vertical tab (\000B <VT>) to be part of the whitespace class (\s), while RE2 does not.
-    * Really, error reporting could use some improvement.
-
-
-### Regular Expression Syntax
-
-Go translates JavaScript-style regular expressions into something that is
-"regexp" package compatible.
-
-Unfortunately, JavaScript has positive lookahead, negative lookahead, and
-backreferencing, all of which are not supported by Go's RE2-like engine:
-https://code.google.com/p/re2/wiki/Syntax
-
-A brief discussion of these limitations: "Regexp (?!re)"
-https://groups.google.com/forum/?fromgroups=#!topic/golang-nuts/7qgSDWPIh_E
-
-More information about RE2: https://code.google.com/p/re2/
-
-JavaScript considers a vertical tab (\000B <VT>) to be part of the whitespace
-class (\s), while RE2 does not.
-
-## Usage
-
-#### type FunctionCall
-
-```go
-type FunctionCall struct {
-	This         Value
-	ArgumentList []Value
-	Otto         *Otto
-}
-```
-
-FunctionCall is an enscapulation of a JavaScript function call.
-
-#### func (FunctionCall) Argument
-
-```go
-func (self FunctionCall) Argument(index int) Value
-```
-Argument will return the value of the argument at the given index.
-
-If no such argument exists, undefined is returned.
-
-#### type Object
-
-```go
-type Object struct {
-}
-```
-
-Object is the representation of a JavaScript object.
-
-#### func (Object) Call
-
-```go
-func (self Object) Call(name string, argumentList ...interface{}) (Value, error)
-```
-Call the method specified by the given name, using self as the this value. It is
-essentially equivalent to:
-
-    var method, _ := self.Get(name)
-    method.Call(self, argumentList...)
-
-An undefined value and an error will result if:
-
-    1. There is an error during conversion of the argument list
-    2. The property is not actually a function
-    3. An (uncaught) exception is thrown
-
-#### func (Object) Class
-
-```go
-func (self Object) Class() string
-```
-Class will return the class string of the object.
-
-The return value will (generally) be one of:
-
-    Object
-    Function
-    Array
-    String
-    Number
-    Boolean
-    Date
-    RegExp
-
-#### func (Object) Get
-
-```go
-func (self Object) Get(name string) (Value, error)
-```
-Get the value of the property with the given name.
-
-#### func (Object) Set
-
-```go
-func (self Object) Set(name string, value interface{}) error
-```
-Set the property of the given name to the given value.
-
-An error will result if the setting the property triggers an exception (i.e.
-read-only), or there is an error during conversion of the given value.
-
-#### func (Object) Value
-
-```go
-func (self Object) Value() Value
-```
-Value will return self as a value.
-
-#### type Otto
-
-```go
-type Otto struct {
-}
-```
-
-Otto is the representation of the JavaScript runtime. Each instance of Otto has
-a self-contained namespace.
-
-#### func  New
-
-```go
-func New() *Otto
-```
-New will allocate a new JavaScript runtime
-
-#### func  Run
-
-```go
-func Run(source string) (*Otto, Value, error)
-```
-Run will allocate a new JavaScript runtime, run the given source on the
-allocated runtime, and return the runtime, resulting value, and error (if any).
-
-#### func (Otto) Call
-
-```go
-func (self Otto) Call(source string, this interface{}, argumentList ...interface{}) (Value, error)
-```
-Call the given JavaScript with a given this and arguments.
-
-WARNING: 2013-05-19: This function is rough, and is in beta.
-
-If this is nil, then some special handling takes place to determine the proper
-this value, falling back to a "standard" invocation if necessary (where this is
-undefined).
-
-If source begins with "new " (A lowercase new followed by a space), then Call
-will invoke the function constructor rather than performing a function call. In
-this case, the this argument has no effect.
-
-    // value is a String object
-    value, _ := Otto.Call("Object", nil, "Hello, World.")
-
-    // Likewise...
-    value, _ := Otto.Call("new Object", nil, "Hello, World.")
-
-    // This will perform a concat on the given array and return the result
-    // value is [ 1, 2, 3, undefined, 4, 5, 6, 7, "abc" ]
-    value, _ := Otto.Call(`[ 1, 2, 3, undefined, 4 ].concat`, nil, 5, 6, 7, "abc")
-
-#### func (*Otto) Copy
-
-```go
-func (self *Otto) Copy() *Otto
-```
-Copy will create a copy/clone of the runtime.
-
-Copy is useful for saving some processing time when creating many similar
-runtimes.
-
-This implementation is alpha-ish, and works by introspecting every part of the
-runtime and reallocating and then relinking everything back together. Please
-report if you notice any inadvertent sharing of data between copies.
-
-#### func (Otto) Get
-
-```go
-func (self Otto) Get(name string) (Value, error)
-```
-Get the value of the top-level binding of the given name.
-
-If there is an error (like the binding does not exist), then the value will be
-undefined.
-
-#### func (Otto) Object
-
-```go
-func (self Otto) Object(source string) (*Object, error)
-```
-Object will run the given source and return the result as an object.
-
-For example, accessing an existing object:
-
-    object, _ := Otto.Object(`Number`)
-
-Or, creating a new object:
-
-    object, _ := Otto.Object(`({ xyzzy: "Nothing happens." })`)
-
-Or, creating and assigning an object:
-
-    object, _ := Otto.Object(`xyzzy = {}`)
-    object.Set("volume", 11)
-
-If there is an error (like the source does not result in an object), then nil
-and an error is returned.
-
-#### func (Otto) Run
-
-```go
-func (self Otto) Run(source string) (Value, error)
-```
-Run will run the given source (parsing it first), returning the resulting value
-and error (if any)
-
-If the runtime is unable to parse source, then this function will return
-undefined and the parse error (nothing will be evaluated in this case).
-
-#### func (Otto) Set
-
-```go
-func (self Otto) Set(name string, value interface{}) error
-```
-Set the top-level binding of the given name to the given value.
-
-Set will automatically apply ToValue to the given value in order to convert it
-to a JavaScript value (type Value).
-
-If there is an error (like the binding is read-only, or the ToValue conversion
-fails), then an error is returned.
-
-If the top-level binding does not exist, it will be created.
-
-#### func (Otto) ToValue
-
-```go
-func (self Otto) ToValue(value interface{}) (Value, error)
-```
-ToValue will convert an interface{} value to a value digestible by
-otto/JavaScript.
-
-#### type Value
-
-```go
-type Value struct {
-}
-```
-
-Value is the representation of a JavaScript value.
-
-#### func  FalseValue
-
-```go
-func FalseValue() Value
-```
-FalseValue will return a value represting false.
-
-It is equivalent to:
-
-    ToValue(false)
-
-#### func  NaNValue
-
-```go
-func NaNValue() Value
-```
-NaNValue will return a value representing NaN.
-
-It is equivalent to:
-
-    ToValue(math.NaN())
-
-#### func  NullValue
-
-```go
-func NullValue() Value
-```
-NullValue will return a Value representing null.
-
-#### func  ToValue
-
-```go
-func ToValue(value interface{}) (Value, error)
-```
-ToValue will convert an interface{} value to a value digestible by
-otto/JavaScript This function will not work for advanced types (struct, map,
-slice/array, etc.) and you probably should not use it.
-
-ToValue may be deprecated and removed in the near future.
-
-Try Otto.ToValue for a reaplcement.
-
-#### func  TrueValue
-
-```go
-func TrueValue() Value
-```
-TrueValue will return a value represting true.
-
-It is equivalent to:
-
-    ToValue(true)
-
-#### func  UndefinedValue
-
-```go
-func UndefinedValue() Value
-```
-UndefinedValue will return a Value representing undefined.
-
-#### func (Value) Call
-
-```go
-func (value Value) Call(this Value, argumentList ...interface{}) (Value, error)
-```
-Call the value as a function with the given this value and argument list and
-return the result of invocation. It is essentially equivalent to:
-
-    value.apply(thisValue, argumentList)
-
-An undefined value and an error will result if:
-
-    1. There is an error during conversion of the argument list
-    2. The value is not actually a function
-    3. An (uncaught) exception is thrown
-
-#### func (Value) Class
-
-```go
-func (value Value) Class() string
-```
-Class will return the class string of the value or the empty string if value is
-not an object.
-
-The return value will (generally) be one of:
-
-    Object
-    Function
-    Array
-    String
-    Number
-    Boolean
-    Date
-    RegExp
-
-#### func (Value) Export
-
-```go
-func (self Value) Export() (interface{}, error)
-```
-Export will attempt to convert the value to a Go representation and return it
-via an interface{} kind.
-
-WARNING: The interface function will be changing soon to:
-
-    Export() interface{}
-
-If a reasonable conversion is not possible, then the original result is
-returned.
-
-    undefined   -> otto.Value (UndefinedValue())
-    null        -> interface{}(nil)
-    boolean     -> bool
-    number      -> A number type (int, float32, uint64, ...)
-    string      -> string
-    Array       -> []interface{}
-    Object      -> map[string]interface{}
-
-#### func (Value) IsBoolean
-
-```go
-func (value Value) IsBoolean() bool
-```
-IsBoolean will return true if value is a boolean (primitive).
-
-#### func (Value) IsDefined
-
-```go
-func (value Value) IsDefined() bool
-```
-IsDefined will return false if the value is undefined, and true otherwise.
-
-#### func (Value) IsFunction
-
-```go
-func (value Value) IsFunction() bool
-```
-IsFunction will return true if value is a function.
-
-#### func (Value) IsNaN
-
-```go
-func (value Value) IsNaN() bool
-```
-IsNaN will return true if value is NaN (or would convert to NaN).
-
-#### func (Value) IsNull
-
-```go
-func (value Value) IsNull() bool
-```
-IsNull will return true if the value is null, and false otherwise.
-
-#### func (Value) IsNumber
-
-```go
-func (value Value) IsNumber() bool
-```
-IsNumber will return true if value is a number (primitive).
-
-#### func (Value) IsObject
-
-```go
-func (value Value) IsObject() bool
-```
-IsObject will return true if value is an object.
-
-#### func (Value) IsPrimitive
-
-```go
-func (value Value) IsPrimitive() bool
-```
-IsPrimitive will return true if value is a primitive (any kind of primitive).
-
-#### func (Value) IsString
-
-```go
-func (value Value) IsString() bool
-```
-IsString will return true if value is a string (primitive).
-
-#### func (Value) IsUndefined
-
-```go
-func (value Value) IsUndefined() bool
-```
-IsUndefined will return true if the value is undefined, and false otherwise.
-
-#### func (Value) Object
-
-```go
-func (value Value) Object() *Object
-```
-Object will return the object of the value, or nil if value is not an object.
-
-This method will not do any implicit conversion. For example, calling this
-method on a string primitive value will not return a String object.
-
-#### func (Value) String
-
-```go
-func (value Value) String() string
-```
-String will return the value as a string.
-
-This method will make return the empty string if there is an error.
-
-#### func (Value) ToBoolean
-
-```go
-func (value Value) ToBoolean() (bool, error)
-```
-ToBoolean will convert the value to a boolean (bool).
-
-    ToValue(0).ToBoolean() => false
-    ToValue("").ToBoolean() => false
-    ToValue(true).ToBoolean() => true
-    ToValue(1).ToBoolean() => true
-    ToValue("Nothing happens").ToBoolean() => true
-
-If there is an error during the conversion process (like an uncaught exception),
-then the result will be false and an error.
-
-#### func (Value) ToFloat
-
-```go
-func (value Value) ToFloat() (float64, error)
-```
-ToFloat will convert the value to a number (float64).
-
-    ToValue(0).ToFloat() => 0.
-    ToValue(1.1).ToFloat() => 1.1
-    ToValue("11").ToFloat() => 11.
-
-If there is an error during the conversion process (like an uncaught exception),
-then the result will be 0 and an error.
-
-#### func (Value) ToInteger
-
-```go
-func (value Value) ToInteger() (int64, error)
-```
-ToInteger will convert the value to a number (int64).
-
-    ToValue(0).ToInteger() => 0
-    ToValue(1.1).ToInteger() => 1
-    ToValue("11").ToInteger() => 11
-
-If there is an error during the conversion process (like an uncaught exception),
-then the result will be 0 and an error.
-
-#### func (Value) ToString
-
-```go
-func (value Value) ToString() (string, error)
-```
-ToString will convert the value to a string (string).
-
-    ToValue(0).ToString() => "0"
-    ToValue(false).ToString() => "false"
-    ToValue(1.1).ToString() => "1.1"
-    ToValue("11").ToString() => "11"
-    ToValue('Nothing happens.').ToString() => "Nothing happens."
-
-If there is an error during the conversion process (like an uncaught exception),
-then the result will be the empty string ("") and an error.
-
---
-**godocdown** http://github.com/robertkrimen/godocdown
diff --git a/vendor/github.com/robertkrimen/otto/array_test.go b/vendor/github.com/robertkrimen/otto/array_test.go
deleted file mode 100644
index d2f9dd22e..000000000
--- a/vendor/github.com/robertkrimen/otto/array_test.go
+++ /dev/null
@@ -1,495 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-	Time "time"
-)
-
-func TestArray(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        var abc = [ undefined, "Nothing happens." ];
-        abc.length;
-    `, "2")
-
-	test(`
-		abc = ""+[0, 1, 2, 3];
-		def = [].toString();
-		ghi = [null, 4, "null"].toString();
-	`)
-	test("abc", "0,1,2,3")
-	test("def", "")
-	test("ghi", ",4,null")
-	test(`new Array(0).length`, "0")
-	test(`new Array(11).length`, "11")
-	test(`new Array(11, 1).length`, "2")
-
-	test(`
-        abc = [0, 1, 2, 3];
-        abc.xyzzy = "Nothing happens.";
-        delete abc[1];
-        var xyzzy = delete abc.xyzzy;
-        [ abc, xyzzy, abc.xyzzy ];
-    `, "0,,2,3,true,")
-
-	test(`
-        var abc = [0, 1, 2, 3, 4];
-        abc.length = 2;
-        abc;
-    `, "0,1")
-
-	test(`
-        Object.defineProperty(Array.prototype, "0", {
-            value: 100,
-            writable: false,
-            configurable: true
-        });
-        abc = [101];
-        abc.hasOwnProperty("0") && abc[0] === 101;
-    `, "true")
-
-	test(`
-        abc = [,,undefined];
-        [ abc.hasOwnProperty(0), abc.hasOwnProperty(1), abc.hasOwnProperty(2) ];
-    `, "false,false,true")
-
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(Array, "prototype");
-        [   [ typeof Array.prototype ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "object,false,false,false")
-}
-
-func TestArray_toString(t *testing.T) {
-	Terst(t)
-
-	{
-		test := runTest()
-
-		test(`
-			Array.prototype.toString = function() {
-				return "Nothing happens."
-			}
-			abc = Array.prototype.toString()
-			def = [].toString()
-			ghi = [null, 4, "null"].toString()
-		`)
-		test("abc", "Nothing happens.")
-		test("def", "Nothing happens.")
-		test("ghi", "Nothing happens.")
-
-	}
-
-	{
-		test := runTest()
-
-		test(`
-			Array.prototype.join = undefined
-			abc = Array.prototype.toString()
-			def = [].toString()
-			ghi = [null, 4, "null"].toString()
-		`)
-		test("abc", "[object Array]")
-		test("def", "[object Array]")
-		test("ghi", "[object Array]")
-	}
-}
-
-func TestArray_toLocaleString(t *testing.T) {
-	Terst(t)
-
-	defer mockTimeLocal(Time.UTC)()
-
-	test := runTest()
-
-	test(`
-        [ 3.14159, "abc", undefined, new Date(0) ].toLocaleString();
-    `, "3.14159,abc,,1970-01-01 00:00:00")
-
-	test(`raise:
-        [ { toLocaleString: undefined } ].toLocaleString();
-    `, "TypeError")
-}
-
-func TestArray_concat(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0, 1, 2]
-		def = [-1, -2, -3]
-		ghi = abc.concat(def)
-		jkl = abc.concat(def, 3, 4, 5)
-		mno = def.concat(-4, -5, abc)
-	`)
-	test("ghi", "0,1,2,-1,-2,-3")
-	test("jkl", "0,1,2,-1,-2,-3,3,4,5")
-	test("mno", "-1,-2,-3,-4,-5,0,1,2")
-}
-
-func TestArray_splice(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0, 1, 2]
-		def = abc.splice(1, 2, 3, 4, 5)
-        ghi = [].concat(abc)
-        jkl = ghi.splice(17, 21, 7, 8, 9)
-	`)
-	test("abc", "0,3,4,5")
-	test("def", "1,2")
-	test("ghi", "0,3,4,5,7,8,9")
-	test("jkl", "")
-}
-
-func TestArray_shift(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0, 1, 2]
-		def = abc.shift()
-		ghi = [].concat(abc)
-		jkl = abc.shift()
-		mno = [].concat(abc)
-		pqr = abc.shift()
-		stu = [].concat(abc)
-		vwx = abc.shift()
-	`)
-	test("abc", "")
-	test("def", "0")
-	test("ghi", "1,2")
-	test("jkl", "1")
-	test("mno", "2")
-	test("pqr", "2")
-	test("stu", "")
-	test("vwx", "undefined")
-}
-
-func TestArray_push(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0]
-		def = abc.push(1)
-		ghi = [].concat(abc)
-		jkl = abc.push(2,3,4)
-	`)
-	test("abc", "0,1,2,3,4")
-	test("def", "2")
-	test("ghi", "0,1")
-	test("jkl", "5")
-}
-
-func TestArray_pop(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0,1]
-		def = abc.pop()
-		ghi = [].concat(abc)
-		jkl = abc.pop()
-		mno = [].concat(abc)
-		pqr = abc.pop()
-	`)
-	test("abc", "")
-	test("def", "1")
-	test("ghi", "0")
-	test("jkl", "0")
-	test("mno", "")
-	test("pqr", "undefined")
-}
-
-func TestArray_slice(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0,1,2,3]
-		def = abc.slice()
-		ghi = abc.slice(1)
-		jkl = abc.slice(3,-1)
-		mno = abc.slice(2,-1)
-		pqr = abc.slice(-1, -10)
-	`)
-	test("def", "0,1,2,3")
-	test("ghi", "1,2,3")
-	test("jkl", "")
-	test("mno", "2")
-	test("pqr", "")
-	test(`abc.slice(2, 2)`, "")
-	test(`abc.slice(2, 3)`, "2")
-
-	test(`
-		abc = { 0: 0, 1: 1, 2: 2, 3: 3 }
-		abc.length = 4
-		def = Array.prototype.slice.call(abc)
-		ghi = Array.prototype.slice.call(abc,1)
-		jkl = Array.prototype.slice.call(abc,3,-1)
-		mno = Array.prototype.slice.call(abc,2,-1)
-		pqr = Array.prototype.slice.call(abc,-1,-10)
-	`)
-	// Array.protoype.slice is generic
-	test("def", "0,1,2,3")
-	test("ghi", "1,2,3")
-	test("jkl", "")
-	test("mno", "2")
-	test("pqr", "")
-}
-
-func TestArray_sliceArguments(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		(function(){
-			return Array.prototype.slice.call(arguments, 1)
-		})({}, 1, 2, 3)
-	`, "1,2,3")
-}
-
-func TestArray_unshift(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = []
-		def = abc.unshift(0)
-		ghi = [].concat(abc)
-		jkl = abc.unshift(1,2,3,4)
-	`)
-	test("abc", "1,2,3,4,0")
-	test("def", "1")
-	test("ghi", "0")
-	test("jkl", "5")
-}
-
-func TestArray_reverse(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0,1,2,3].reverse()
-		def = [0,1,2].reverse()
-	`)
-	test("abc", "3,2,1,0")
-	test("def", "2,1,0")
-}
-
-func TestArray_sort(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = [0,1,2,3].sort()
-		def = [3,2,1,0].sort()
-		ghi = [].sort()
-		jkl = [0].sort()
-		mno = [1,0].sort()
-		pqr = [1,5,-10, 100, 8, 72, 401, 0.05].sort()
-		stu = [1,5,-10, 100, 8, 72, 401, 0.05].sort(function(x, y){
-			return x == y ? 0 : x < y ? -1 : 1
-		})
-	`)
-	test("abc", "0,1,2,3")
-	test("def", "0,1,2,3")
-	test("ghi", "")
-	test("jkl", "0")
-	test("mno", "0,1")
-	test("pqr", "-10,0.05,1,100,401,5,72,8")
-	test("stu", "-10,0.05,1,5,8,72,100,401")
-}
-
-func TestArray_isArray(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        [ Array.isArray(), Array.isArray([]), Array.isArray({}) ];
-    `, "false,true,false")
-}
-
-func TestArray_indexOf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`['a', 'b', 'c', 'b'].indexOf('b')`, "1")
-	test(`['a', 'b', 'c', 'b'].indexOf('b', 2)`, "3")
-	test(`['a', 'b', 'c', 'b'].indexOf('b', -2)`, "3")
-	test(`
-		Object.prototype.indexOf = Array.prototype.indexOf;
-		var abc = {0: 'a', 1: 'b', 2: 'c', length: 3};
-		abc.indexOf('c');
-	`, "2")
-	test(`[true].indexOf(true, "-Infinity")`, "0")
-}
-
-func TestArray_lastIndexOf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`['a', 'b', 'c', 'b'].lastIndexOf('b')`, "3")
-	test(`['a', 'b', 'c', 'b'].lastIndexOf('b', 2)`, "1")
-	test(`['a', 'b', 'c', 'b'].lastIndexOf('b', -2)`, "1")
-	test(`
-		Object.prototype.lastIndexOf = Array.prototype.lastIndexOf;
-        var abc = {0: 'a', 1: 'b', 2: 'c', 3: 'b', length: 4};
-		abc.lastIndexOf('b');
-	`, "3")
-}
-
-func TestArray_every(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].every()`, "TypeError")
-	test(`raise: [].every("abc")`, "TypeError")
-	test(`[].every(function() { return false })`, "true")
-	test(`[1,2,3].every(function() { return false })`, "false")
-	test(`[1,2,3].every(function() { return true })`, "true")
-	test(`[1,2,3].every(function(_, index) { if (index === 1) return true })`, "false")
-}
-
-func TestArray_some(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].some("abc")`, "TypeError")
-	test(`[].some(function() { return true })`, "false")
-	test(`[1,2,3].some(function() { return false })`, "false")
-	test(`[1,2,3].some(function() { return true })`, "true")
-	test(`[1,2,3].some(function(_, index) { if (index === 1) return true })`, "true")
-}
-
-func TestArray_forEach(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].forEach("abc")`, "TypeError")
-	test(`
-        var abc = 0;
-        [].forEach(function(value) {
-            abc += value;
-        });
-        abc;
-    `, "0")
-	test(`
-        abc = 0;
-        var def = [];
-        [1,2,3].forEach(function(value, index) {
-            abc += value;
-            def.push(index);
-        });
-        [ abc, def ];
-    `, "6,0,1,2")
-}
-
-func TestArray_indexing(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        var abc = new Array(0, 1);
-        var def = abc.length;
-        abc[4294967296] = 10; // 2^32 => 0
-        abc[4294967297] = 11; // 2^32+1 => 1
-        [ def, abc.length, abc[0], abc[1], abc[4294967296] ];
-    `, "2,2,0,1,10")
-
-	test(`
-        abc = new Array(0, 1);
-        def = abc.length;
-        abc[4294967295] = 10;
-        var ghi = abc.length;
-        abc[4294967299] = 12;
-        var jkl = abc.length;
-        abc[4294967294] = 11;
-        [ def, ghi, jkl, abc.length, abc[4294967295], abc[4294967299] ];
-    `, "2,2,2,4294967295,10,12")
-}
-
-func TestArray_map(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].map("abc")`, "TypeError")
-	test(`[].map(function() { return 1 }).length`, "0")
-	test(`[1,2,3].map(function(value) { return value * value })`, "1,4,9")
-	test(`[1,2,3].map(function(value) { return 1 })`, "1,1,1")
-}
-
-func TestArray_filter(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].filter("abc")`, "TypeError")
-	test(`[].filter(function() { return 1 }).length`, "0")
-	test(`[1,2,3].filter(function() { return false }).length`, "0")
-	test(`[1,2,3].filter(function() { return true })`, "1,2,3")
-}
-
-func TestArray_reduce(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].reduce("abc")`, "TypeError")
-	test(`raise: [].reduce(function() {})`, "TypeError")
-	test(`[].reduce(function() {}, 0)`, "0")
-	test(`['a','b','c'].reduce(function(result, value) { return result+', '+value })`, "a, b, c")
-	test(`[1,2,3].reduce(function(result, value) { return result + value }, 4)`, "10")
-	test(`[1,2,3].reduce(function(result, value) { return result + value })`, "6")
-}
-
-func TestArray_reduceRight(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: [].reduceRight("abc")`, "TypeError")
-	test(`raise: [].reduceRight(function() {})`, "TypeError")
-	test(`[].reduceRight(function() {}, 0)`, "0")
-	test(`['a','b','c'].reduceRight(function(result, value) { return result+', '+value })`, "c, b, a")
-	test(`[1,2,3].reduceRight(function(result, value) { return result + value }, 4)`, "10")
-	test(`[1,2,3].reduceRight(function(result, value) { return result + value })`, "6")
-}
-
-func TestArray_defineOwnProperty(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = [];
-        Object.defineProperty(abc, "length", {
-            writable: false
-        });
-        abc.length;
-    `, "0")
-
-	test(`raise:
-        var abc = [];
-        var exception;
-        Object.defineProperty(abc, "length", {
-            writable: false
-        });
-        Object.defineProperty(abc, "length", {
-            writable: true
-        });
-    `, "TypeError")
-}
diff --git a/vendor/github.com/robertkrimen/otto/bug_test.go b/vendor/github.com/robertkrimen/otto/bug_test.go
deleted file mode 100644
index aa7fa3141..000000000
--- a/vendor/github.com/robertkrimen/otto/bug_test.go
+++ /dev/null
@@ -1,249 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func Test_262(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise:
-        eval("42 = 42;");
-    `, "ReferenceError: Invalid left-hand side in assignment")
-}
-
-func Test_issue5(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`'abc' === 'def'`, "false")
-	test(`'\t' === '\r'`, "false")
-}
-
-func Test_issue13(t *testing.T) {
-	Terst(t)
-
-	otto, test := runTestWithOtto()
-	value, err := otto.ToValue(map[string]interface{}{
-		"string": "Xyzzy",
-		"number": 42,
-		"array":  []string{"def", "ghi"},
-	})
-	if err != nil {
-		FailNow(err)
-	}
-	fn, err := otto.Object(`
-    (function(value){
-        return ""+[value.string, value.number, value.array]
-    })
-    `)
-	if err != nil {
-		FailNow(err)
-	}
-	result, err := fn.Value().Call(fn.Value(), value)
-	if err != nil {
-		FailNow(err)
-	}
-	Is(result.toString(), "Xyzzy,42,def,ghi")
-
-	anything := struct {
-		Abc interface{}
-	}{
-		Abc: map[string]interface{}{
-			"def": []interface{}{
-				[]interface{}{
-					"a", "b", "c", "", "d", "e",
-				},
-				map[string]interface{}{
-					"jkl": "Nothing happens.",
-				},
-			},
-			"ghi": -1,
-		},
-	}
-	otto.Set("anything", anything)
-	test(`
-        [
-            anything,
-            "~",
-            anything.Abc,
-            "~",
-            anything.Abc.def,
-            "~",
-            anything.Abc.def[1].jkl,
-            "~",
-            anything.Abc.ghi,
-        ];
-        `, "[object Object],~,[object Object],~,a,b,c,,d,e,[object Object],~,Nothing happens.,~,-1",
-	)
-
-}
-
-func Test_issue16(t *testing.T) {
-	Terst(t)
-
-	otto, test := runTestWithOtto()
-	test(`
-        var def = {
-            "abc": ["abc"],
-            "xyz": ["xyz"]
-        };
-        def.abc.concat(def.xyz);
-    `, "abc,xyz")
-
-	otto.Set("ghi", []string{"jkl", "mno"})
-	test(`
-        def.abc.concat(def.xyz).concat(ghi);
-    `, "abc,xyz,jkl,mno")
-
-	test(`
-        ghi.concat(def.abc.concat(def.xyz));
-    `, "jkl,mno,abc,xyz")
-
-	otto.Set("pqr", []interface{}{"jkl", 42, 3.14159, true})
-	test(`
-        pqr.concat(ghi, def.abc, def, def.xyz);
-    `, "jkl,42,3.14159,true,jkl,mno,abc,[object Object],xyz")
-
-	test(`
-        pqr.concat(ghi, def.abc, def, def.xyz).length;
-    `, "9")
-}
-
-func Test_issue21(t *testing.T) {
-	Terst(t)
-
-	otto1 := New()
-	otto1.Run(`
-        abc = {}
-        abc.ghi = "Nothing happens.";
-        var jkl = 0;
-        abc.def = function() {
-            jkl += 1;
-            return 1;
-        }
-    `)
-	abc, err := otto1.Get("abc")
-	Is(err, nil)
-
-	otto2 := New()
-	otto2.Set("cba", abc)
-	_, err = otto2.Run(`
-        var pqr = 0;
-        cba.mno = function() {
-            pqr -= 1;
-            return 1;
-        }
-        cba.def();
-        cba.def();
-        cba.def();
-    `)
-	Is(err, nil)
-
-	jkl, err := otto1.Get("jkl")
-	Is(err, nil)
-	Is(jkl, "3")
-
-	_, err = otto1.Run(`
-        abc.mno();
-        abc.mno();
-        abc.mno();
-    `)
-	Is(err, nil)
-
-	pqr, err := otto2.Get("pqr")
-	Is(err, nil)
-	Is(pqr, "-3")
-}
-
-func Test_issue24(t *testing.T) {
-	Terst(t)
-
-	otto, _ := runTestWithOtto()
-
-	{
-		otto.Set("abc", []string{"abc", "def", "ghi"})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.([]string)
-			Is(valid, true)
-
-			Is(value[0], "abc")
-			Is(value[2], "ghi")
-		}
-	}
-
-	{
-		otto.Set("abc", [...]string{"abc", "def", "ghi"})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.([3]string)
-			Is(valid, true)
-
-			Is(value[0], "abc")
-			Is(value[2], "ghi")
-		}
-	}
-
-	{
-		otto.Set("abc", &[...]string{"abc", "def", "ghi"})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.(*[3]string)
-			Is(valid, true)
-
-			Is(value[0], "abc")
-			Is(value[2], "ghi")
-		}
-	}
-
-	{
-		otto.Set("abc", map[int]string{0: "abc", 1: "def", 2: "ghi"})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.(map[int]string)
-			Is(valid, true)
-
-			Is(value[0], "abc")
-			Is(value[2], "ghi")
-		}
-	}
-
-	{
-		otto.Set("abc", testStruct{Abc: true, Ghi: "Nothing happens."})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.(testStruct)
-			Is(valid, true)
-
-			Is(value.Abc, true)
-			Is(value.Ghi, "Nothing happens.")
-		}
-	}
-
-	{
-		otto.Set("abc", &testStruct{Abc: true, Ghi: "Nothing happens."})
-		value, err := otto.Get("abc")
-		Is(err, nil)
-		export, _ := value.Export()
-		{
-			value, valid := export.(*testStruct)
-			Is(valid, true)
-
-			Is(value.Abc, true)
-			Is(value.Ghi, "Nothing happens.")
-		}
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin.go b/vendor/github.com/robertkrimen/otto/builtin.go
deleted file mode 100644
index ea560c7b5..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin.go
+++ /dev/null
@@ -1,368 +0,0 @@
-package otto
-
-import (
-	"encoding/hex"
-	"fmt"
-	"math"
-	"net/url"
-	"regexp"
-	"strconv"
-	"strings"
-	"unicode/utf16"
-	"unicode/utf8"
-)
-
-// Global
-func builtinGlobal_eval(call FunctionCall) Value {
-	source := call.Argument(0)
-	if !source.IsString() {
-		return source
-	}
-	program, err := parse(toString(source))
-	if err != nil {
-		switch err := err.(type) {
-		case *_syntaxError, *_error, _error:
-			panic(err)
-		default:
-			panic(&_syntaxError{Message: fmt.Sprintf("%v", err)})
-		}
-	}
-	runtime := call.runtime
-	if call.evalHint {
-		runtime.EnterEvalExecutionContext(call)
-		defer runtime.LeaveExecutionContext()
-	}
-	returnValue := runtime.evaluate(program)
-	if returnValue.isEmpty() {
-		return UndefinedValue()
-	}
-	return returnValue
-}
-
-func builtinGlobal_isNaN(call FunctionCall) Value {
-	value := toFloat(call.Argument(0))
-	return toValue_bool(math.IsNaN(value))
-}
-
-func builtinGlobal_isFinite(call FunctionCall) Value {
-	value := toFloat(call.Argument(0))
-	return toValue_bool(!math.IsNaN(value) && !math.IsInf(value, 0))
-}
-
-// radix 3 => 2 (ASCII 50) +47
-// radix 11 => A/a (ASCII 65/97) +54/+86
-var parseInt_alphabetTable = func() []string {
-	table := []string{"", "", "01"}
-	for radix := 3; radix <= 36; radix += 1 {
-		alphabet := table[radix-1]
-		if radix <= 10 {
-			alphabet += string(radix + 47)
-		} else {
-			alphabet += string(radix+54) + string(radix+86)
-		}
-		table = append(table, alphabet)
-	}
-	return table
-}()
-
-func builtinGlobal_parseInt(call FunctionCall) Value {
-	input := strings.TrimSpace(toString(call.Argument(0)))
-	if len(input) == 0 {
-		return NaNValue()
-	}
-
-	radix := int(toInt32(call.Argument(1)))
-
-	sign := int64(1)
-	switch input[0] {
-	case '+':
-		sign = 1
-		input = input[1:]
-	case '-':
-		sign = -1
-		input = input[1:]
-	}
-
-	strip := true
-	if radix == 0 {
-		radix = 10
-	} else {
-		if radix < 2 || radix > 36 {
-			return NaNValue()
-		} else if radix != 16 {
-			strip = false
-		}
-	}
-
-	switch len(input) {
-	case 0:
-		return NaNValue()
-	case 1:
-	default:
-		if strip {
-			if input[0] == '0' && (input[1] == 'x' || input[1] == 'X') {
-				input = input[2:]
-				radix = 16
-			}
-		}
-	}
-
-	alphabet := parseInt_alphabetTable[radix]
-	if index := strings.IndexFunc(input, func(chr rune) bool {
-		return !strings.ContainsRune(alphabet, chr)
-	}); index != -1 {
-		input = input[0:index]
-	}
-
-	value, err := strconv.ParseInt(input, radix, 64)
-	if err != nil {
-		return NaNValue()
-	}
-	value *= sign
-
-	return toValue_int64(value)
-}
-
-var parseFloat_matchBadSpecial = regexp.MustCompile(`[\+\-]?(?:[Ii]nf$|infinity)`)
-var parseFloat_matchValid = regexp.MustCompile(`[0-9eE\+\-\.]|Infinity`)
-
-func builtinGlobal_parseFloat(call FunctionCall) Value {
-	// Caveat emptor: This implementation does NOT match the specification
-	input := strings.TrimSpace(toString(call.Argument(0)))
-	if parseFloat_matchBadSpecial.MatchString(input) {
-		return NaNValue()
-	}
-	value, err := strconv.ParseFloat(input, 64)
-	if err != nil {
-		for end := len(input); end > 0; end -= 1 {
-			input := input[0:end]
-			if !parseFloat_matchValid.MatchString(input) {
-				return NaNValue()
-			}
-			value, err = strconv.ParseFloat(input, 64)
-			if err == nil {
-				break
-			}
-		}
-		if err != nil {
-			return NaNValue()
-		}
-	}
-	return toValue_float64(value)
-}
-
-// encodeURI/decodeURI
-
-func _builtinGlobal_encodeURI(call FunctionCall, escape *regexp.Regexp) Value {
-	value := call.Argument(0)
-	var input []uint16
-	switch vl := value.value.(type) {
-	case []uint16:
-		input = vl
-	default:
-		input = utf16.Encode([]rune(toString(value)))
-	}
-	if len(input) == 0 {
-		return toValue_string("")
-	}
-	output := []byte{}
-	length := len(input)
-	encode := make([]byte, 4)
-	for index := 0; index < length; {
-		value := input[index]
-		decode := utf16.Decode(input[index : index+1])
-		if value >= 0xDC00 && value <= 0xDFFF {
-			panic(newURIError("URI malformed"))
-		}
-		if value >= 0xD800 && value <= 0xDBFF {
-			index += 1
-			if index >= length {
-				panic(newURIError("URI malformed"))
-			}
-			// input = ..., value, value1, ...
-			value = value
-			value1 := input[index]
-			if value1 < 0xDC00 || value1 > 0xDFFF {
-				panic(newURIError("URI malformed"))
-			}
-			decode = []rune{((rune(value) - 0xD800) * 0x400) + (rune(value1) - 0xDC00) + 0x10000}
-		}
-		index += 1
-		size := utf8.EncodeRune(encode, decode[0])
-		encode := encode[0:size]
-		output = append(output, encode...)
-	}
-	{
-		value := escape.ReplaceAllFunc(output, func(target []byte) []byte {
-			// Probably a better way of doing this
-			if target[0] == ' ' {
-				return []byte("%20")
-			}
-			return []byte(url.QueryEscape(string(target)))
-		})
-		return toValue_string(string(value))
-	}
-}
-
-var encodeURI_Regexp = regexp.MustCompile(`([^~!@#$&*()=:/,;?+'])`)
-
-func builtinGlobal_encodeURI(call FunctionCall) Value {
-	return _builtinGlobal_encodeURI(call, encodeURI_Regexp)
-}
-
-var encodeURIComponent_Regexp = regexp.MustCompile(`([^~!*()'])`)
-
-func builtinGlobal_encodeURIComponent(call FunctionCall) Value {
-	return _builtinGlobal_encodeURI(call, encodeURIComponent_Regexp)
-}
-
-// 3B/2F/3F/3A/40/26/3D/2B/24/2C/23
-var decodeURI_guard = regexp.MustCompile(`(?i)(?:%)(3B|2F|3F|3A|40|26|3D|2B|24|2C|23)`)
-
-func _decodeURI(input string, reserve bool) (string, bool) {
-	if reserve {
-		input = decodeURI_guard.ReplaceAllString(input, "%25$1")
-	}
-	input = strings.Replace(input, "+", "%2B", -1) // Ugly hack to make QueryUnescape work with our use case
-	output, err := url.QueryUnescape(input)
-	if err != nil || !utf8.ValidString(output) {
-		return "", true
-	}
-	return output, false
-}
-
-func builtinGlobal_decodeURI(call FunctionCall) Value {
-	output, err := _decodeURI(toString(call.Argument(0)), true)
-	if err {
-		panic(newURIError("URI malformed"))
-	}
-	return toValue_string(output)
-}
-
-func builtinGlobal_decodeURIComponent(call FunctionCall) Value {
-	output, err := _decodeURI(toString(call.Argument(0)), false)
-	if err {
-		panic(newURIError("URI malformed"))
-	}
-	return toValue_string(output)
-}
-
-// escape/unescape
-
-func builtin_shouldEscape(chr byte) bool {
-	if 'A' <= chr && chr <= 'Z' || 'a' <= chr && chr <= 'z' || '0' <= chr && chr <= '9' {
-		return false
-	}
-	return !strings.ContainsRune("*_+-./", rune(chr))
-}
-
-const escapeBase16 = "0123456789ABCDEF"
-
-func builtin_escape(input string) string {
-	output := make([]byte, 0, len(input))
-	length := len(input)
-	for index := 0; index < length; {
-		if builtin_shouldEscape(input[index]) {
-			chr, width := utf8.DecodeRuneInString(input[index:])
-			chr16 := utf16.Encode([]rune{chr})[0]
-			if 256 > chr16 {
-				output = append(output, '%',
-					escapeBase16[chr16>>4],
-					escapeBase16[chr16&15],
-				)
-			} else {
-				output = append(output, '%', 'u',
-					escapeBase16[chr16>>12],
-					escapeBase16[(chr16>>8)&15],
-					escapeBase16[(chr16>>4)&15],
-					escapeBase16[chr16&15],
-				)
-			}
-			index += width
-
-		} else {
-			output = append(output, input[index])
-			index += 1
-		}
-	}
-	return string(output)
-}
-
-func builtin_unescape(input string) string {
-	output := make([]rune, 0, len(input))
-	length := len(input)
-	for index := 0; index < length; {
-		if input[index] == '%' {
-			if index <= length-6 && input[index+1] == 'u' {
-				byte16, err := hex.DecodeString(input[index+2 : index+6])
-				if err == nil {
-					value := uint16(byte16[0])<<8 + uint16(byte16[1])
-					chr := utf16.Decode([]uint16{value})[0]
-					output = append(output, chr)
-					index += 6
-					continue
-				}
-			}
-			if index <= length-3 {
-				byte8, err := hex.DecodeString(input[index+1 : index+3])
-				if err == nil {
-					value := uint16(byte8[0])
-					chr := utf16.Decode([]uint16{value})[0]
-					output = append(output, chr)
-					index += 3
-					continue
-				}
-			}
-		}
-		output = append(output, rune(input[index]))
-		index += 1
-	}
-	return string(output)
-}
-
-func builtinGlobal_escape(call FunctionCall) Value {
-	return toValue_string(builtin_escape(toString(call.Argument(0))))
-}
-
-func builtinGlobal_unescape(call FunctionCall) Value {
-	return toValue_string(builtin_unescape(toString(call.Argument(0))))
-}
-
-// Error
-
-func builtinError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newError("", call.Argument(0)))
-}
-
-func builtinNewError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newError("", valueOfArrayIndex(argumentList, 0)))
-}
-
-func builtinError_toString(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	if thisObject == nil {
-		panic(newTypeError())
-	}
-
-	name := "Error"
-	nameValue := thisObject.get("name")
-	if nameValue.IsDefined() {
-		name = toString(nameValue)
-	}
-
-	message := ""
-	messageValue := thisObject.get("message")
-	if messageValue.IsDefined() {
-		message = toString(messageValue)
-	}
-
-	if len(name) == 0 {
-		return toValue_string(message)
-	}
-
-	if len(message) == 0 {
-		return toValue_string(name)
-	}
-
-	return toValue_string(fmt.Sprintf("%s: %s", name, message))
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_array.go b/vendor/github.com/robertkrimen/otto/builtin_array.go
deleted file mode 100644
index 8f3bc573b..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_array.go
+++ /dev/null
@@ -1,666 +0,0 @@
-package otto
-
-import (
-	"strconv"
-	"strings"
-)
-
-// Array
-
-func builtinArray(call FunctionCall) Value {
-	return toValue_object(builtinNewArrayNative(call.runtime, call.ArgumentList))
-}
-
-func builtinNewArray(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(builtinNewArrayNative(self.runtime, argumentList))
-}
-
-func builtinNewArrayNative(runtime *_runtime, argumentList []Value) *_object {
-	if len(argumentList) == 1 {
-		// TODO Check for RangeError
-		return runtime.newArray(toUint32(argumentList[0]))
-	}
-	return runtime.newArrayOf(argumentList)
-}
-
-func builtinArray_toString(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	join := thisObject.get("join")
-	if join.isCallable() {
-		join := join._object()
-		return join.Call(call.This, call.ArgumentList)
-	}
-	return builtinObject_toString(call)
-}
-
-func builtinArray_toLocaleString(call FunctionCall) Value {
-	separator := ","
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-	if length == 0 {
-		return toValue_string("")
-	}
-	stringList := make([]string, 0, length)
-	for index := int64(0); index < length; index += 1 {
-		value := thisObject.get(arrayIndexToString(index))
-		stringValue := ""
-		switch value._valueType {
-		case valueEmpty, valueUndefined, valueNull:
-		default:
-			object := call.runtime.toObject(value)
-			toLocaleString := object.get("toLocaleString")
-			if !toLocaleString.isCallable() {
-				panic(newTypeError())
-			}
-			stringValue = toLocaleString.call(toValue_object(object)).toString()
-		}
-		stringList = append(stringList, stringValue)
-	}
-	return toValue_string(strings.Join(stringList, separator))
-}
-
-func builtinArray_concat(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	valueArray := []Value{}
-	source := append([]Value{toValue_object(thisObject)}, call.ArgumentList...)
-	for _, item := range source {
-		switch item._valueType {
-		case valueObject:
-			object := item._object()
-			if isArray(object) {
-				length := toInteger(object.get("length")).value
-				for index := int64(0); index < length; index += 1 {
-					name := strconv.FormatInt(index, 10)
-					if !object.hasProperty(name) {
-						continue
-					}
-					value := object.get(name)
-					valueArray = append(valueArray, value)
-				}
-				continue
-			}
-			fallthrough
-		default:
-			valueArray = append(valueArray, toValue_string(toString(item)))
-		}
-	}
-	return toValue_object(call.runtime.newArrayOf(valueArray))
-}
-
-func builtinArray_shift(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-	if 0 == length {
-		thisObject.put("length", toValue_int64(0), true)
-		return UndefinedValue()
-	}
-	first := thisObject.get("0")
-	for index := int64(1); index < length; index++ {
-		from := arrayIndexToString(index)
-		to := arrayIndexToString(index - 1)
-		if thisObject.hasProperty(from) {
-			thisObject.put(to, thisObject.get(from), true)
-		} else {
-			thisObject.delete(to, true)
-		}
-	}
-	thisObject.delete(arrayIndexToString(length-1), true)
-	thisObject.put("length", toValue_int64(length-1), true)
-	return first
-}
-
-func builtinArray_push(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	itemList := call.ArgumentList
-	index := int64(toUint32(thisObject.get("length")))
-	for len(itemList) > 0 {
-		thisObject.put(arrayIndexToString(index), itemList[0], true)
-		itemList = itemList[1:]
-		index += 1
-	}
-	length := toValue_int64(index)
-	thisObject.put("length", length, true)
-	return length
-}
-
-func builtinArray_pop(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-	if 0 == length {
-		thisObject.put("length", toValue_uint32(0), true)
-		return UndefinedValue()
-	}
-	last := thisObject.get(arrayIndexToString(length - 1))
-	thisObject.delete(arrayIndexToString(length-1), true)
-	thisObject.put("length", toValue_int64(length-1), true)
-	return last
-}
-
-func builtinArray_join(call FunctionCall) Value {
-	separator := ","
-	{
-		argument := call.Argument(0)
-		if argument.IsDefined() {
-			separator = toString(argument)
-		}
-	}
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-	if length == 0 {
-		return toValue_string("")
-	}
-	stringList := make([]string, 0, length)
-	for index := int64(0); index < length; index += 1 {
-		value := thisObject.get(arrayIndexToString(index))
-		stringValue := ""
-		switch value._valueType {
-		case valueEmpty, valueUndefined, valueNull:
-		default:
-			stringValue = toString(value)
-		}
-		stringList = append(stringList, stringValue)
-	}
-	return toValue_string(strings.Join(stringList, separator))
-}
-
-func builtinArray_splice(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-
-	start := valueToRangeIndex(call.Argument(0), length, false)
-	deleteCount := valueToRangeIndex(call.Argument(1), int64(length)-start, true)
-	valueArray := make([]Value, deleteCount)
-
-	for index := int64(0); index < deleteCount; index++ {
-		indexString := arrayIndexToString(int64(start + index))
-		if thisObject.hasProperty(indexString) {
-			valueArray[index] = thisObject.get(indexString)
-		}
-	}
-
-	// 0, <1, 2, 3, 4>, 5, 6, 7
-	// a, b
-	// length 8 - delete 4 @ start 1
-
-	itemList := []Value{}
-	itemCount := int64(len(call.ArgumentList))
-	if itemCount > 2 {
-		itemCount -= 2 // Less the first two arguments
-		itemList = call.ArgumentList[2:]
-	} else {
-		itemCount = 0
-	}
-	if itemCount < deleteCount {
-		// The Object/Array is shrinking
-		stop := int64(length) - deleteCount
-		// The new length of the Object/Array before
-		// appending the itemList remainder
-		// Stopping at the lower bound of the insertion:
-		// Move an item from the after the deleted portion
-		// to a position after the inserted portion
-		for index := start; index < stop; index++ {
-			from := arrayIndexToString(index + deleteCount) // Position just after deletion
-			to := arrayIndexToString(index + itemCount)     // Position just after splice (insertion)
-			if thisObject.hasProperty(from) {
-				thisObject.put(to, thisObject.get(from), true)
-			} else {
-				thisObject.delete(to, true)
-			}
-		}
-		// Delete off the end
-		// We don't bother to delete below <stop + itemCount> (if any) since those
-		// will be overwritten anyway
-		for index := int64(length); index > (stop + itemCount); index-- {
-			thisObject.delete(arrayIndexToString(index-1), true)
-		}
-	} else if itemCount > deleteCount {
-		// The Object/Array is growing
-		// The itemCount is greater than the deleteCount, so we do
-		// not have to worry about overwriting what we should be moving
-		// ---
-		// Starting from the upper bound of the deletion:
-		// Move an item from the after the deleted portion
-		// to a position after the inserted portion
-		for index := int64(length) - deleteCount; index > start; index-- {
-			from := arrayIndexToString(index + deleteCount - 1)
-			to := arrayIndexToString(index + itemCount - 1)
-			if thisObject.hasProperty(from) {
-				thisObject.put(to, thisObject.get(from), true)
-			} else {
-				thisObject.delete(to, true)
-			}
-		}
-	}
-
-	for index := int64(0); index < itemCount; index++ {
-		thisObject.put(arrayIndexToString(index+start), itemList[index], true)
-	}
-	thisObject.put("length", toValue_int64(int64(length)+itemCount-deleteCount), true)
-
-	return toValue_object(call.runtime.newArrayOf(valueArray))
-}
-
-func builtinArray_slice(call FunctionCall) Value {
-	thisObject := call.thisObject()
-
-	length := int64(toUint32(thisObject.get("length")))
-	start, end := rangeStartEnd(call.ArgumentList, length, false)
-
-	if start >= end {
-		// Always an empty array
-		return toValue_object(call.runtime.newArray(0))
-	}
-	sliceLength := end - start
-	sliceValueArray := make([]Value, sliceLength)
-
-	for index := int64(0); index < sliceLength; index++ {
-		from := arrayIndexToString(index + start)
-		if thisObject.hasProperty(from) {
-			sliceValueArray[index] = thisObject.get(from)
-		}
-	}
-
-	return toValue_object(call.runtime.newArrayOf(sliceValueArray))
-}
-
-func builtinArray_unshift(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-	itemList := call.ArgumentList
-	itemCount := int64(len(itemList))
-
-	for index := length; index > 0; index-- {
-		from := arrayIndexToString(index - 1)
-		to := arrayIndexToString(index + itemCount - 1)
-		if thisObject.hasProperty(from) {
-			thisObject.put(to, thisObject.get(from), true)
-		} else {
-			thisObject.delete(to, true)
-		}
-	}
-
-	for index := int64(0); index < itemCount; index++ {
-		thisObject.put(arrayIndexToString(index), itemList[index], true)
-	}
-
-	newLength := toValue_int64(length + itemCount)
-	thisObject.put("length", newLength, true)
-	return newLength
-}
-
-func builtinArray_reverse(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := int64(toUint32(thisObject.get("length")))
-
-	lower := struct {
-		name   string
-		index  int64
-		exists bool
-	}{}
-	upper := lower
-
-	lower.index = 0
-	middle := length / 2 // Division will floor
-
-	for lower.index != middle {
-		lower.name = arrayIndexToString(lower.index)
-		upper.index = length - lower.index - 1
-		upper.name = arrayIndexToString(upper.index)
-
-		lower.exists = thisObject.hasProperty(lower.name)
-		upper.exists = thisObject.hasProperty(upper.name)
-
-		if lower.exists && upper.exists {
-			lowerValue := thisObject.get(lower.name)
-			upperValue := thisObject.get(upper.name)
-			thisObject.put(lower.name, upperValue, true)
-			thisObject.put(upper.name, lowerValue, true)
-		} else if !lower.exists && upper.exists {
-			value := thisObject.get(upper.name)
-			thisObject.delete(upper.name, true)
-			thisObject.put(lower.name, value, true)
-		} else if lower.exists && !upper.exists {
-			value := thisObject.get(lower.name)
-			thisObject.delete(lower.name, true)
-			thisObject.put(upper.name, value, true)
-		} else {
-			// Nothing happens.
-		}
-
-		lower.index += 1
-	}
-
-	return call.This
-}
-
-func sortCompare(thisObject *_object, index0, index1 uint, compare *_object) int {
-	j := struct {
-		name    string
-		exists  bool
-		defined bool
-		value   string
-	}{}
-	k := j
-	j.name = arrayIndexToString(int64(index0))
-	j.exists = thisObject.hasProperty(j.name)
-	k.name = arrayIndexToString(int64(index1))
-	k.exists = thisObject.hasProperty(k.name)
-
-	if !j.exists && !k.exists {
-		return 0
-	} else if !j.exists {
-		return 1
-	} else if !k.exists {
-		return -1
-	}
-
-	x := thisObject.get(j.name)
-	y := thisObject.get(k.name)
-	j.defined = x.IsDefined()
-	k.defined = y.IsDefined()
-
-	if !j.defined && !k.defined {
-		return 0
-	} else if !j.defined {
-		return 1
-	} else if !k.defined {
-		return -1
-	}
-
-	if compare == nil {
-		j.value = toString(x)
-		k.value = toString(y)
-
-		if j.value == k.value {
-			return 0
-		} else if j.value < k.value {
-			return -1
-		}
-
-		return 1
-	}
-
-	return int(toInt32(compare.Call(UndefinedValue(), []Value{x, y})))
-}
-
-func arraySortSwap(thisObject *_object, index0, index1 uint) {
-
-	j := struct {
-		name   string
-		exists bool
-	}{}
-	k := j
-
-	j.name = arrayIndexToString(int64(index0))
-	j.exists = thisObject.hasProperty(j.name)
-	k.name = arrayIndexToString(int64(index1))
-	k.exists = thisObject.hasProperty(k.name)
-
-	if j.exists && k.exists {
-		jValue := thisObject.get(j.name)
-		kValue := thisObject.get(k.name)
-		thisObject.put(j.name, kValue, true)
-		thisObject.put(k.name, jValue, true)
-	} else if !j.exists && k.exists {
-		value := thisObject.get(k.name)
-		thisObject.delete(k.name, true)
-		thisObject.put(j.name, value, true)
-	} else if j.exists && !k.exists {
-		value := thisObject.get(j.name)
-		thisObject.delete(j.name, true)
-		thisObject.put(k.name, value, true)
-	} else {
-		// Nothing happens.
-	}
-}
-
-func arraySortQuickPartition(thisObject *_object, left, right, pivot uint, compare *_object) uint {
-	arraySortSwap(thisObject, pivot, right) // Right is now the pivot value
-	cursor := left
-	for index := left; index < right; index++ {
-		if sortCompare(thisObject, index, right, compare) == -1 { // Compare to the pivot value
-			arraySortSwap(thisObject, index, cursor)
-			cursor += 1
-		}
-	}
-	arraySortSwap(thisObject, cursor, right)
-	return cursor
-}
-
-func arraySortQuickSort(thisObject *_object, left, right uint, compare *_object) {
-	if left < right {
-		pivot := left + (right-left)/2
-		pivot = arraySortQuickPartition(thisObject, left, right, pivot, compare)
-		if pivot > 0 {
-			arraySortQuickSort(thisObject, left, pivot-1, compare)
-		}
-		arraySortQuickSort(thisObject, pivot+1, right, compare)
-	}
-}
-
-func builtinArray_sort(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	length := uint(toUint32(thisObject.get("length")))
-	compareValue := call.Argument(0)
-	compare := compareValue._object()
-	if compareValue.IsUndefined() {
-	} else if !compareValue.isCallable() {
-		panic(newTypeError())
-	}
-	if length > 1 {
-		arraySortQuickSort(thisObject, 0, length-1, compare)
-	}
-	return call.This
-}
-
-func builtinArray_isArray(call FunctionCall) Value {
-	return toValue_bool(isArray(call.Argument(0)._object()))
-}
-
-func builtinArray_indexOf(call FunctionCall) Value {
-	thisObject, matchValue := call.thisObject(), call.Argument(0)
-	if length := int64(toUint32(thisObject.get("length"))); length > 0 {
-		index := int64(0)
-		if len(call.ArgumentList) > 1 {
-			index = toInteger(call.Argument(1)).value
-		}
-		if index < 0 {
-			if index += length; index < 0 {
-				index = 0
-			}
-		} else if index >= length {
-			index = -1
-		}
-		for ; index >= 0 && index < length; index++ {
-			name := arrayIndexToString(int64(index))
-			if !thisObject.hasProperty(name) {
-				continue
-			}
-			if sameValue(matchValue, thisObject.get(name)) {
-				return toValue_uint32(uint32(index))
-			}
-		}
-	}
-	return toValue_int(-1)
-}
-
-func builtinArray_lastIndexOf(call FunctionCall) Value {
-	thisObject, matchValue := call.thisObject(), call.Argument(0)
-	length := int64(toUint32(thisObject.get("length")))
-	index := length - 1
-	if len(call.ArgumentList) > 1 {
-		index = toInteger(call.Argument(1)).value
-	}
-	if 0 > index {
-		index += length
-	}
-	if index > length {
-		index = length - 1
-	} else if 0 > index {
-		return toValue_int(-1)
-	}
-	for ; index >= 0; index-- {
-		name := arrayIndexToString(int64(index))
-		if !thisObject.hasProperty(name) {
-			continue
-		}
-		if sameValue(matchValue, thisObject.get(name)) {
-			return toValue_uint32(uint32(index))
-		}
-	}
-	return toValue_int(-1)
-}
-
-func builtinArray_every(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		length := int64(toUint32(thisObject.get("length")))
-		callThis := call.Argument(1)
-		for index := int64(0); index < length; index++ {
-			if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-				if value := thisObject.get(key); iterator.call(callThis, value, toValue_int64(index), this).isTrue() {
-					continue
-				}
-				return FalseValue()
-			}
-		}
-		return TrueValue()
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_some(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		length := int64(toUint32(thisObject.get("length")))
-		callThis := call.Argument(1)
-		for index := int64(0); index < length; index++ {
-			if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-				if value := thisObject.get(key); iterator.call(callThis, value, toValue_int64(index), this).isTrue() {
-					return TrueValue()
-				}
-			}
-		}
-		return FalseValue()
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_forEach(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		length := int64(toUint32(thisObject.get("length")))
-		callThis := call.Argument(1)
-		for index := int64(0); index < length; index++ {
-			if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-				iterator.call(callThis, thisObject.get(key), toValue_int64(index), this)
-			}
-		}
-		return UndefinedValue()
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_map(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		length := int64(toUint32(thisObject.get("length")))
-		callThis := call.Argument(1)
-		values := make([]Value, length)
-		for index := int64(0); index < length; index++ {
-			if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-				values[index] = iterator.call(callThis, thisObject.get(key), index, this)
-			} else {
-				values[index] = UndefinedValue()
-			}
-		}
-		return toValue_object(call.runtime.newArrayOf(values))
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_filter(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		length := int64(toUint32(thisObject.get("length")))
-		callThis := call.Argument(1)
-		values := make([]Value, 0)
-		for index := int64(0); index < length; index++ {
-			if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-				value := thisObject.get(key)
-				if iterator.call(callThis, value, index, this).isTrue() {
-					values = append(values, value)
-				}
-			}
-		}
-		return toValue_object(call.runtime.newArrayOf(values))
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_reduce(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		start := call.Argument(1)
-		length := int64(toUint32(thisObject.get("length")))
-		index := int64(0)
-		if length > 0 || start.IsDefined() {
-			var accumulator Value
-			if !start.IsDefined() {
-				for ; index < length; index++ {
-					if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-						accumulator = thisObject.get(key)
-						index++
-						break
-					}
-				}
-			} else {
-				accumulator = start
-			}
-			for ; index < length; index++ {
-				if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-					accumulator = iterator.call(UndefinedValue(), accumulator, thisObject.get(key), key, this)
-				}
-			}
-			return accumulator
-		}
-	}
-	panic(newTypeError())
-}
-
-func builtinArray_reduceRight(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	this := toValue_object(thisObject)
-	if iterator := call.Argument(0); iterator.isCallable() {
-		start := call.Argument(1)
-		length := int64(toUint32(thisObject.get("length")))
-		if length > 0 || start.IsDefined() {
-			index := length - 1
-			var accumulator Value
-			if !start.IsDefined() {
-				for ; index >= 0; index-- {
-					if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-						accumulator = thisObject.get(key)
-						index -= 1
-						break
-					}
-				}
-			} else {
-				accumulator = start
-			}
-			for ; index >= 0; index-- {
-				if key := arrayIndexToString(index); thisObject.hasProperty(key) {
-					accumulator = iterator.call(UndefinedValue(), accumulator, thisObject.get(key), key, this)
-				}
-			}
-			return accumulator
-		}
-	}
-	panic(newTypeError())
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_boolean.go b/vendor/github.com/robertkrimen/otto/builtin_boolean.go
deleted file mode 100644
index 1aec693ce..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_boolean.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package otto
-
-// Boolean
-
-func builtinBoolean(call FunctionCall) Value {
-	return toValue_bool(toBoolean(call.Argument(0)))
-}
-
-func builtinNewBoolean(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newBoolean(valueOfArrayIndex(argumentList, 0)))
-}
-
-func builtinBoolean_toString(call FunctionCall) Value {
-	value := call.This
-	if !value.IsBoolean() {
-		// Will throw a TypeError if ThisObject is not a Boolean
-		value = call.thisClassObject("Boolean").primitiveValue()
-	}
-	return toValue_string(toString(value))
-}
-
-func builtinBoolean_valueOf(call FunctionCall) Value {
-	value := call.This
-	if !value.IsBoolean() {
-		value = call.thisClassObject("Boolean").primitiveValue()
-	}
-	return value
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_date.go b/vendor/github.com/robertkrimen/otto/builtin_date.go
deleted file mode 100644
index 9541bfa49..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_date.go
+++ /dev/null
@@ -1,530 +0,0 @@
-package otto
-
-import (
-	"math"
-	Time "time"
-)
-
-// Date
-
-const (
-	// TODO Be like V8?
-	// builtinDate_goDateTimeLayout = "Mon Jan 2 2006 15:04:05 GMT-0700 (MST)"
-	builtinDate_goDateTimeLayout = Time.RFC1123 // "Mon, 02 Jan 2006 15:04:05 MST"
-	builtinDate_goDateLayout     = "Mon, 02 Jan 2006"
-	builtinDate_goTimeLayout     = "15:04:05 MST"
-)
-
-func builtinDate(call FunctionCall) Value {
-	date := &_dateObject{}
-	if len(call.ArgumentList) == 0 {
-		// TODO Should make this prettier
-		date.Set(newDateTime([]Value{}, Time.Local))
-		return toValue_string(date.Time().Format(builtinDate_goDateTimeLayout))
-	}
-	date.Set(newDateTime(call.ArgumentList, Time.Local))
-	return toValue_string(date.Time().Local().Format(builtinDate_goDateTimeLayout))
-}
-
-func builtinNewDate(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newDate(newDateTime(argumentList, Time.Local)))
-}
-
-func builtinDate_toString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format(builtinDate_goDateTimeLayout))
-}
-
-func builtinDate_toDateString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format(builtinDate_goDateLayout))
-}
-
-func builtinDate_toTimeString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format(builtinDate_goTimeLayout))
-}
-
-func builtinDate_toUTCString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Format(builtinDate_goDateTimeLayout))
-}
-
-func builtinDate_toISOString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Format("2006-01-02T15:04:05.000Z"))
-}
-
-func builtinDate_toJSON(call FunctionCall) Value {
-	object := call.thisObject()
-	value := object.DefaultValue(defaultValueHintNumber) // FIXME object.primitiveNumberValue
-	{                                                    // FIXME value.isFinite
-		value := toFloat(value)
-		if math.IsNaN(value) || math.IsInf(value, 0) {
-			return NullValue()
-		}
-	}
-	toISOString := object.get("toISOString")
-	if !toISOString.isCallable() {
-		panic(newTypeError())
-	}
-	return toISOString.call(toValue_object(object), []Value{})
-}
-
-func builtinDate_toGMTString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Format("Mon, 02 Jan 2006 15:04:05 GMT"))
-}
-
-func builtinDate_getTime(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	// We do this (convert away from a float) so the user
-	// does not get something back in exponential notation
-	return toValue_int64(int64(date.Epoch()))
-}
-
-func builtinDate_setTime(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	date.Set(toFloat(call.Argument(0)))
-	return date.Value()
-}
-
-func _builtinDate_beforeSet(call FunctionCall, upToArgument int, timeLocal bool) (*_object, *_dateObject, *_ecmaTime) {
-	object := call.thisObject()
-	date := dateObjectOf(object)
-	if date.isNaN {
-		return nil, nil, nil
-	}
-	// upToArgument is actually the index of the last argument we want to include + 1...
-	for index := 0; index < len(call.ArgumentList) && index < upToArgument; index++ {
-		value := call.Argument(index)
-		if value.IsNaN() {
-			object.value = invalidDateObject
-		}
-	}
-	baseTime := date.Time()
-	if timeLocal {
-		baseTime = baseTime.Local()
-	}
-	ecmaTime := ecmaTime(baseTime)
-	return object, &date, &ecmaTime
-}
-
-func _builtinDate_beforeSet1(call FunctionCall, timeLocal bool) (*_object, *_dateObject, *_ecmaTime, int64) {
-	object, date, ecmaTime := _builtinDate_beforeSet(call, 1, timeLocal)
-	if ecmaTime == nil {
-		return nil, nil, nil, 0
-	}
-	integer := toInteger(call.Argument(0))
-	if !integer.valid() {
-		date.SetNaN()
-		object.value = *date
-		return nil, nil, nil, 0
-	}
-	return object, date, ecmaTime, integer.value
-}
-
-func builtinDate_parse(call FunctionCall) Value {
-	date := toString(call.Argument(0))
-	return toValue_float64(dateParse(date))
-}
-
-func builtinDate_UTC(call FunctionCall) Value {
-	return toValue_float64(newDateTime(call.ArgumentList, Time.UTC))
-}
-
-func builtinDate_now(call FunctionCall) Value {
-	call.ArgumentList = []Value(nil)
-	return builtinDate_UTC(call)
-}
-
-// This is a placeholder
-func builtinDate_toLocaleString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format("2006-01-02 15:04:05"))
-}
-
-// This is a placeholder
-func builtinDate_toLocaleDateString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format("2006-01-02"))
-}
-
-// This is a placeholder
-func builtinDate_toLocaleTimeString(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return toValue_string("Invalid Date")
-	}
-	return toValue_string(date.Time().Local().Format("15:04:05"))
-}
-
-func builtinDate_valueOf(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return date.Value()
-}
-
-func builtinDate_getYear(call FunctionCall) Value {
-	// Will throw a TypeError is ThisObject is nil or
-	// does not have Class of "Date"
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Year() - 1900)
-}
-
-func builtinDate_getFullYear(call FunctionCall) Value {
-	// Will throw a TypeError is ThisObject is nil or
-	// does not have Class of "Date"
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Year())
-}
-
-func builtinDate_getUTCFullYear(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Year())
-}
-
-func builtinDate_getMonth(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(dateFromGoMonth(date.Time().Local().Month()))
-}
-
-func builtinDate_getUTCMonth(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(dateFromGoMonth(date.Time().Month()))
-}
-
-func builtinDate_getDate(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Day())
-}
-
-func builtinDate_getUTCDate(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Day())
-}
-
-func builtinDate_getDay(call FunctionCall) Value {
-	// Actually day of the week
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(dateFromGoDay(date.Time().Local().Weekday()))
-}
-
-func builtinDate_getUTCDay(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(dateFromGoDay(date.Time().Weekday()))
-}
-
-func builtinDate_getHours(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Hour())
-}
-
-func builtinDate_getUTCHours(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Hour())
-}
-
-func builtinDate_getMinutes(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Minute())
-}
-
-func builtinDate_getUTCMinutes(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Minute())
-}
-
-func builtinDate_getSeconds(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Second())
-}
-
-func builtinDate_getUTCSeconds(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Second())
-}
-
-func builtinDate_getMilliseconds(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Local().Nanosecond() / (100 * 100 * 100))
-}
-
-func builtinDate_getUTCMilliseconds(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	return toValue_int(date.Time().Nanosecond() / (100 * 100 * 100))
-}
-
-func builtinDate_getTimezoneOffset(call FunctionCall) Value {
-	date := dateObjectOf(call.thisObject())
-	if date.isNaN {
-		return NaNValue()
-	}
-	timeLocal := date.Time().Local()
-	// Is this kosher?
-	timeLocalAsUTC := Time.Date(
-		timeLocal.Year(),
-		timeLocal.Month(),
-		timeLocal.Day(),
-		timeLocal.Hour(),
-		timeLocal.Minute(),
-		timeLocal.Second(),
-		timeLocal.Nanosecond(),
-		Time.UTC,
-	)
-	return toValue_float64(date.Time().Sub(timeLocalAsUTC).Seconds() / 60)
-}
-
-func builtinDate_setMilliseconds(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.millisecond = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCMilliseconds(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.millisecond = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setSeconds(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.second = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCSeconds(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.second = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setMinutes(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.minute = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCMinutes(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.minute = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setHours(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.hour = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCHours(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.hour = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setDate(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.day = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCDate(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.day = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setMonth(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.month = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCMonth(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.month = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setYear(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	year := int(value)
-	if 0 <= year && year <= 99 {
-		year += 1900
-	}
-	ecmaTime.year = year
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setFullYear(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, true)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.year = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-func builtinDate_setUTCFullYear(call FunctionCall) Value {
-	object, date, ecmaTime, value := _builtinDate_beforeSet1(call, false)
-	if ecmaTime == nil {
-		return NaNValue()
-	}
-	ecmaTime.year = int(value)
-	date.SetTime(ecmaTime.goTime())
-	object.value = *date
-	return date.Value()
-}
-
-// toUTCString
-// toISOString
-// toJSONString
-// toJSON
diff --git a/vendor/github.com/robertkrimen/otto/builtin_error.go b/vendor/github.com/robertkrimen/otto/builtin_error.go
deleted file mode 100644
index effd7f698..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_error.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package otto
-
-func (runtime *_runtime) newEvalError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.EvalErrorPrototype
-	return self
-}
-
-func builtinEvalError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newEvalError(call.Argument(0)))
-}
-
-func builtinNewEvalError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newEvalError(valueOfArrayIndex(argumentList, 0)))
-}
-
-func (runtime *_runtime) newTypeError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.TypeErrorPrototype
-	return self
-}
-
-func builtinTypeError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newTypeError(call.Argument(0)))
-}
-
-func builtinNewTypeError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newTypeError(valueOfArrayIndex(argumentList, 0)))
-}
-
-func (runtime *_runtime) newRangeError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.RangeErrorPrototype
-	return self
-}
-
-func builtinRangeError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newRangeError(call.Argument(0)))
-}
-
-func builtinNewRangeError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newRangeError(valueOfArrayIndex(argumentList, 0)))
-}
-
-func (runtime *_runtime) newURIError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.URIErrorPrototype
-	return self
-}
-
-func (runtime *_runtime) newReferenceError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.ReferenceErrorPrototype
-	return self
-}
-
-func builtinReferenceError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newReferenceError(call.Argument(0)))
-}
-
-func builtinNewReferenceError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newReferenceError(valueOfArrayIndex(argumentList, 0)))
-}
-
-func (runtime *_runtime) newSyntaxError(message Value) *_object {
-	self := runtime.newErrorObject(message)
-	self.prototype = runtime.Global.SyntaxErrorPrototype
-	return self
-}
-
-func builtinSyntaxError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newSyntaxError(call.Argument(0)))
-}
-
-func builtinNewSyntaxError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newSyntaxError(valueOfArrayIndex(argumentList, 0)))
-}
-
-func builtinURIError(call FunctionCall) Value {
-	return toValue_object(call.runtime.newURIError(call.Argument(0)))
-}
-
-func builtinNewURIError(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newURIError(valueOfArrayIndex(argumentList, 0)))
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_function.go b/vendor/github.com/robertkrimen/otto/builtin_function.go
deleted file mode 100644
index 080b624f6..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_function.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package otto
-
-// Function
-
-func builtinFunction(call FunctionCall) Value {
-	return toValue_object(builtinNewFunctionNative(call.runtime, call.ArgumentList))
-}
-
-func builtinNewFunction(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(builtinNewFunctionNative(self.runtime, argumentList))
-}
-
-func builtinNewFunctionNative(runtime *_runtime, argumentList []Value) *_object {
-	parameterList := []string{}
-	bodySource := ""
-	argumentCount := len(argumentList)
-	if argumentCount > 0 {
-		bodySource = toString(argumentList[argumentCount-1])
-		argumentList = argumentList[0 : argumentCount-1]
-		for _, value := range argumentList {
-			parameterList = append(parameterList, toString(value))
-		}
-	}
-
-	parser := newParser()
-	parser.lexer.Source = bodySource
-	_programNode := parser.ParseAsFunction()
-	return runtime.newNodeFunction(_programNode.toFunction(parameterList), runtime.GlobalEnvironment)
-}
-
-func builtinFunction_toString(call FunctionCall) Value {
-	return toValue_string("[function]")
-}
-
-func builtinFunction_apply(call FunctionCall) Value {
-	if !call.This.isCallable() {
-		panic(newTypeError())
-	}
-	this := call.Argument(0)
-	if this.IsUndefined() {
-		// FIXME Not ECMA5
-		this = toValue_object(call.runtime.GlobalObject)
-	}
-	argumentList := call.Argument(1)
-	switch argumentList._valueType {
-	case valueUndefined, valueNull:
-		return call.thisObject().Call(this, []Value{})
-	case valueObject:
-	default:
-		panic(newTypeError())
-	}
-
-	arrayObject := argumentList._object()
-	thisObject := call.thisObject()
-	length := int64(toUint32(arrayObject.get("length")))
-	valueArray := make([]Value, length)
-	for index := int64(0); index < length; index++ {
-		valueArray[index] = arrayObject.get(arrayIndexToString(index))
-	}
-	return thisObject.Call(this, valueArray)
-}
-
-func builtinFunction_call(call FunctionCall) Value {
-	if !call.This.isCallable() {
-		panic(newTypeError())
-	}
-	thisObject := call.thisObject()
-	this := call.Argument(0)
-	if this.IsUndefined() {
-		// FIXME Not ECMA5
-		this = toValue_object(call.runtime.GlobalObject)
-	}
-	if len(call.ArgumentList) >= 1 {
-		return thisObject.Call(this, call.ArgumentList[1:])
-	}
-	return thisObject.Call(this, []Value{})
-}
-
-func builtinFunction_bind(call FunctionCall) Value {
-	target := call.This
-	if !target.isCallable() {
-		panic(newTypeError())
-	}
-	targetObject := target._object()
-
-	this := call.Argument(0)
-	argumentList := call.slice(1)
-	if this.IsUndefined() {
-		// FIXME Do this elsewhere?
-		this = toValue_object(call.runtime.GlobalObject)
-	}
-
-	return toValue_object(call.runtime.newBoundFunctionObject(targetObject, this, argumentList))
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_math.go b/vendor/github.com/robertkrimen/otto/builtin_math.go
deleted file mode 100644
index 48f8e6868..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_math.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package otto
-
-import (
-	"math"
-	"math/rand"
-)
-
-// Math
-
-func builtinMath_abs(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Abs(number))
-}
-
-func builtinMath_acos(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Acos(number))
-}
-
-func builtinMath_asin(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Asin(number))
-}
-
-func builtinMath_atan(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Atan(number))
-}
-
-func builtinMath_atan2(call FunctionCall) Value {
-	y := toFloat(call.Argument(0))
-	if math.IsNaN(y) {
-		return NaNValue()
-	}
-	x := toFloat(call.Argument(1))
-	if math.IsNaN(x) {
-		return NaNValue()
-	}
-	return toValue_float64(math.Atan2(y, x))
-}
-
-func builtinMath_cos(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Cos(number))
-}
-
-func builtinMath_ceil(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Ceil(number))
-}
-
-func builtinMath_exp(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Exp(number))
-}
-
-func builtinMath_floor(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Floor(number))
-}
-
-func builtinMath_log(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Log(number))
-}
-
-func builtinMath_max(call FunctionCall) Value {
-	switch len(call.ArgumentList) {
-	case 0:
-		return negativeInfinityValue()
-	case 1:
-		return toValue_float64(toFloat(call.ArgumentList[0]))
-	}
-	result := toFloat(call.ArgumentList[0])
-	if math.IsNaN(result) {
-		return NaNValue()
-	}
-	for _, value := range call.ArgumentList[1:] {
-		value := toFloat(value)
-		if math.IsNaN(value) {
-			return NaNValue()
-		}
-		result = math.Max(result, value)
-	}
-	return toValue_float64(result)
-}
-
-func builtinMath_min(call FunctionCall) Value {
-	switch len(call.ArgumentList) {
-	case 0:
-		return positiveInfinityValue()
-	case 1:
-		return toValue_float64(toFloat(call.ArgumentList[0]))
-	}
-	result := toFloat(call.ArgumentList[0])
-	if math.IsNaN(result) {
-		return NaNValue()
-	}
-	for _, value := range call.ArgumentList[1:] {
-		value := toFloat(value)
-		if math.IsNaN(value) {
-			return NaNValue()
-		}
-		result = math.Min(result, value)
-	}
-	return toValue_float64(result)
-}
-
-func builtinMath_pow(call FunctionCall) Value {
-	// TODO Make sure this works according to the specification (15.8.2.13)
-	x := toFloat(call.Argument(0))
-	y := toFloat(call.Argument(1))
-	if x == 1 && math.IsInf(y, 0) {
-		return NaNValue()
-	}
-	return toValue_float64(math.Pow(x, y))
-}
-
-func builtinMath_random(call FunctionCall) Value {
-	return toValue_float64(rand.Float64())
-}
-
-func builtinMath_round(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	value := math.Floor(number + 0.5)
-	if value == 0 {
-		value = math.Copysign(0, number)
-	}
-	return toValue_float64(value)
-}
-
-func builtinMath_sin(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Sin(number))
-}
-
-func builtinMath_sqrt(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Sqrt(number))
-}
-
-func builtinMath_tan(call FunctionCall) Value {
-	number := toFloat(call.Argument(0))
-	return toValue_float64(math.Tan(number))
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_number.go b/vendor/github.com/robertkrimen/otto/builtin_number.go
deleted file mode 100644
index e10640fd5..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_number.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package otto
-
-import (
-	"strconv"
-)
-
-// Number
-
-func numberValueFromNumberArgumentList(argumentList []Value) Value {
-	if len(argumentList) > 0 {
-		return toNumber(argumentList[0])
-	}
-	return toValue_int(0)
-}
-
-func builtinNumber(call FunctionCall) Value {
-	return numberValueFromNumberArgumentList(call.ArgumentList)
-}
-
-func builtinNewNumber(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newNumber(numberValueFromNumberArgumentList(argumentList)))
-}
-
-func builtinNumber_toString(call FunctionCall) Value {
-	// Will throw a TypeError if ThisObject is not a Number
-	value := call.thisClassObject("Number").primitiveValue()
-	radix := 10
-	if len(call.ArgumentList) > 0 {
-		integer := toIntegerFloat(call.Argument(0))
-		if integer < 2 || integer > 36 {
-			panic(newRangeError("RangeError: toString() radix must be between 2 and 36"))
-		}
-		radix = int(integer)
-	}
-	if radix == 10 {
-		return toValue_string(toString(value))
-	}
-	return toValue_string(numberToStringRadix(value, radix))
-}
-
-func builtinNumber_valueOf(call FunctionCall) Value {
-	return call.thisClassObject("Number").primitiveValue()
-}
-
-func builtinNumber_toFixed(call FunctionCall) Value {
-	if call.This.IsNaN() {
-		return toValue_string("NaN")
-	}
-	precision := toIntegerFloat(call.Argument(0))
-	if 0 > precision {
-		panic(newRangeError("RangeError: toFixed() precision must be greater than 0"))
-	}
-	return toValue_string(strconv.FormatFloat(toFloat(call.This), 'f', int(precision), 64))
-}
-
-func builtinNumber_toExponential(call FunctionCall) Value {
-	if call.This.IsNaN() {
-		return toValue_string("NaN")
-	}
-	precision := float64(-1)
-	if value := call.Argument(0); value.IsDefined() {
-		precision = toIntegerFloat(value)
-		if 0 > precision {
-			panic(newRangeError("RangeError: toExponential() precision must be greater than 0"))
-		}
-	}
-	return toValue_string(strconv.FormatFloat(toFloat(call.This), 'e', int(precision), 64))
-}
-
-func builtinNumber_toPrecision(call FunctionCall) Value {
-	if call.This.IsNaN() {
-		return toValue_string("NaN")
-	}
-	value := call.Argument(0)
-	if value.IsUndefined() {
-		return toValue_string(toString(call.This))
-	}
-	precision := toIntegerFloat(value)
-	if 1 > precision {
-		panic(newRangeError("RangeError: toPrecision() precision must be greater than 1"))
-	}
-	return toValue_string(strconv.FormatFloat(toFloat(call.This), 'g', int(precision), 64))
-}
-
-func builtinNumber_toLocaleString(call FunctionCall) Value {
-	return builtinNumber_toString(call)
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_object.go b/vendor/github.com/robertkrimen/otto/builtin_object.go
deleted file mode 100644
index a43886dc3..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_object.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-// Object
-
-func builtinObject(call FunctionCall) Value {
-	value := call.Argument(0)
-	switch value._valueType {
-	case valueUndefined, valueNull:
-		return toValue_object(call.runtime.newObject())
-	}
-
-	return toValue_object(call.runtime.toObject(value))
-}
-
-func builtinNewObject(self *_object, _ Value, argumentList []Value) Value {
-	value := valueOfArrayIndex(argumentList, 0)
-	switch value._valueType {
-	case valueNull, valueUndefined:
-	case valueNumber, valueString, valueBoolean:
-		return toValue_object(self.runtime.toObject(value))
-	case valueObject:
-		return value
-	default:
-	}
-	return toValue_object(self.runtime.newObject())
-}
-
-func builtinObject_valueOf(call FunctionCall) Value {
-	return toValue_object(call.thisObject())
-}
-
-func builtinObject_hasOwnProperty(call FunctionCall) Value {
-	propertyName := toString(call.Argument(0))
-	thisObject := call.thisObject()
-	return toValue_bool(thisObject.hasOwnProperty(propertyName))
-}
-
-func builtinObject_isPrototypeOf(call FunctionCall) Value {
-	value := call.Argument(0)
-	if !value.IsObject() {
-		return FalseValue()
-	}
-	prototype := call.toObject(value).prototype
-	thisObject := call.thisObject()
-	for prototype != nil {
-		if thisObject == prototype {
-			return TrueValue()
-		}
-		prototype = prototype.prototype
-	}
-	return FalseValue()
-}
-
-func builtinObject_propertyIsEnumerable(call FunctionCall) Value {
-	propertyName := toString(call.Argument(0))
-	thisObject := call.thisObject()
-	property := thisObject.getOwnProperty(propertyName)
-	if property != nil && property.enumerable() {
-		return TrueValue()
-	}
-	return FalseValue()
-}
-
-func builtinObject_toString(call FunctionCall) Value {
-	result := ""
-	if call.This.IsUndefined() {
-		result = "[object Undefined]"
-	} else if call.This.IsNull() {
-		result = "[object Null]"
-	} else {
-		result = fmt.Sprintf("[object %s]", call.thisObject().class)
-	}
-	return toValue_string(result)
-}
-
-func builtinObject_toLocaleString(call FunctionCall) Value {
-	toString := call.thisObject().get("toString")
-	if !toString.isCallable() {
-		panic(newTypeError())
-	}
-	return toString.call(call.This)
-}
-
-func builtinObject_getPrototypeOf(call FunctionCall) Value {
-	objectValue := call.Argument(0)
-	object := objectValue._object()
-	if object == nil {
-		panic(newTypeError())
-	}
-
-	if object.prototype == nil {
-		return NullValue()
-	}
-
-	return toValue_object(object.prototype)
-}
-
-func builtinObject_getOwnPropertyDescriptor(call FunctionCall) Value {
-	objectValue := call.Argument(0)
-	object := objectValue._object()
-	if object == nil {
-		panic(newTypeError())
-	}
-
-	name := toString(call.Argument(1))
-	descriptor := object.getOwnProperty(name)
-	if descriptor == nil {
-		return UndefinedValue()
-	}
-	return toValue_object(call.runtime.fromPropertyDescriptor(*descriptor))
-}
-
-func builtinObject_defineProperty(call FunctionCall) Value {
-	objectValue := call.Argument(0)
-	object := objectValue._object()
-	if object == nil {
-		panic(newTypeError())
-	}
-	name := toString(call.Argument(1))
-	descriptor := toPropertyDescriptor(call.Argument(2))
-	object.defineOwnProperty(name, descriptor, true)
-	return objectValue
-}
-
-func builtinObject_defineProperties(call FunctionCall) Value {
-	objectValue := call.Argument(0)
-	object := objectValue._object()
-	if object == nil {
-		panic(newTypeError())
-	}
-
-	properties := call.runtime.toObject(call.Argument(1))
-	properties.enumerate(true, func(name string) bool {
-		descriptor := toPropertyDescriptor(properties.get(name))
-		object.defineOwnProperty(name, descriptor, true)
-		return true
-	})
-
-	return objectValue
-}
-
-func builtinObject_create(call FunctionCall) Value {
-	prototypeValue := call.Argument(0)
-	if !prototypeValue.IsNull() && !prototypeValue.IsObject() {
-		panic(newTypeError())
-	}
-
-	object := call.runtime.newObject()
-	object.prototype = prototypeValue._object()
-
-	propertiesValue := call.Argument(1)
-	if propertiesValue.IsDefined() {
-		properties := call.runtime.toObject(propertiesValue)
-		properties.enumerate(false, func(name string) bool {
-			descriptor := toPropertyDescriptor(properties.get(name))
-			object.defineOwnProperty(name, descriptor, true)
-			return true
-		})
-	}
-
-	return toValue_object(object)
-}
-
-func builtinObject_isExtensible(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		return toValue_bool(object.extensible)
-	}
-	panic(newTypeError())
-}
-
-func builtinObject_preventExtensions(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		object.extensible = false
-	} else {
-		panic(newTypeError())
-	}
-	return object
-}
-
-func builtinObject_isSealed(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		if object.extensible {
-			return toValue_bool(false)
-		}
-		result := true
-		object.enumerate(true, func(name string) bool {
-			property := object.getProperty(name)
-			if property.configurable() {
-				result = false
-			}
-			return true
-		})
-		return toValue_bool(result)
-	}
-	panic(newTypeError())
-}
-
-func builtinObject_seal(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		object.enumerate(true, func(name string) bool {
-			if property := object.getOwnProperty(name); nil != property && property.configurable() {
-				property.configureOff()
-				object.defineOwnProperty(name, *property, true)
-			}
-			return true
-		})
-		object.extensible = false
-	} else {
-		panic(newTypeError())
-	}
-	return object
-}
-
-func builtinObject_isFrozen(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		if object.extensible {
-			return toValue_bool(false)
-		}
-		result := true
-		object.enumerate(true, func(name string) bool {
-			property := object.getProperty(name)
-			if property.configurable() || property.writable() {
-				result = false
-			}
-			return true
-		})
-		return toValue_bool(result)
-	}
-	panic(newTypeError())
-}
-
-func builtinObject_freeze(call FunctionCall) Value {
-	object := call.Argument(0)
-	if object := object._object(); object != nil {
-		object.enumerate(true, func(name string) bool {
-			if property, update := object.getOwnProperty(name), false; nil != property {
-				if property.isDataDescriptor() && property.writable() {
-					property.writeOff()
-					update = true
-				}
-				if property.configurable() {
-					property.configureOff()
-					update = true
-				}
-				if update {
-					object.defineOwnProperty(name, *property, true)
-				}
-			}
-			return true
-		})
-		object.extensible = false
-	} else {
-		panic(newTypeError())
-	}
-	return object
-}
-
-func builtinObject_keys(call FunctionCall) Value {
-	if object, keys := call.Argument(0)._object(), []Value(nil); nil != object {
-		object.enumerate(false, func(name string) bool {
-			keys = append(keys, toValue_string(name))
-			return true
-		})
-		return toValue_object(call.runtime.newArrayOf(keys))
-	}
-	panic(newTypeError())
-}
-
-func builtinObject_getOwnPropertyNames(call FunctionCall) Value {
-	if object, propertyNames := call.Argument(0)._object(), []Value(nil); nil != object {
-		object.enumerate(true, func(name string) bool {
-			if object.hasOwnProperty(name) {
-				propertyNames = append(propertyNames, toValue_string(name))
-			}
-			return true
-		})
-		return toValue_object(call.runtime.newArrayOf(propertyNames))
-	}
-	panic(newTypeError())
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_regexp.go b/vendor/github.com/robertkrimen/otto/builtin_regexp.go
deleted file mode 100644
index 29d009dc2..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_regexp.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-// RegExp
-
-func builtinRegExp(call FunctionCall) Value {
-	pattern := call.Argument(0)
-	flags := call.Argument(1)
-	if object := pattern._object(); object != nil {
-		if object.class == "RegExp" && flags.IsUndefined() {
-			return pattern
-		}
-	}
-	return toValue_object(call.runtime.newRegExp(pattern, flags))
-}
-
-func builtinNewRegExp(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newRegExp(
-		valueOfArrayIndex(argumentList, 0),
-		valueOfArrayIndex(argumentList, 1),
-	))
-}
-
-func builtinRegExp_toString(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	source := toString(thisObject.get("source"))
-	flags := []byte{}
-	if toBoolean(thisObject.get("global")) {
-		flags = append(flags, 'g')
-	}
-	if toBoolean(thisObject.get("ignoreCase")) {
-		flags = append(flags, 'i')
-	}
-	if toBoolean(thisObject.get("multiline")) {
-		flags = append(flags, 'm')
-	}
-	return toValue_string(fmt.Sprintf("/%s/%s", source, flags))
-}
-
-func builtinRegExp_exec(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	target := toString(call.Argument(0))
-	match, result := execRegExp(thisObject, target)
-	if !match {
-		return NullValue()
-	}
-	return toValue_object(execResultToArray(call.runtime, target, result))
-}
-
-func builtinRegExp_test(call FunctionCall) Value {
-	thisObject := call.thisObject()
-	target := toString(call.Argument(0))
-	match, _ := execRegExp(thisObject, target)
-	return toValue_bool(match)
-}
-
-func builtinRegExp_compile(call FunctionCall) Value {
-	// This (useless) function is deprecated, but is here to provide some
-	// semblance of compatibility.
-	// Caveat emptor: it may not be around for long.
-	return UndefinedValue()
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_string.go b/vendor/github.com/robertkrimen/otto/builtin_string.go
deleted file mode 100644
index 95ceabf43..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_string.go
+++ /dev/null
@@ -1,502 +0,0 @@
-package otto
-
-import (
-	"bytes"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-	"unicode/utf16"
-)
-
-// String
-
-func stringValueFromStringArgumentList(argumentList []Value) Value {
-	if len(argumentList) > 0 {
-		return toValue_string(toString(argumentList[0]))
-	}
-	return toValue_string("")
-}
-
-func builtinString(call FunctionCall) Value {
-	return stringValueFromStringArgumentList(call.ArgumentList)
-}
-
-func builtinNewString(self *_object, _ Value, argumentList []Value) Value {
-	return toValue_object(self.runtime.newString(stringValueFromStringArgumentList(argumentList)))
-}
-
-func builtinString_toString(call FunctionCall) Value {
-	return call.thisClassObject("String").primitiveValue()
-}
-func builtinString_valueOf(call FunctionCall) Value {
-	return call.thisClassObject("String").primitiveValue()
-}
-
-func builtinString_fromCharCode(call FunctionCall) Value {
-	chrList := make([]uint16, len(call.ArgumentList))
-	for index, value := range call.ArgumentList {
-		chrList[index] = toUint16(value)
-	}
-	return toValue_string16(chrList)
-}
-
-func builtinString_charAt(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	value := toString(call.This)
-	value16 := utf16.Encode([]rune(value))
-	index := toInteger(call.Argument(0)).value
-	if 0 > index || index >= int64(len(value16)) {
-		return toValue_string("")
-	}
-	return toValue_string(string(value16[index]))
-}
-
-func builtinString_charCodeAt(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	value := toString(call.This)
-	value16 := utf16.Encode([]rune(value))
-	index := toInteger(call.Argument(0)).value
-	if 0 > index || index >= int64(len(value16)) {
-		return NaNValue()
-	}
-	return toValue_uint16(value16[index])
-}
-
-func builtinString_concat(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	var value bytes.Buffer
-	value.WriteString(toString(call.This))
-	for _, item := range call.ArgumentList {
-		value.WriteString(toString(item))
-	}
-	return toValue_string(value.String())
-}
-
-func builtinString_indexOf(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	value := toString(call.This)
-	target := toString(call.Argument(0))
-	if 2 > len(call.ArgumentList) {
-		return toValue_int(strings.Index(value, target))
-	}
-	start := toIntegerFloat(call.Argument(1))
-	if 0 > start {
-		start = 0
-	} else if start >= float64(len(value)) {
-		if target == "" {
-			return toValue_int(len(value))
-		}
-		return toValue_int(-1)
-	}
-	return toValue_int(strings.Index(value[int(start):], target))
-}
-
-func builtinString_lastIndexOf(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	value := toString(call.This)
-	target := toString(call.Argument(0))
-	if 2 > len(call.ArgumentList) || call.ArgumentList[1].IsUndefined() {
-		return toValue_int(strings.LastIndex(value, target))
-	}
-	length := len(value)
-	if length == 0 {
-		return toValue_int(strings.LastIndex(value, target))
-	}
-	startNumber := toFloat(call.ArgumentList[1])
-	start := int64(0)
-	if math.IsNaN(startNumber) || math.IsInf(startNumber, 0) {
-		// startNumber is infinity, so start is the end of string (start = length)
-		return toValue_int(strings.LastIndex(value, target))
-	} else {
-		start = toInteger(call.ArgumentList[1]).value
-	}
-	if 0 > start {
-		start = 0
-	} else if start >= int64(length) {
-		return toValue_int(strings.LastIndex(value, target))
-	}
-	return toValue_int(strings.LastIndex(value[:start], target))
-}
-
-func builtinString_match(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := toString(call.This)
-	matcherValue := call.Argument(0)
-	matcher := matcherValue._object()
-	if !matcherValue.IsObject() || matcher.class != "RegExp" {
-		matcher = call.runtime.newRegExp(matcherValue, UndefinedValue())
-	}
-	global := toBoolean(matcher.get("global"))
-	if !global {
-		match, result := execRegExp(matcher, target)
-		if !match {
-			return NullValue()
-		}
-		return toValue_object(execResultToArray(call.runtime, target, result))
-	}
-
-	{
-		result := matcher.regExpValue().regularExpression.FindAllStringIndex(target, -1)
-		matchCount := len(result)
-		if result == nil {
-			matcher.put("lastIndex", toValue_int(0), true)
-			return UndefinedValue() // !match
-		}
-		matchCount = len(result)
-		valueArray := make([]Value, matchCount)
-		for index := 0; index < matchCount; index++ {
-			valueArray[index] = toValue_string(target[result[index][0]:result[index][1]])
-		}
-		matcher.put("lastIndex", toValue_int(result[matchCount-1][1]), true)
-		return toValue_object(call.runtime.newArrayOf(valueArray))
-	}
-}
-
-var builtinString_replace_Regexp = regexp.MustCompile("\\$(?:[\\$\\&\\'\\`1-9]|0[1-9]|[1-9][0-9])")
-
-func builtinString_findAndReplaceString(input []byte, lastIndex int, match []int, target []byte, replaceValue []byte) (output []byte) {
-	matchCount := len(match) / 2
-	output = input
-	if match[0] != lastIndex {
-		output = append(output, target[lastIndex:match[0]]...)
-	}
-	replacement := builtinString_replace_Regexp.ReplaceAllFunc(replaceValue, func(part []byte) []byte {
-		// TODO Check if match[0] or match[1] can be -1 in this scenario
-		switch part[1] {
-		case '$':
-			return []byte{'$'}
-		case '&':
-			return target[match[0]:match[1]]
-		case '`':
-			return target[:match[0]]
-		case '\'':
-			return target[match[1] : len(target)-1]
-		}
-		matchNumberParse, error := strconv.ParseInt(string(part[1:]), 10, 64)
-		matchNumber := int(matchNumberParse)
-		if error != nil || matchNumber >= matchCount {
-			return []byte{}
-		}
-		offset := 2 * matchNumber
-		if match[offset] != -1 {
-			return target[match[offset]:match[offset+1]]
-		}
-		return []byte{} // The empty string
-	})
-	output = append(output, replacement...)
-	return output
-}
-
-func builtinString_replace(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := []byte(toString(call.This))
-	searchValue := call.Argument(0)
-	searchObject := searchValue._object()
-
-	// TODO If a capture is -1?
-	var search *regexp.Regexp
-	global := false
-	find := 1
-	if searchValue.IsObject() && searchObject.class == "RegExp" {
-		regExp := searchObject.regExpValue()
-		search = regExp.regularExpression
-		if regExp.global {
-			find = -1
-		}
-	} else {
-		search = regexp.MustCompile(regexp.QuoteMeta(toString(searchValue)))
-	}
-
-	found := search.FindAllSubmatchIndex(target, find)
-	if found == nil {
-		return toValue_string(string(target)) // !match
-	}
-
-	{
-		lastIndex := 0
-		result := []byte{}
-
-		replaceValue := call.Argument(1)
-		if replaceValue.isCallable() {
-			target := string(target)
-			replace := replaceValue._object()
-			for _, match := range found {
-				if match[0] != lastIndex {
-					result = append(result, target[lastIndex:match[0]]...)
-				}
-				matchCount := len(match) / 2
-				argumentList := make([]Value, matchCount+2)
-				for index := 0; index < matchCount; index++ {
-					offset := 2 * index
-					if match[offset] != -1 {
-						argumentList[index] = toValue_string(target[match[offset]:match[offset+1]])
-					} else {
-						argumentList[index] = UndefinedValue()
-					}
-				}
-				argumentList[matchCount+0] = toValue_int(match[0])
-				argumentList[matchCount+1] = toValue_string(target)
-				replacement := toString(replace.Call(UndefinedValue(), argumentList))
-				result = append(result, []byte(replacement)...)
-				lastIndex = match[1]
-			}
-
-		} else {
-			replace := []byte(toString(replaceValue))
-			for _, match := range found {
-				result = builtinString_findAndReplaceString(result, lastIndex, match, target, replace)
-				lastIndex = match[1]
-			}
-		}
-
-		if lastIndex != len(target) {
-			result = append(result, target[lastIndex:]...)
-		}
-
-		if global && searchObject != nil {
-			searchObject.put("lastIndex", toValue_int(lastIndex), true)
-		}
-
-		return toValue_string(string(result))
-	}
-
-	return UndefinedValue()
-}
-
-func builtinString_search(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := toString(call.This)
-	searchValue := call.Argument(0)
-	search := searchValue._object()
-	if !searchValue.IsObject() || search.class != "RegExp" {
-		search = call.runtime.newRegExp(searchValue, UndefinedValue())
-	}
-	result := search.regExpValue().regularExpression.FindStringIndex(target)
-	if result == nil {
-		return toValue_int(-1)
-	}
-	return toValue_int(result[0])
-}
-
-func stringSplitMatch(target string, targetLength int64, index uint, search string, searchLength int64) (bool, uint) {
-	if int64(index)+searchLength > searchLength {
-		return false, 0
-	}
-	found := strings.Index(target[index:], search)
-	if 0 > found {
-		return false, 0
-	}
-	return true, uint(found)
-}
-
-func builtinString_split(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := toString(call.This)
-
-	separatorValue := call.Argument(0)
-	limitValue := call.Argument(1)
-	limit := -1
-	if limitValue.IsDefined() {
-		limit = int(toUint32(limitValue))
-	}
-
-	if limit == 0 {
-		return toValue_object(call.runtime.newArray(0))
-	}
-
-	if separatorValue.IsUndefined() {
-		return toValue_object(call.runtime.newArrayOf([]Value{toValue_string(target)}))
-	}
-
-	if separatorValue.isRegExp() {
-		targetLength := len(target)
-		search := separatorValue._object().regExpValue().regularExpression
-		valueArray := []Value{}
-		result := search.FindAllStringSubmatchIndex(target, -1)
-		lastIndex := 0
-		found := 0
-
-		for _, match := range result {
-			if match[0] == match[1] {
-				// An "empty" match
-				continue
-			}
-
-			if lastIndex != match[0] {
-				valueArray = append(valueArray, toValue_string(target[lastIndex:match[0]]))
-				found++
-			} else if lastIndex == match[0] {
-				if lastIndex != -1 {
-					valueArray = append(valueArray, toValue_string(""))
-					found++
-				}
-			}
-
-			lastIndex = match[1]
-			if found == limit {
-				goto RETURN
-			}
-
-			captureCount := len(match) / 2
-			for index := 1; index < captureCount; index++ {
-				offset := index * 2
-				value := UndefinedValue()
-				if match[offset] != -1 {
-					value = toValue_string(target[match[offset]:match[offset+1]])
-				}
-				valueArray = append(valueArray, value)
-				found++
-				if found == limit {
-					goto RETURN
-				}
-			}
-		}
-
-		if found != limit {
-			if lastIndex != targetLength {
-				valueArray = append(valueArray, toValue_string(target[lastIndex:targetLength]))
-			} else {
-				valueArray = append(valueArray, toValue_string(""))
-			}
-		}
-
-	RETURN:
-		return toValue_object(call.runtime.newArrayOf(valueArray))
-
-	} else {
-		separator := toString(separatorValue)
-
-		splitLimit := limit
-		excess := false
-		if limit > 0 {
-			splitLimit = limit + 1
-			excess = true
-		}
-
-		split := strings.SplitN(target, separator, splitLimit)
-
-		if excess && len(split) > limit {
-			split = split[:limit]
-		}
-
-		valueArray := make([]Value, len(split))
-		for index, value := range split {
-			valueArray[index] = toValue_string(value)
-		}
-
-		return toValue_object(call.runtime.newArrayOf(valueArray))
-	}
-
-	return UndefinedValue()
-}
-
-func builtinString_slice(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := toString(call.This)
-
-	length := int64(len(target))
-	start, end := rangeStartEnd(call.ArgumentList, length, false)
-	if end-start <= 0 {
-		return toValue_string("")
-	}
-	return toValue_string(target[start:end])
-}
-
-func builtinString_substring(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	target := toString(call.This)
-
-	length := int64(len(target))
-	start, end := rangeStartEnd(call.ArgumentList, length, true)
-	if start > end {
-		start, end = end, start
-	}
-	return toValue_string(target[start:end])
-}
-
-func builtinString_substr(call FunctionCall) Value {
-	target := toString(call.This)
-
-	size := int64(len(target))
-	start, length := rangeStartLength(call.ArgumentList, size)
-
-	if start >= size {
-		return toValue_string("")
-	}
-
-	if length <= 0 {
-		return toValue_string("")
-	}
-
-	if start+length >= size {
-		// Cap length to be to the end of the string
-		// start = 3, length = 5, size = 4 [0, 1, 2, 3]
-		// 4 - 3 = 1
-		// target[3:4]
-		length = size - start
-	}
-
-	return toValue_string(target[start : start+length])
-}
-
-func builtinString_toLowerCase(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue_string(strings.ToLower(toString(call.This)))
-}
-
-func builtinString_toUpperCase(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue_string(strings.ToUpper(toString(call.This)))
-}
-
-// 7.2 Table 2 — Whitespace Characters & 7.3 Table 3 - Line Terminator Characters
-const builtinString_trim_whitespace = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF"
-
-func builtinString_trim(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue(strings.Trim(toString(call.This),
-		builtinString_trim_whitespace))
-}
-
-// Mozilla extension, not ECMAScript 5
-func builtinString_trimLeft(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue(strings.TrimLeft(toString(call.This),
-		builtinString_trim_whitespace))
-}
-
-// Mozilla extension, not ECMAScript 5
-func builtinString_trimRight(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue(strings.TrimRight(toString(call.This),
-		builtinString_trim_whitespace))
-}
-
-func builtinString_localeCompare(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	this := toString(call.This)
-	that := toString(call.Argument(0))
-	if this < that {
-		return toValue_int(-1)
-	} else if this == that {
-		return toValue_int(0)
-	}
-	return toValue_int(1)
-}
-
-/*
-An alternate version of String.trim
-func builtinString_trim(call FunctionCall) Value {
-	checkObjectCoercible(call.This)
-	return toValue_string(strings.TrimFunc(toString(call.This), isWhiteSpaceOrLineTerminator))
-}
-*/
-
-func builtinString_toLocaleLowerCase(call FunctionCall) Value {
-	return builtinString_toLowerCase(call)
-}
-
-func builtinString_toLocaleUpperCase(call FunctionCall) Value {
-	return builtinString_toUpperCase(call)
-}
diff --git a/vendor/github.com/robertkrimen/otto/builtin_test.go b/vendor/github.com/robertkrimen/otto/builtin_test.go
deleted file mode 100644
index 8b121f19e..000000000
--- a/vendor/github.com/robertkrimen/otto/builtin_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestString_substr(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".substr(0,1)`, "a")
-	test(`"abc".substr(0,2)`, "ab")
-	test(`"abc".substr(0,3)`, "abc")
-	test(`"abc".substr(0,4)`, "abc")
-	test(`"abc".substr(0,9)`, "abc")
-
-	test(`"abc".substr(1,1)`, "b")
-	test(`"abc".substr(1,2)`, "bc")
-	test(`"abc".substr(1,3)`, "bc")
-	test(`"abc".substr(1,4)`, "bc")
-	test(`"abc".substr(1,9)`, "bc")
-
-	test(`"abc".substr(2,1)`, "c")
-	test(`"abc".substr(2,2)`, "c")
-	test(`"abc".substr(2,3)`, "c")
-	test(`"abc".substr(2,4)`, "c")
-	test(`"abc".substr(2,9)`, "c")
-
-	test(`"abc".substr(3,1)`, "")
-	test(`"abc".substr(3,2)`, "")
-	test(`"abc".substr(3,3)`, "")
-	test(`"abc".substr(3,4)`, "")
-	test(`"abc".substr(3,9)`, "")
-
-	test(`"abc".substr(0)`, "abc")
-	test(`"abc".substr(1)`, "bc")
-	test(`"abc".substr(2)`, "c")
-	test(`"abc".substr(3)`, "")
-	test(`"abc".substr(9)`, "")
-
-	test(`"abc".substr(-9)`, "abc")
-	test(`"abc".substr(-3)`, "abc")
-	test(`"abc".substr(-2)`, "bc")
-	test(`"abc".substr(-1)`, "c")
-
-	test(`"abc".substr(-9, 1)`, "a")
-	test(`"abc".substr(-3, 1)`, "a")
-	test(`"abc".substr(-2, 1)`, "b")
-	test(`"abc".substr(-1, 1)`, "c")
-	test(`"abc".substr(-1, 2)`, "c")
-
-	test(`"abcd".substr(3, 5)`, "d")
-}
-
-func Test_builtin_escape(t *testing.T) {
-	Terst(t)
-
-	Is(builtin_escape("abc"), "abc")
-	Is(builtin_escape("="), "%3D")
-	Is(builtin_escape("abc=%+32"), "abc%3D%25+32")
-	Is(builtin_escape("世界"), "%u4E16%u754C")
-}
-
-func Test_builtin_unescape(t *testing.T) {
-	Terst(t)
-
-	Is(builtin_unescape("abc"), "abc")
-	Is(builtin_unescape("=%3D"), "==")
-	Is(builtin_unescape("abc%3D%25+32"), "abc=%+32")
-	Is(builtin_unescape("%u4E16%u754C"), "世界")
-}
-
-func TestGlobal_escape(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`escape("abc")`, "abc")
-	test(`escape("=")`, "%3D")
-	test(`escape("abc=%+32")`, "abc%3D%25+32")
-	test(`escape("\u4e16\u754c")`, "%u4E16%u754C")
-}
-
-func TestGlobal_unescape(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`unescape("abc")`, "abc")
-	test(`unescape("=%3D")`, "==")
-	test(`unescape("abc%3D%25+32")`, "abc=%+32")
-	test(`unescape("%u4E16%u754C")`, "世界")
-}
diff --git a/vendor/github.com/robertkrimen/otto/clone.go b/vendor/github.com/robertkrimen/otto/clone.go
deleted file mode 100644
index 3223aa6c5..000000000
--- a/vendor/github.com/robertkrimen/otto/clone.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-type _clone struct {
-	runtime *_runtime
-	stash   struct {
-		object                 map[*_object]*_object
-		objectEnvironment      map[*_objectEnvironment]*_objectEnvironment
-		declarativeEnvironment map[*_declarativeEnvironment]*_declarativeEnvironment
-	}
-}
-
-func (runtime *_runtime) clone() *_runtime {
-
-	self := &_runtime{}
-	clone := &_clone{
-		runtime: self,
-	}
-	clone.stash.object = make(map[*_object]*_object)
-	clone.stash.objectEnvironment = make(map[*_objectEnvironment]*_objectEnvironment)
-	clone.stash.declarativeEnvironment = make(map[*_declarativeEnvironment]*_declarativeEnvironment)
-
-	globalObject := clone.object(runtime.GlobalObject)
-	self.GlobalEnvironment = self.newObjectEnvironment(globalObject, nil)
-	self.GlobalObject = globalObject
-	self.Global = _global{
-		clone.object(runtime.Global.Object),
-		clone.object(runtime.Global.Function),
-		clone.object(runtime.Global.Array),
-		clone.object(runtime.Global.String),
-		clone.object(runtime.Global.Boolean),
-		clone.object(runtime.Global.Number),
-		clone.object(runtime.Global.Math),
-		clone.object(runtime.Global.Date),
-		clone.object(runtime.Global.RegExp),
-		clone.object(runtime.Global.Error),
-		clone.object(runtime.Global.EvalError),
-		clone.object(runtime.Global.TypeError),
-		clone.object(runtime.Global.RangeError),
-		clone.object(runtime.Global.ReferenceError),
-		clone.object(runtime.Global.SyntaxError),
-		clone.object(runtime.Global.URIError),
-
-		clone.object(runtime.Global.ObjectPrototype),
-		clone.object(runtime.Global.FunctionPrototype),
-		clone.object(runtime.Global.ArrayPrototype),
-		clone.object(runtime.Global.StringPrototype),
-		clone.object(runtime.Global.BooleanPrototype),
-		clone.object(runtime.Global.NumberPrototype),
-		clone.object(runtime.Global.DatePrototype),
-		clone.object(runtime.Global.RegExpPrototype),
-		clone.object(runtime.Global.ErrorPrototype),
-		clone.object(runtime.Global.EvalErrorPrototype),
-		clone.object(runtime.Global.TypeErrorPrototype),
-		clone.object(runtime.Global.RangeErrorPrototype),
-		clone.object(runtime.Global.ReferenceErrorPrototype),
-		clone.object(runtime.Global.SyntaxErrorPrototype),
-		clone.object(runtime.Global.URIErrorPrototype),
-	}
-
-	self.EnterGlobalExecutionContext()
-
-	self.eval = self.GlobalObject.property["eval"].value.(Value).value.(*_object)
-	self.GlobalObject.prototype = self.Global.ObjectPrototype
-
-	return self
-}
-func (clone *_clone) object(self0 *_object) *_object {
-	if self1, exists := clone.stash.object[self0]; exists {
-		return self1
-	}
-	self1 := &_object{}
-	clone.stash.object[self0] = self1
-	return self0.objectClass.clone(self0, self1, clone)
-}
-
-func (clone *_clone) declarativeEnvironment(self0 *_declarativeEnvironment) (*_declarativeEnvironment, bool) {
-	if self1, exists := clone.stash.declarativeEnvironment[self0]; exists {
-		return self1, true
-	}
-	self1 := &_declarativeEnvironment{}
-	clone.stash.declarativeEnvironment[self0] = self1
-	return self1, false
-}
-
-func (clone *_clone) objectEnvironment(self0 *_objectEnvironment) (*_objectEnvironment, bool) {
-	if self1, exists := clone.stash.objectEnvironment[self0]; exists {
-		return self1, true
-	}
-	self1 := &_objectEnvironment{}
-	clone.stash.objectEnvironment[self0] = self1
-	return self1, false
-}
-
-func (clone *_clone) value(self0 Value) Value {
-	self1 := self0
-	switch value := self0.value.(type) {
-	case *_object:
-		self1.value = clone.object(value)
-	}
-	return self1
-}
-
-func (clone *_clone) valueArray(self0 []Value) []Value {
-	self1 := make([]Value, len(self0))
-	for index, value := range self0 {
-		self1[index] = clone.value(value)
-	}
-	return self1
-}
-
-func (clone *_clone) environment(self0 _environment) _environment {
-	if self0 == nil {
-		return nil
-	}
-	return self0.clone(clone)
-}
-
-func (clone *_clone) property(self0 _property) _property {
-	self1 := self0
-	if value, valid := self0.value.(Value); valid {
-		self1.value = clone.value(value)
-	} else {
-		panic(fmt.Errorf("self0.value.(Value) != true"))
-	}
-	return self1
-}
-
-func (clone *_clone) declarativeProperty(self0 _declarativeProperty) _declarativeProperty {
-	self1 := self0
-	self1.value = clone.value(self0.value)
-	return self1
-}
-
-func (clone *_clone) callFunction(self0 _callFunction) _callFunction {
-	if self0 == nil {
-		return nil
-	}
-	return self0.clone(clone)
-}
diff --git a/vendor/github.com/robertkrimen/otto/console.go b/vendor/github.com/robertkrimen/otto/console.go
deleted file mode 100644
index 30333ad08..000000000
--- a/vendor/github.com/robertkrimen/otto/console.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"os"
-	"strings"
-)
-
-func formatForConsole(argumentList []Value) string {
-	output := []string{}
-	for _, argument := range argumentList {
-		output = append(output, fmt.Sprintf("%v", argument))
-	}
-	return strings.Join(output, " ")
-}
-
-func builtinConsole_log(call FunctionCall) Value {
-	fmt.Fprintln(os.Stdout, formatForConsole(call.ArgumentList))
-	return UndefinedValue()
-}
-
-func builtinConsole_error(call FunctionCall) Value {
-	fmt.Fprintln(os.Stdout, formatForConsole(call.ArgumentList))
-	return UndefinedValue()
-}
-
-// Nothing happens.
-func builtinConsole_dir(call FunctionCall) Value {
-	return UndefinedValue()
-}
-
-func builtinConsole_time(call FunctionCall) Value {
-	return UndefinedValue()
-}
-
-func builtinConsole_timeEnd(call FunctionCall) Value {
-	return UndefinedValue()
-}
-
-func builtinConsole_trace(call FunctionCall) Value {
-	return UndefinedValue()
-}
-
-func builtinConsole_assert(call FunctionCall) Value {
-	return UndefinedValue()
-}
-
-func (runtime *_runtime) newConsole() *_object {
-
-	return newConsoleObject(runtime)
-}
diff --git a/vendor/github.com/robertkrimen/otto/date_test.go b/vendor/github.com/robertkrimen/otto/date_test.go
deleted file mode 100644
index 698767a02..000000000
--- a/vendor/github.com/robertkrimen/otto/date_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"fmt"
-	"strconv"
-	"testing"
-	Time "time"
-)
-
-func TestDate(t *testing.T) {
-	Terst(t)
-
-	// Passing or failing should not be dependent on what time zone we're in
-	defer mockTimeLocal(Time.UTC)()
-
-	test := runTest()
-
-	time := Time.Unix(1348616313, 47*1000*1000).Local()
-	check := func(run string, value int) {
-		test(run, fmt.Sprintf("%d", value))
-	}
-
-	test(`Date`, "[function]")
-	test(`new Date(0).toUTCString()`, "Thu, 01 Jan 1970 00:00:00 UTC")
-	test(`new Date(0).toGMTString()`, "Thu, 01 Jan 1970 00:00:00 GMT")
-	if false {
-		// TODO toLocale{Date,Time}String
-		test(`new Date(0).toLocaleString()`, "")
-		test(`new Date(0).toLocaleDateString()`, "")
-		test(`new Date(0).toLocaleTimeString()`, "")
-	}
-	test(`new Date(1348616313).getTime()`, "1348616313")
-	test(`new Date(1348616313).toUTCString()`, "Fri, 16 Jan 1970 14:36:56 UTC")
-	test(`abc = new Date(1348616313047); abc.toUTCString()`, "Tue, 25 Sep 2012 23:38:33 UTC")
-	check(`abc.getYear()`, time.Year()-1900)
-	check(`abc.getFullYear()`, time.Year())
-	check(`abc.getUTCFullYear()`, 2012)
-	check(`abc.getMonth()`, int(time.Month())-1) // Remember, the JavaScript month is 0-based
-	check(`abc.getUTCMonth()`, 8)
-	check(`abc.getDate()`, time.Day())
-	check(`abc.getUTCDate()`, 25)
-	check(`abc.getDay()`, int(time.Weekday()))
-	check(`abc.getUTCDay()`, 2)
-	check(`abc.getHours()`, time.Hour())
-	check(`abc.getUTCHours()`, 23)
-	check(`abc.getMinutes()`, time.Minute())
-	check(`abc.getUTCMinutes()`, 38)
-	check(`abc.getSeconds()`, time.Second())
-	check(`abc.getUTCSeconds()`, 33)
-	check(`abc.getMilliseconds()`, time.Nanosecond()/(1000*1000)) // In honor of the 47%
-	check(`abc.getUTCMilliseconds()`, 47)
-	_, offset := time.Zone()
-	check(`abc.getTimezoneOffset()`, offset/-60)
-
-	test(`new Date("Xyzzy").getTime()`, "NaN")
-
-	test(`abc.setFullYear(2011); abc.toUTCString()`, "Sun, 25 Sep 2011 23:38:33 UTC")
-	test(`new Date(12564504e5).toUTCString()`, "Sun, 25 Oct 2009 06:00:00 UTC")
-	test(`new Date(2009, 9, 25).toUTCString()`, "Sun, 25 Oct 2009 00:00:00 UTC")
-	test(`+(new Date(2009, 9, 25))`, "1256428800000")
-
-	format := "Mon, 2 Jan 2006 15:04:05 MST"
-
-	tme := Time.Unix(1256450400, 0)
-	time = Time.Date(tme.Year(), tme.Month(), tme.Day(), tme.Hour(), tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-
-	time = Time.Date(tme.Year(), tme.Month(), tme.Day(), tme.Hour(), tme.Minute(), tme.Second(), 2001*1000*1000, tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setMilliseconds(2001); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), tme.Month(), tme.Day(), tme.Hour(), tme.Minute(), 61, tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setSeconds("61"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), tme.Month(), tme.Day(), tme.Hour(), 61, tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setMinutes("61"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), tme.Month(), tme.Day(), 5, tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setHours("5"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), tme.Month(), 26, tme.Hour(), tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setDate("26"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), 10, tme.Day(), tme.Hour(), tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setMonth(9); abc.toUTCString()`, time.Format(format))
-	test(`abc = new Date(12564504e5); abc.setMonth("09"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(tme.Year(), 11, tme.Day(), tme.Hour(), tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setMonth("10"); abc.toUTCString()`, time.Format(format))
-
-	time = Time.Date(2010, tme.Month(), tme.Day(), tme.Hour(), tme.Minute(), tme.Second(), tme.Nanosecond(), tme.Location()).UTC()
-	test(`abc = new Date(12564504e5); abc.setFullYear(2010); abc.toUTCString()`, time.Format(format))
-
-	test(`new Date("2001-01-01T10:01:02.000").getTime()`, "978343262000")
-
-	// Date()
-	test(`typeof Date()`, "string")
-	test(`typeof Date(2006, 1, 2)`, "string")
-
-	test(`
-        abc = Object.getOwnPropertyDescriptor(Date, "parse");
-        [ abc.value === Date.parse, abc.writable, abc.enumerable, abc.configurable ];
-    `, "true,true,false,true")
-
-	test(`
-        abc = Object.getOwnPropertyDescriptor(Date.prototype, "toTimeString");
-        [ abc.value === Date.prototype.toTimeString, abc.writable, abc.enumerable, abc.configurable ];
-    `, "true,true,false,true")
-
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(Date, "prototype");
-        [   [ typeof Date.prototype ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "object,false,false,false")
-}
-
-func TestDate_parse(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Date.parse("2001-01-01T10:01:02.000")`, "978343262000")
-	test(`Date.parse("2006-01-02T15:04:05.000")`, "1136214245000")
-	test(`Date.parse("2006")`, "1136073600000")
-	test(`Date.parse("1970-01-16T14:36:56+00:00")`, "1348616000")
-	test(`Date.parse("1970-01-16T14:36:56.313+00:00")`, "1348616313")
-	test(`Date.parse("1970-01-16T14:36:56.000")`, "1348616000")
-}
-
-func TestDate_UTC(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Date.UTC(2009, 9, 25)`, "1256428800000")
-}
-
-func TestDate_now(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	time := Time.Now()
-	test(`(""+Date.now()).substr(0, 10)`, strconv.FormatInt(epochToInteger(timeToEpoch(time)), 10)[:10])
-	test(`Date.now() === Date.now(1,2,3)`, "true")
-}
-
-func TestDate_toISOString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`new Date(0).toISOString()`, "1970-01-01T00:00:00.000Z")
-}
-
-func TestDate_toJSON(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`new Date(0).toJSON()`, "1970-01-01T00:00:00.000Z")
-}
-
-func TestDate_setYear(t *testing.T) {
-	Terst(t)
-
-	// Passing or failing should not be dependent on what time zone we're in
-	defer mockTimeLocal(Time.UTC)()
-
-	test := runTest()
-	test(`new Date(12564504e5).setYear(96)`, "846223200000")
-	test(`new Date(12564504e5).setYear(1996)`, "846223200000")
-	test(`new Date(12564504e5).setYear(2000)`, "972453600000")
-}
-
-func mockTimeLocal(location *Time.Location) func() {
-	local := Time.Local
-	Time.Local = location
-	return func() {
-		Time.Local = local
-	}
-}
-
-func TestDateDefaultValue(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var date = new Date();
-        date + 0 === date.toString() + "0";
-    `, "true")
-}
-
-func TestDate_April1978(t *testing.T) {
-	Terst(t)
-
-	// Passing or failing should not be dependent on what time zone we're in
-	defer mockTimeLocal(Time.UTC)()
-
-	test := runTest()
-	test(`
-        var abc = new Date(1978,3);
-        [ abc.getYear(), abc.getMonth(), abc.valueOf() ];
-    `, "78,3,260236800000")
-}
-
-func TestDate_setMilliseconds(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        abc = new Date();
-        def = abc.setMilliseconds();
-        [ abc, def ];
-    `, "Invalid Date,NaN")
-}
diff --git a/vendor/github.com/robertkrimen/otto/dbg.go b/vendor/github.com/robertkrimen/otto/dbg.go
deleted file mode 100644
index 51fbdc206..000000000
--- a/vendor/github.com/robertkrimen/otto/dbg.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file was AUTOMATICALLY GENERATED by dbg-import (smuggol) for github.com/robertkrimen/dbg
-
-package otto
-
-import (
-	Dbg "github.com/robertkrimen/otto/dbg"
-)
-
-var dbg, dbgf = Dbg.New()
diff --git a/vendor/github.com/robertkrimen/otto/dbg/dbg.go b/vendor/github.com/robertkrimen/otto/dbg/dbg.go
deleted file mode 100644
index 83bf6c573..000000000
--- a/vendor/github.com/robertkrimen/otto/dbg/dbg.go
+++ /dev/null
@@ -1,387 +0,0 @@
-// This file was AUTOMATICALLY GENERATED by dbg-import (smuggol) from github.com/robertkrimen/dbg
-
-/*
-Package dbg is a println/printf/log-debugging utility library.
-
-    import (
-        Dbg "github.com/robertkrimen/dbg"
-    )
-
-    dbg, dbgf := Dbg.New()
-
-    dbg("Emit some debug stuff", []byte{120, 121, 122, 122, 121}, math.Pi)
-    # "2013/01/28 16:50:03 Emit some debug stuff [120 121 122 122 121] 3.141592653589793"
-
-    dbgf("With a %s formatting %.2f", "little", math.Pi)
-    # "2013/01/28 16:51:55 With a little formatting (3.14)"
-
-    dbgf("%/fatal//A fatal debug statement: should not be here")
-    # "A fatal debug statement: should not be here"
-    # ...and then, os.Exit(1)
-
-    dbgf("%/panic//Can also panic %s", "this")
-    # "Can also panic this"
-    # ...as a panic, equivalent to: panic("Can also panic this")
-
-    dbgf("Any %s arguments without a corresponding %%", "extra", "are treated like arguments to dbg()")
-    # "2013/01/28 17:14:40 Any extra arguments (without a corresponding %) are treated like arguments to dbg()"
-
-    dbgf("%d %d", 1, 2, 3, 4, 5)
-    # "2013/01/28 17:16:32 Another example: 1 2 3 4 5"
-
-    dbgf("%@: Include the function name for a little context (via %s)", "%@")
-    # "2013... github.com/robertkrimen/dbg.TestSynopsis: Include the function name for a little context (via %@)"
-
-By default, dbg uses log (log.Println, log.Printf, log.Panic, etc.) for output.
-However, you can also provide your own output destination by invoking dbg.New with
-a customization function:
-
-    import (
-        "bytes"
-        Dbg "github.com/robertkrimen/dbg"
-        "os"
-    )
-
-    # dbg to os.Stderr
-    dbg, dbgf := Dbg.New(func(dbgr *Dbgr) {
-        dbgr.SetOutput(os.Stderr)
-    })
-
-    # A slightly contrived example:
-    var buffer bytes.Buffer
-    dbg, dbgf := New(func(dbgr *Dbgr) {
-        dbgr.SetOutput(&buffer)
-    })
-
-*/
-package dbg
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"regexp"
-	"runtime"
-	"strings"
-	"unicode"
-)
-
-type _frmt struct {
-	ctl          string
-	format       string
-	operandCount int
-	panic        bool
-	fatal        bool
-	check        bool
-}
-
-var (
-	ctlTest = regexp.MustCompile(`^\s*%/`)
-	ctlScan = regexp.MustCompile(`%?/(panic|fatal|check)(?:\s|$)`)
-)
-
-func operandCount(format string) int {
-	count := 0
-	end := len(format)
-	for at := 0; at < end; {
-		for at < end && format[at] != '%' {
-			at++
-		}
-		at++
-		if at < end {
-			if format[at] != '%' && format[at] != '@' {
-				count++
-			}
-			at++
-		}
-	}
-	return count
-}
-
-func parseFormat(format string) (frmt _frmt) {
-	if ctlTest.MatchString(format) {
-		format = strings.TrimLeftFunc(format, unicode.IsSpace)
-		index := strings.Index(format, "//")
-		if index != -1 {
-			frmt.ctl = format[0:index]
-			format = format[index+2:] // Skip the second slash via +2 (instead of +1)
-		} else {
-			frmt.ctl = format
-			format = ""
-		}
-		for _, tmp := range ctlScan.FindAllStringSubmatch(frmt.ctl, -1) {
-			for _, value := range tmp[1:] {
-				switch value {
-				case "panic":
-					frmt.panic = true
-				case "fatal":
-					frmt.fatal = true
-				case "check":
-					frmt.check = true
-				}
-			}
-		}
-	}
-	frmt.format = format
-	frmt.operandCount = operandCount(format)
-	return
-}
-
-type Dbgr struct {
-	emit _emit
-}
-
-type DbgFunction func(values ...interface{})
-
-func NewDbgr() *Dbgr {
-	self := &Dbgr{}
-	return self
-}
-
-/*
-New will create and return a pair of debugging functions. You can customize where
-they output to by passing in an (optional) customization function:
-
-    import (
-        Dbg "github.com/robertkrimen/dbg"
-        "os"
-    )
-
-    # dbg to os.Stderr
-    dbg, dbgf := Dbg.New(func(dbgr *Dbgr) {
-        dbgr.SetOutput(os.Stderr)
-    })
-
-*/
-func New(options ...interface{}) (dbg DbgFunction, dbgf DbgFunction) {
-	dbgr := NewDbgr()
-	if len(options) > 0 {
-		if fn, ok := options[0].(func(*Dbgr)); ok {
-			fn(dbgr)
-		}
-	}
-	return dbgr.DbgDbgf()
-}
-
-func (self Dbgr) Dbg(values ...interface{}) {
-	self.getEmit().emit(_frmt{}, "", values...)
-}
-
-func (self Dbgr) Dbgf(values ...interface{}) {
-	self.dbgf(values...)
-}
-
-func (self Dbgr) DbgDbgf() (dbg DbgFunction, dbgf DbgFunction) {
-	dbg = func(vl ...interface{}) {
-		self.Dbg(vl...)
-	}
-	dbgf = func(vl ...interface{}) {
-		self.dbgf(vl...)
-	}
-	return dbg, dbgf // Redundant, but...
-}
-
-func (self Dbgr) dbgf(values ...interface{}) {
-
-	var frmt _frmt
-	if len(values) > 0 {
-		tmp := fmt.Sprint(values[0])
-		frmt = parseFormat(tmp)
-		values = values[1:]
-	}
-
-	buffer_f := bytes.Buffer{}
-	format := frmt.format
-	end := len(format)
-	for at := 0; at < end; {
-		last := at
-		for at < end && format[at] != '%' {
-			at++
-		}
-		if at > last {
-			buffer_f.WriteString(format[last:at])
-		}
-		if at >= end {
-			break
-		}
-		// format[at] == '%'
-		at++
-		// format[at] == ?
-		if format[at] == '@' {
-			depth := 2
-			pc, _, _, _ := runtime.Caller(depth)
-			name := runtime.FuncForPC(pc).Name()
-			buffer_f.WriteString(name)
-		} else {
-			buffer_f.WriteString(format[at-1 : at+1])
-		}
-		at++
-	}
-
-	//values_f := append([]interface{}{}, values[0:frmt.operandCount]...)
-	values_f := values[0:frmt.operandCount]
-	values_dbg := values[frmt.operandCount:]
-	if len(values_dbg) > 0 {
-		// Adjust frmt.format:
-		// (%v instead of %s because: frmt.check)
-		{
-			tmp := format
-			if len(tmp) > 0 {
-				if unicode.IsSpace(rune(tmp[len(tmp)-1])) {
-					buffer_f.WriteString("%v")
-				} else {
-					buffer_f.WriteString(" %v")
-				}
-			} else if frmt.check {
-				// Performing a check, so no output
-			} else {
-				buffer_f.WriteString("%v")
-			}
-		}
-
-		// Adjust values_f:
-		if !frmt.check {
-			tmp := []string{}
-			for _, value := range values_dbg {
-				tmp = append(tmp, fmt.Sprintf("%v", value))
-			}
-			// First, make a copy of values_f, so we avoid overwriting values_dbg when appending
-			values_f = append([]interface{}{}, values_f...)
-			values_f = append(values_f, strings.Join(tmp, " "))
-		}
-	}
-
-	format = buffer_f.String()
-	if frmt.check {
-		// We do not actually emit to the log, but panic if
-		// a non-nil value is detected (e.g. a non-nil error)
-		for _, value := range values_dbg {
-			if value != nil {
-				if format == "" {
-					panic(value)
-				} else {
-					panic(fmt.Sprintf(format, append(values_f, value)...))
-				}
-			}
-		}
-	} else {
-		self.getEmit().emit(frmt, format, values_f...)
-	}
-}
-
-// Idiot-proof &Dbgr{}, etc.
-func (self *Dbgr) getEmit() _emit {
-	if self.emit == nil {
-		self.emit = standardEmit()
-	}
-	return self.emit
-}
-
-// SetOutput will accept the following as a destination for output:
-//
-//      *log.Logger         Print*/Panic*/Fatal* of the logger
-//      io.Writer           - 
-//      nil                 Reset to the default output (os.Stderr)
-//      "log"               Print*/Panic*/Fatal* via the "log" package
-//
-func (self *Dbgr) SetOutput(output interface{}) {
-	if output == nil {
-		self.emit = standardEmit()
-		return
-	}
-	switch output := output.(type) {
-	case *log.Logger:
-		self.emit = _emitLogger{
-			logger: output,
-		}
-		return
-	case io.Writer:
-		self.emit = _emitWriter{
-			writer: output,
-		}
-		return
-	case string:
-		if output == "log" {
-			self.emit = _emitLog{}
-			return
-		}
-	}
-	panic(output)
-}
-
-// ======== //
-// = emit = //
-// ======== //
-
-func standardEmit() _emit {
-	return _emitWriter{
-		writer: os.Stderr,
-	}
-}
-
-func ln(tmp string) string {
-	length := len(tmp)
-	if length > 0 && tmp[length-1] != '\n' {
-		return tmp + "\n"
-	}
-	return tmp
-}
-
-type _emit interface {
-	emit(_frmt, string, ...interface{})
-}
-
-type _emitWriter struct {
-	writer io.Writer
-}
-
-func (self _emitWriter) emit(frmt _frmt, format string, values ...interface{}) {
-	if format == "" {
-		fmt.Fprintln(self.writer, values...)
-	} else {
-		if frmt.panic {
-			panic(fmt.Sprintf(format, values...))
-		}
-		fmt.Fprintf(self.writer, ln(format), values...)
-		if frmt.fatal {
-			os.Exit(1)
-		}
-	}
-}
-
-type _emitLogger struct {
-	logger *log.Logger
-}
-
-func (self _emitLogger) emit(frmt _frmt, format string, values ...interface{}) {
-	if format == "" {
-		self.logger.Println(values...)
-	} else {
-		if frmt.panic {
-			self.logger.Panicf(format, values...)
-		} else if frmt.fatal {
-			self.logger.Fatalf(format, values...)
-		} else {
-			self.logger.Printf(format, values...)
-		}
-	}
-}
-
-type _emitLog struct {
-}
-
-func (self _emitLog) emit(frmt _frmt, format string, values ...interface{}) {
-	if format == "" {
-		log.Println(values...)
-	} else {
-		if frmt.panic {
-			log.Panicf(format, values...)
-		} else if frmt.fatal {
-			log.Fatalf(format, values...)
-		} else {
-			log.Printf(format, values...)
-		}
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/environment.go b/vendor/github.com/robertkrimen/otto/environment.go
deleted file mode 100644
index 31e0fac51..000000000
--- a/vendor/github.com/robertkrimen/otto/environment.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-// _environment
-
-type _environment interface {
-	HasBinding(string) bool
-
-	CreateMutableBinding(string, bool)
-	SetMutableBinding(string, Value, bool)
-	// SetMutableBinding with Lazy CreateMutableBinding(..., true)
-	SetValue(string, Value, bool)
-
-	GetBindingValue(string, bool) Value
-	GetValue(string, bool) Value // GetBindingValue
-	DeleteBinding(string) bool
-	ImplicitThisValue() *_object
-
-	Outer() _environment
-
-	newReference(string, bool) _reference
-	clone(clone *_clone) _environment
-}
-
-// _functionEnvironment
-
-type _functionEnvironment struct {
-	_declarativeEnvironment
-	arguments           *_object
-	indexOfArgumentName map[string]string
-}
-
-func (runtime *_runtime) newFunctionEnvironment(outer _environment) *_functionEnvironment {
-	return &_functionEnvironment{
-		_declarativeEnvironment: _declarativeEnvironment{
-			runtime:  runtime,
-			outer:    outer,
-			property: map[string]_declarativeProperty{},
-		},
-	}
-}
-
-func (self0 _functionEnvironment) clone(clone *_clone) _environment {
-	return &_functionEnvironment{
-		*(self0._declarativeEnvironment.clone(clone).(*_declarativeEnvironment)),
-		clone.object(self0.arguments),
-		self0.indexOfArgumentName,
-	}
-}
-
-//func (self *_functionEnvironment) newReference(name string, strict bool) _reference {
-//    index, exists := self.indexOfArgumentName[name]
-//    if !exists {
-//        return self._declarativeEnvironment.newReference(name, strict)
-//    }
-//    return newArgumentReference(self.arguments, index, strict)
-//}
-
-//func (self *_functionEnvironment) HasBinding(name string) bool {
-//    _, exists := self.indexOfArgumentName[name]
-//    if exists {
-//        return true
-//    }
-//    return self._declarativeEnvironment.HasBinding(name)
-//}
-
-// _objectEnvironment
-
-type _objectEnvironment struct {
-	runtime     *_runtime
-	outer       _environment
-	Object      *_object
-	ProvideThis bool
-}
-
-func (runtime *_runtime) newObjectEnvironment(object *_object, outer _environment) *_objectEnvironment {
-	if object == nil {
-		object = runtime.newBaseObject()
-		object.class = "environment"
-	}
-	return &_objectEnvironment{
-		runtime: runtime,
-		outer:   outer,
-		Object:  object,
-	}
-}
-
-func (self0 *_objectEnvironment) clone(clone *_clone) _environment {
-	self1, exists := clone.objectEnvironment(self0)
-	if exists {
-		return self1
-	}
-	*self1 = _objectEnvironment{
-		clone.runtime,
-		clone.environment(self0.outer),
-		clone.object(self0.Object),
-		self0.ProvideThis,
-	}
-	return self1
-}
-
-func (self *_objectEnvironment) HasBinding(name string) bool {
-	return self.Object.hasProperty(name)
-}
-
-func (self *_objectEnvironment) CreateMutableBinding(name string, deletable bool) {
-	if self.Object.hasProperty(name) {
-		panic(hereBeDragons())
-	}
-	mode := _propertyMode(0111)
-	if !deletable {
-		mode = _propertyMode(0110)
-	}
-	// TODO False?
-	self.Object.defineProperty(name, UndefinedValue(), mode, false)
-}
-
-func (self *_objectEnvironment) SetMutableBinding(name string, value Value, strict bool) {
-	self.Object.put(name, value, strict)
-}
-
-func (self *_objectEnvironment) SetValue(name string, value Value, throw bool) {
-	if !self.HasBinding(name) {
-		self.CreateMutableBinding(name, true) // Configurable by default
-	}
-	self.SetMutableBinding(name, value, throw)
-}
-
-func (self *_objectEnvironment) GetBindingValue(name string, strict bool) Value {
-	if self.Object.hasProperty(name) {
-		return self.Object.get(name)
-	}
-	if strict {
-		panic(newReferenceError("Not Defined", name))
-	}
-	return UndefinedValue()
-}
-
-func (self *_objectEnvironment) GetValue(name string, throw bool) Value {
-	return self.GetBindingValue(name, throw)
-}
-
-func (self *_objectEnvironment) DeleteBinding(name string) bool {
-	return self.Object.delete(name, false)
-}
-
-func (self *_objectEnvironment) ImplicitThisValue() *_object {
-	if self.ProvideThis {
-		return self.Object
-	}
-	return nil
-}
-
-func (self *_objectEnvironment) Outer() _environment {
-	return self.outer
-}
-
-func (self *_objectEnvironment) newReference(name string, strict bool) _reference {
-	return newPropertyReference(self.Object, name, strict, nil)
-}
-
-// _declarativeEnvironment
-
-func (runtime *_runtime) newDeclarativeEnvironment(outer _environment) *_declarativeEnvironment {
-	return &_declarativeEnvironment{
-		runtime:  runtime,
-		outer:    outer,
-		property: map[string]_declarativeProperty{},
-	}
-}
-
-func (self0 *_declarativeEnvironment) clone(clone *_clone) _environment {
-	self1, exists := clone.declarativeEnvironment(self0)
-	if exists {
-		return self1
-	}
-	property := make(map[string]_declarativeProperty, len(self0.property))
-	for index, value := range self0.property {
-		property[index] = clone.declarativeProperty(value)
-	}
-	*self1 = _declarativeEnvironment{
-		clone.runtime,
-		clone.environment(self0.outer),
-		property,
-	}
-	return self1
-}
-
-type _declarativeProperty struct {
-	value     Value
-	mutable   bool
-	deletable bool
-	readable  bool
-}
-
-type _declarativeEnvironment struct {
-	runtime  *_runtime
-	outer    _environment
-	property map[string]_declarativeProperty
-}
-
-func (self *_declarativeEnvironment) HasBinding(name string) bool {
-	_, exists := self.property[name]
-	return exists
-}
-
-func (self *_declarativeEnvironment) CreateMutableBinding(name string, deletable bool) {
-	_, exists := self.property[name]
-	if exists {
-		panic(fmt.Errorf("CreateMutableBinding: %s: already exists", name))
-	}
-	self.property[name] = _declarativeProperty{
-		value:     UndefinedValue(),
-		mutable:   true,
-		deletable: deletable,
-		readable:  false,
-	}
-}
-
-func (self *_declarativeEnvironment) SetMutableBinding(name string, value Value, strict bool) {
-	property, exists := self.property[name]
-	if !exists {
-		panic(fmt.Errorf("SetMutableBinding: %s: missing", name))
-	}
-	if property.mutable {
-		property.value = value
-		self.property[name] = property
-	} else {
-		typeErrorResult(strict)
-	}
-}
-
-func (self *_declarativeEnvironment) SetValue(name string, value Value, throw bool) {
-	if !self.HasBinding(name) {
-		self.CreateMutableBinding(name, false) // NOT deletable by default
-	}
-	self.SetMutableBinding(name, value, throw)
-}
-
-func (self *_declarativeEnvironment) GetBindingValue(name string, strict bool) Value {
-	property, exists := self.property[name]
-	if !exists {
-		panic(fmt.Errorf("GetBindingValue: %s: missing", name))
-	}
-	if !property.mutable && !property.readable {
-		if strict {
-			panic(newTypeError())
-		}
-		return UndefinedValue()
-	}
-	return property.value
-}
-
-func (self *_declarativeEnvironment) GetValue(name string, throw bool) Value {
-	return self.GetBindingValue(name, throw)
-}
-
-func (self *_declarativeEnvironment) DeleteBinding(name string) bool {
-	property, exists := self.property[name]
-	if !exists {
-		return true
-	}
-	if !property.deletable {
-		return false
-	}
-	delete(self.property, name)
-	return true
-}
-
-func (self *_declarativeEnvironment) ImplicitThisValue() *_object {
-	return nil
-}
-
-func (self *_declarativeEnvironment) Outer() _environment {
-	return self.outer
-}
-
-func (self *_declarativeEnvironment) newReference(name string, strict bool) _reference {
-	return newEnvironmentReference(self, name, strict, nil)
-}
diff --git a/vendor/github.com/robertkrimen/otto/error.go b/vendor/github.com/robertkrimen/otto/error.go
deleted file mode 100644
index 698f11045..000000000
--- a/vendor/github.com/robertkrimen/otto/error.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package otto
-
-import (
-	"errors"
-	"fmt"
-)
-
-type _error struct {
-	Name    string
-	Message string
-
-	Line int // Hackish -- line where the error/exception occurred
-}
-
-var messageDetail map[string]string = map[string]string{
-	"notDefined": "%v is not defined",
-}
-
-func messageFromDescription(description string, argumentList ...interface{}) string {
-	message := messageDetail[description]
-	if message == "" {
-		message = description
-	}
-	message = fmt.Sprintf(message, argumentList...)
-	return message
-}
-
-func (self _error) MessageValue() Value {
-	if self.Message == "" {
-		return UndefinedValue()
-	}
-	return toValue_string(self.Message)
-}
-
-func (self _error) String() string {
-	if len(self.Name) == 0 {
-		return self.Message
-	}
-	if len(self.Message) == 0 {
-		return self.Name
-	}
-	return fmt.Sprintf("%s: %s", self.Name, self.Message)
-}
-
-func newError(name string, argumentList ...interface{}) _error {
-	description := ""
-	var node _node = nil
-	length := len(argumentList)
-	if length > 0 {
-		if node, _ = argumentList[length-1].(_node); node != nil || argumentList[length-1] == nil {
-			argumentList = argumentList[0 : length-1]
-			length -= 1
-		}
-		if length > 0 {
-			description, argumentList = argumentList[0].(string), argumentList[1:]
-		}
-	}
-	error := _error{
-		Name:    name,
-		Message: messageFromDescription(description, argumentList...),
-		Line:    -1,
-	}
-	if node != nil {
-		error.Line = node.position()
-	}
-	return error
-}
-
-func newReferenceError(argumentList ...interface{}) _error {
-	return newError("ReferenceError", argumentList...)
-}
-
-func newTypeError(argumentList ...interface{}) _error {
-	return newError("TypeError", argumentList...)
-}
-
-func newRangeError(argumentList ...interface{}) _error {
-	return newError("RangeError", argumentList...)
-}
-
-func newSyntaxError(argumentList ...interface{}) _error {
-	return newError("SyntaxError", argumentList...)
-}
-
-func newURIError(argumentList ...interface{}) _error {
-	return newError("URIError", argumentList...)
-}
-
-func typeErrorResult(throw bool) bool {
-	if throw {
-		panic(newTypeError())
-	}
-	return false
-}
-
-func catchPanic(function func()) (err error) {
-	defer func() {
-		if caught := recover(); caught != nil {
-			switch caught := caught.(type) {
-			case *_syntaxError:
-				err = errors.New(fmt.Sprintf("%s (line %d)", caught.String(), caught.Line+0))
-				return
-			case _error:
-				if caught.Line == -1 {
-					err = errors.New(caught.String())
-				} else {
-					// We're 0-based (for now), hence the + 1
-					err = errors.New(fmt.Sprintf("%s (line %d)", caught.String(), caught.Line+1))
-				}
-				return
-			case Value:
-				err = errors.New(toString(caught))
-				return
-			}
-			panic(caught)
-		}
-	}()
-	function()
-	return nil
-}
-
-// SyntaxError
-
-type _syntaxError struct {
-	Message   string
-	Line      int
-	Column    int
-	Character int
-}
-
-func (self _syntaxError) String() string {
-	name := "SyntaxError"
-	if len(self.Message) == 0 {
-		return name
-	}
-	return fmt.Sprintf("%s: %s", name, self.Message)
-}
-
-func (self _token) newSyntaxError(description string, argumentList ...interface{}) *_syntaxError {
-	return &_syntaxError{
-		Message:   messageFromDescription(description, argumentList...),
-		Line:      self.Line,
-		Column:    self.Column,
-		Character: self.Character,
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/error_test.go b/vendor/github.com/robertkrimen/otto/error_test.go
deleted file mode 100644
index 87e8f6fe5..000000000
--- a/vendor/github.com/robertkrimen/otto/error_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestError(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        [ Error.prototype.name, Error.prototype.message, Error.prototype.hasOwnProperty("message") ];
-    `, "Error,,true")
-}
-
-func TestError_instanceof(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        (new TypeError()) instanceof Error
-    `, "true")
-}
-
-func TestPanicValue(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	failSet("abc", func(call FunctionCall) Value {
-		value, err := call.Otto.Run(`({ def: 3.14159 })`)
-		Is(err, nil)
-		panic(value)
-	})
-	test(`
-        try {
-            abc();
-        }
-        catch (err) {
-            error = err;
-        }
-        [ error instanceof Error, error.message, error.def ];
-    `, "false,,3.14159")
-}
-
-func Test_catchPanic(t *testing.T) {
-	Terst(t)
-
-	// TODO This is here because ToValue(nil) was failing
-	return
-
-	otto, _ := runTestWithOtto()
-	_, err := otto.Run(`
-        A syntax error that
-        does not define
-        var;
-            abc;
-    `)
-	IsNot(err, nil)
-
-	_, err = otto.Call(`abc.def`, nil)
-	IsNot(err, nil)
-}
diff --git a/vendor/github.com/robertkrimen/otto/evaluate.go b/vendor/github.com/robertkrimen/otto/evaluate.go
deleted file mode 100644
index 469698f05..000000000
--- a/vendor/github.com/robertkrimen/otto/evaluate.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-func (self *_runtime) evaluateBody(body []_node) Value {
-	bodyValue := Value{}
-	for _, node := range body {
-		value := self.evaluate(node)
-		if value.isResult() {
-			return value
-		}
-		if !value.isEmpty() {
-			// We have GetValue here to (for example) trigger a
-			// ReferenceError (of the not defined variety)
-			// Not sure if this is the best way to error out early
-			// for such errors or if there is a better way
-			bodyValue = self.GetValue(value)
-		}
-	}
-	return bodyValue
-}
-
-func (self *_runtime) evaluate(node _node) Value {
-	defer func() {
-		// This defer is lame (unecessary overhead)
-		// It would be better to mark the errors at the source
-		if caught := recover(); caught != nil {
-			switch caught := caught.(type) {
-			case _error:
-				if caught.Line == -1 {
-					caught.Line = node.position()
-				}
-				panic(caught) // Panic the modified _error
-			}
-			panic(caught)
-		}
-	}()
-
-	switch node := node.(type) {
-
-	case *_variableDeclarationListNode:
-		return self.evaluateVariableDeclarationList(node)
-
-	case *_variableDeclarationNode:
-		return self.evaluateVariableDeclaration(node)
-
-	case *_programNode:
-		self.declare("function", node.FunctionList)
-		self.declare("variable", node.VariableList)
-		return self.evaluateBody(node.Body)
-
-	case *_blockNode:
-		return self.evaluateBlock(node)
-
-	case *_valueNode:
-		return self.evaluateValue(node)
-
-	case *_identifierNode:
-		return self.evaluateIdentifier(node)
-
-	case *_functionNode:
-		return self.evaluateFunction(node)
-
-	case *_binaryOperationNode:
-		return self.evaluateBinaryOperation(node)
-
-	case *_assignmentNode:
-		return self.evaluateAssignment(node)
-
-	case *_unaryOperationNode:
-		return self.evaluateUnaryOperation(node)
-
-	case *_comparisonNode:
-		return self.evaluateComparison(node)
-
-	case *_returnNode:
-		value := self.evaluateReturn(node)
-		return value
-		return self.evaluateReturn(node)
-
-	case *_ifNode:
-		return self.evaluateIf(node)
-
-	case *_doWhileNode:
-		return self.evaluateDoWhile(node)
-
-	case *_whileNode:
-		return self.evaluateWhile(node)
-
-	case *_callNode:
-		return self.evaluateCall(node, nil)
-
-	case *_continueNode:
-		return toValue(newContinueResult(node.Target))
-
-	case *_switchNode:
-		return self.evaluateSwitch(node)
-
-	case *_forNode:
-		return self.evaluateFor(node)
-
-	case *_forInNode:
-		return self.evaluateForIn(node)
-
-	case *_breakNode:
-		return toValue(newBreakResult(node.Target))
-
-	case *_throwNode:
-		return self.evaluateThrow(node)
-
-	case *_emptyNode:
-		return emptyValue()
-
-	case *_tryCatchNode:
-		return self.evaluateTryCatch(node)
-
-	case *_dotMemberNode:
-		return self.evaluateDotMember(node)
-
-	case *_bracketMemberNode:
-		return self.evaluateBracketMember(node)
-
-	case *_objectNode:
-		return self.evaluateObject(node)
-
-	case *_regExpNode:
-		return self.evaluateRegExp(node)
-
-	case *_arrayNode:
-		return self.evaluateArray(node)
-
-	case *_newNode:
-		return self.evaluateNew(node)
-
-	case *_conditionalNode:
-		return self.evaluateConditional(node)
-
-	case *_thisNode:
-		return toValue_object(self._executionContext(0).this)
-
-	case *_commaNode:
-		return self.evaluateComma(node)
-
-	case *_withNode:
-		return self.evaluateWith(node)
-
-	}
-
-	panic(fmt.Sprintf("evaluate: Here be dragons: %T %v", node, node))
-}
diff --git a/vendor/github.com/robertkrimen/otto/evaluate_expression.go b/vendor/github.com/robertkrimen/otto/evaluate_expression.go
deleted file mode 100644
index 170bbdd2b..000000000
--- a/vendor/github.com/robertkrimen/otto/evaluate_expression.go
+++ /dev/null
@@ -1,573 +0,0 @@
-package otto
-
-import (
-	"math"
-	"strings"
-)
-
-func (self *_runtime) evaluateConditional(node *_conditionalNode) Value {
-	test := self.evaluate(node.Test)
-	testValue := self.GetValue(test)
-	if toBoolean(testValue) {
-		return self.evaluate(node.Consequent)
-	}
-	return self.evaluate(node.Alternate)
-}
-
-func (self *_runtime) evaluateNew(node *_newNode) Value {
-	callee := self.evaluate(node.Callee)
-	calleeValue := self.GetValue(callee)
-	argumentList := []Value{}
-	for _, argumentNode := range node.ArgumentList {
-		argumentList = append(argumentList, self.GetValue(self.evaluate(argumentNode)))
-	}
-	this := UndefinedValue()
-	if !calleeValue.IsFunction() {
-		panic(newTypeError("%v is not a function", calleeValue))
-	}
-	return calleeValue._object().Construct(this, argumentList)
-}
-
-func (self *_runtime) evaluateArray(node *_arrayNode) Value {
-
-	valueArray := []Value{}
-
-	for _, node := range node.nodeList {
-		valueArray = append(valueArray, self.GetValue(self.evaluate(node)))
-	}
-
-	result := self.newArrayOf(valueArray)
-
-	return toValue_object(result)
-}
-
-func (self *_runtime) evaluateObject(node *_objectNode) Value {
-
-	result := self.newObject()
-
-	for _, property := range node.propertyList {
-		result.defineProperty(property.Key, self.GetValue(self.evaluate(property.Value)), 0111, false)
-	}
-
-	return toValue_object(result)
-}
-
-func (self *_runtime) evaluateRegExp(node *_regExpNode) Value {
-	return toValue_object(self._newRegExp(node.Pattern, node.Flags))
-}
-
-func (self *_runtime) evaluateUnaryOperation(node *_unaryOperationNode) Value {
-
-	target := self.evaluate(node.Target)
-	switch node.Operator {
-	case "typeof", "delete":
-		if target._valueType == valueReference && target.reference().IsUnresolvable() {
-			if node.Operator == "typeof" {
-				return toValue_string("undefined")
-			}
-			return TrueValue()
-		}
-	}
-
-	targetValue := self.GetValue(target)
-
-	switch node.Operator {
-	case "!":
-		if targetValue.toBoolean() {
-			return FalseValue()
-		}
-		return TrueValue()
-	case "~":
-		integerValue := toInt32(targetValue)
-		return toValue_int32(^integerValue)
-	case "+":
-		return toValue_float64(targetValue.toFloat())
-	case "-":
-		value := targetValue.toFloat()
-		// TODO Test this
-		sign := float64(-1)
-		if math.Signbit(value) {
-			sign = 1
-		}
-		return toValue_float64(math.Copysign(value, sign))
-	case "++=": // Prefix ++
-		newValue := toValue_float64(+1 + targetValue.toFloat())
-		self.PutValue(target.reference(), newValue)
-		return newValue
-	case "--=": // Prefix --
-		newValue := toValue_float64(-1 + targetValue.toFloat())
-		self.PutValue(target.reference(), newValue)
-		return newValue
-	case "=++": // Postfix ++
-		oldValue := targetValue.toFloat()
-		newValue := toValue_float64(+1 + oldValue)
-		self.PutValue(target.reference(), newValue)
-		return toValue_float64(oldValue)
-	case "=--": // Postfix --
-		oldValue := targetValue.toFloat()
-		newValue := toValue_float64(-1 + oldValue)
-		self.PutValue(target.reference(), newValue)
-		return toValue_float64(oldValue)
-	case "void":
-		return UndefinedValue()
-	case "delete":
-		reference := target.reference()
-		if reference == nil {
-			return TrueValue()
-		}
-		return toValue_bool(target.reference().Delete())
-	case "typeof":
-		switch targetValue._valueType {
-		case valueUndefined:
-			return toValue_string("undefined")
-		case valueNull:
-			return toValue_string("object")
-		case valueBoolean:
-			return toValue_string("boolean")
-		case valueNumber:
-			return toValue_string("number")
-		case valueString:
-			return toValue_string("string")
-		case valueObject:
-			if targetValue._object().functionValue().call != nil {
-				return toValue_string("function")
-			}
-			return toValue_string("object")
-		default:
-			// ?
-		}
-	}
-
-	panic(hereBeDragons())
-}
-
-func (self *_runtime) evaluateMultiply(left float64, right float64) Value {
-	// TODO 11.5.1
-	return UndefinedValue()
-}
-
-func (self *_runtime) evaluateDivide(left float64, right float64) Value {
-	if math.IsNaN(left) || math.IsNaN(right) {
-		return NaNValue()
-	}
-	if math.IsInf(left, 0) && math.IsInf(right, 0) {
-		return NaNValue()
-	}
-	if left == 0 && right == 0 {
-		return NaNValue()
-	}
-	if math.IsInf(left, 0) {
-		if math.Signbit(left) == math.Signbit(right) {
-			return positiveInfinityValue()
-		} else {
-			return negativeInfinityValue()
-		}
-	}
-	if math.IsInf(right, 0) {
-		if math.Signbit(left) == math.Signbit(right) {
-			return positiveZeroValue()
-		} else {
-			return negativeZeroValue()
-		}
-	}
-	if right == 0 {
-		if math.Signbit(left) == math.Signbit(right) {
-			return positiveInfinityValue()
-		} else {
-			return negativeInfinityValue()
-		}
-	}
-	return toValue_float64(left / right)
-}
-
-func (self *_runtime) evaluateModulo(left float64, right float64) Value {
-	// TODO 11.5.3
-	return UndefinedValue()
-}
-
-func (self *_runtime) calculateBinaryOperation(operator string, left Value, right Value) Value {
-
-	leftValue := self.GetValue(left)
-
-	switch operator {
-
-	// Additive
-	case "+":
-		leftValue = toPrimitive(leftValue)
-		rightValue := self.GetValue(right)
-		rightValue = toPrimitive(rightValue)
-
-		if leftValue.IsString() || rightValue.IsString() {
-			return toValue_string(strings.Join([]string{leftValue.toString(), rightValue.toString()}, ""))
-		} else {
-			return toValue_float64(leftValue.toFloat() + rightValue.toFloat())
-		}
-	case "-":
-		rightValue := self.GetValue(right)
-		return toValue_float64(leftValue.toFloat() - rightValue.toFloat())
-
-	// Multiplicative
-	case "*":
-		rightValue := self.GetValue(right)
-		return toValue_float64(leftValue.toFloat() * rightValue.toFloat())
-	case "/":
-		rightValue := self.GetValue(right)
-		return self.evaluateDivide(leftValue.toFloat(), rightValue.toFloat())
-	case "%":
-		rightValue := self.GetValue(right)
-		return toValue_float64(math.Mod(leftValue.toFloat(), rightValue.toFloat()))
-
-	// Logical
-	case "&&":
-		left := toBoolean(leftValue)
-		if !left {
-			return FalseValue()
-		}
-		return toValue_bool(toBoolean(self.GetValue(right)))
-	case "||":
-		left := toBoolean(leftValue)
-		if left {
-			return TrueValue()
-		}
-		return toValue_bool(toBoolean(self.GetValue(right)))
-
-	// Bitwise
-	case "&":
-		rightValue := self.GetValue(right)
-		return toValue_int32(toInt32(leftValue) & toInt32(rightValue))
-	case "|":
-		rightValue := self.GetValue(right)
-		return toValue_int32(toInt32(leftValue) | toInt32(rightValue))
-	case "^":
-		rightValue := self.GetValue(right)
-		return toValue_int32(toInt32(leftValue) ^ toInt32(rightValue))
-
-	// Shift
-	// (Masking of 0x1f is to restrict the shift to a maximum of 31 places)
-	case "<<":
-		rightValue := self.GetValue(right)
-		return toValue_int32(toInt32(leftValue) << (toUint32(rightValue) & 0x1f))
-	case ">>":
-		rightValue := self.GetValue(right)
-		return toValue_int32(toInt32(leftValue) >> (toUint32(rightValue) & 0x1f))
-	case ">>>":
-		rightValue := self.GetValue(right)
-		// Shifting an unsigned integer is a logical shift
-		return toValue_uint32(toUint32(leftValue) >> (toUint32(rightValue) & 0x1f))
-
-	case "instanceof":
-		rightValue := self.GetValue(right)
-		if !rightValue.IsObject() {
-			panic(newTypeError("Expecting a function in instanceof check, but got: %v", rightValue))
-		}
-		return toValue_bool(rightValue._object().HasInstance(leftValue))
-
-	case "in":
-		rightValue := self.GetValue(right)
-		if !rightValue.IsObject() {
-			panic(newTypeError())
-		}
-		return toValue_bool(rightValue._object().hasProperty(toString(leftValue)))
-	}
-
-	panic(hereBeDragons(operator))
-}
-
-func (self *_runtime) evaluateAssignment(node *_assignmentNode) Value {
-
-	left := self.evaluate(node.Left)
-	right := self.evaluate(node.Right)
-	rightValue := self.GetValue(right)
-
-	result := rightValue
-	if node.Operator != "" {
-		result = self.calculateBinaryOperation(node.Operator, left, rightValue)
-	}
-
-	self.PutValue(left.reference(), result)
-
-	return result
-}
-
-func valueKindDispatchKey(left _valueType, right _valueType) int {
-	return (int(left) << 2) + int(right)
-}
-
-var equalDispatch map[int](func(Value, Value) bool) = makeEqualDispatch()
-
-func makeEqualDispatch() map[int](func(Value, Value) bool) {
-	key := valueKindDispatchKey
-	return map[int](func(Value, Value) bool){
-
-		key(valueNumber, valueObject): func(x Value, y Value) bool { return x.toFloat() == y.toFloat() },
-		key(valueString, valueObject): func(x Value, y Value) bool { return x.toFloat() == y.toFloat() },
-		key(valueObject, valueNumber): func(x Value, y Value) bool { return x.toFloat() == y.toFloat() },
-		key(valueObject, valueString): func(x Value, y Value) bool { return x.toFloat() == y.toFloat() },
-	}
-}
-
-type _lessThanResult int
-
-const (
-	lessThanFalse _lessThanResult = iota
-	lessThanTrue
-	lessThanUndefined
-)
-
-func calculateLessThan(left Value, right Value, leftFirst bool) _lessThanResult {
-
-	x := UndefinedValue()
-	y := x
-
-	if leftFirst {
-		x = toNumberPrimitive(left)
-		y = toNumberPrimitive(right)
-	} else {
-		y = toNumberPrimitive(right)
-		x = toNumberPrimitive(left)
-	}
-
-	result := false
-	if x._valueType != valueString || y._valueType != valueString {
-		x, y := x.toFloat(), y.toFloat()
-		if math.IsNaN(x) || math.IsNaN(y) {
-			return lessThanUndefined
-		}
-		result = x < y
-	} else {
-		x, y := x.toString(), y.toString()
-		result = x < y
-	}
-
-	if result {
-		return lessThanTrue
-	}
-
-	return lessThanFalse
-}
-
-var lessThanTable [4](map[_lessThanResult]bool) = [4](map[_lessThanResult]bool){
-	// <
-	map[_lessThanResult]bool{
-		lessThanFalse:     false,
-		lessThanTrue:      true,
-		lessThanUndefined: false,
-	},
-
-	// >
-	map[_lessThanResult]bool{
-		lessThanFalse:     false,
-		lessThanTrue:      true,
-		lessThanUndefined: false,
-	},
-
-	// <=
-	map[_lessThanResult]bool{
-		lessThanFalse:     true,
-		lessThanTrue:      false,
-		lessThanUndefined: false,
-	},
-
-	// >=
-	map[_lessThanResult]bool{
-		lessThanFalse:     true,
-		lessThanTrue:      false,
-		lessThanUndefined: false,
-	},
-}
-
-func (self *_runtime) calculateComparison(comparator string, left Value, right Value) bool {
-
-	// TODO This might be redundant now (with regards to evaluateComparison)
-	x := self.GetValue(left)
-	y := self.GetValue(right)
-
-	kindEqualKind := false
-	result := true
-	negate := false
-
-	switch comparator {
-	case "<":
-		result = lessThanTable[0][calculateLessThan(x, y, true)]
-	case ">":
-		result = lessThanTable[1][calculateLessThan(y, x, false)]
-	case "<=":
-		result = lessThanTable[2][calculateLessThan(y, x, false)]
-	case ">=":
-		result = lessThanTable[3][calculateLessThan(x, y, true)]
-	case "!==":
-		negate = true
-		fallthrough
-	case "===":
-		if x._valueType != y._valueType {
-			result = false
-		} else {
-			kindEqualKind = true
-		}
-	case "!=":
-		negate = true
-		fallthrough
-	case "==":
-		if x._valueType == y._valueType {
-			kindEqualKind = true
-		} else if x._valueType <= valueUndefined && y._valueType <= valueUndefined {
-			result = true
-		} else if x._valueType <= valueUndefined || y._valueType <= valueUndefined {
-			result = false
-		} else if x._valueType <= valueString && y._valueType <= valueString {
-			result = x.toFloat() == y.toFloat()
-		} else if x._valueType == valueBoolean {
-			result = self.calculateComparison("==", toValue_float64(x.toFloat()), y)
-		} else if y._valueType == valueBoolean {
-			result = self.calculateComparison("==", x, toValue_float64(y.toFloat()))
-		} else if x._valueType == valueObject {
-			result = self.calculateComparison("==", toPrimitive(x), y)
-		} else if y._valueType == valueObject {
-			result = self.calculateComparison("==", x, toPrimitive(y))
-		} else {
-			panic(hereBeDragons("Unable to test for equality: %v ==? %v", x, y))
-		}
-	}
-
-	if kindEqualKind {
-		switch x._valueType {
-		case valueUndefined, valueNull:
-			result = true
-		case valueNumber:
-			x := x.toFloat()
-			y := y.toFloat()
-			if math.IsNaN(x) || math.IsNaN(y) {
-				result = false
-			} else {
-				result = x == y
-			}
-		case valueString:
-			result = x.toString() == y.toString()
-		case valueBoolean:
-			result = x.toBoolean() == y.toBoolean()
-		case valueObject:
-			result = x._object() == y._object()
-		default:
-			goto ERROR
-		}
-	}
-
-	if negate {
-		result = !result
-	}
-
-	return result
-
-ERROR:
-	panic(hereBeDragons("%v (%v) %s %v (%v)", x, x._valueType, comparator, y, y._valueType))
-}
-
-func (self *_runtime) evaluateComparison(node *_comparisonNode) Value {
-
-	left := self.GetValue(self.evaluate(node.Left))
-	right := self.GetValue(self.evaluate(node.Right))
-
-	return toValue_bool(self.calculateComparison(node.Comparator, left, right))
-}
-
-func (self *_runtime) evaluateBinaryOperation(node *_binaryOperationNode) Value {
-
-	left := self.evaluate(node.Left)
-	leftValue := self.GetValue(left)
-
-	switch node.Operator {
-	// Logical
-	case "&&":
-		if !toBoolean(leftValue) {
-			return leftValue
-		}
-		right := self.evaluate(node.Right)
-		return self.GetValue(right)
-	case "||":
-		if toBoolean(leftValue) {
-			return leftValue
-		}
-		right := self.evaluate(node.Right)
-		return self.GetValue(right)
-	}
-
-	return self.calculateBinaryOperation(node.Operator, leftValue, self.evaluate(node.Right))
-}
-
-func (self *_runtime) evaluateCall(node *_callNode, withArgumentList []interface{}) Value {
-	callee := self.evaluate(node.Callee)
-	calleeValue := self.GetValue(callee)
-	argumentList := []Value{}
-	if withArgumentList != nil {
-		argumentList = self.toValueArray(withArgumentList...)
-	} else {
-		for _, argumentNode := range node.ArgumentList {
-			argumentList = append(argumentList, self.GetValue(self.evaluate(argumentNode)))
-		}
-	}
-	this := UndefinedValue()
-	calleeReference := callee.reference()
-	evalHint := false
-	if calleeReference != nil {
-		if calleeReference.IsPropertyReference() {
-			calleeObject := calleeReference.GetBase().(*_object)
-			this = toValue_object(calleeObject)
-		} else {
-			// TODO ImplictThisValue
-		}
-		if calleeReference.GetName() == "eval" {
-			evalHint = true // Possible direct eval
-		}
-	}
-	if !calleeValue.IsFunction() {
-		panic(newTypeError("%v is not a function", calleeValue))
-	}
-	return self.Call(calleeValue._object(), this, argumentList, evalHint)
-}
-
-func (self *_runtime) evaluateFunction(node *_functionNode) Value {
-	return toValue_object(self.newNodeFunction(node, self.LexicalEnvironment()))
-}
-
-func (self *_runtime) evaluateDotMember(node *_dotMemberNode) Value {
-	target := self.evaluate(node.Target)
-	targetValue := self.GetValue(target)
-	// TODO Pass in base value as-is, and defer toObject till later?
-	return toValue(newPropertyReference(self.toObject(targetValue), node.Member, false, node))
-}
-
-func (self *_runtime) evaluateBracketMember(node *_bracketMemberNode) Value {
-	target := self.evaluate(node.Target)
-	targetValue := self.GetValue(target)
-	member := self.evaluate(node.Member)
-	memberValue := self.GetValue(member)
-
-	// TODO Pass in base value as-is, and defer toObject till later?
-	return toValue(newPropertyReference(self.toObject(targetValue), toString(memberValue), false, node))
-}
-
-func (self *_runtime) evaluateIdentifier(node *_identifierNode) Value {
-	name := node.Value
-	// TODO Should be true or false (strictness) depending on context
-	// getIdentifierReference should not return nil, but we check anyway and panic
-	// so as not to propagate the nil into something else
-	reference := getIdentifierReference(self.LexicalEnvironment(), name, false, node)
-	if reference == nil {
-		// Should never get here!
-		panic(hereBeDragons("referenceError == nil: " + name))
-	}
-	return toValue(reference)
-}
-
-func (self *_runtime) evaluateValue(node *_valueNode) Value {
-	return node.Value
-}
-
-func (self *_runtime) evaluateComma(node *_commaNode) Value {
-	var result Value
-	for _, node := range node.Sequence {
-		result = self.evaluate(node)
-		result = self.GetValue(result)
-	}
-	return result
-}
diff --git a/vendor/github.com/robertkrimen/otto/evaluate_statement.go b/vendor/github.com/robertkrimen/otto/evaluate_statement.go
deleted file mode 100644
index 19f4f7603..000000000
--- a/vendor/github.com/robertkrimen/otto/evaluate_statement.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package otto
-
-func (self *_runtime) evaluateTryCatch(node *_tryCatchNode) Value {
-	tryCatchValue, exception := self.tryCatchEvaluate(func() Value {
-		return self.evaluate(node.Try)
-	})
-
-	if exception && node.Catch != nil {
-
-		lexicalEnvironment := self._executionContext(0).newDeclarativeEnvironment(self)
-		defer func() {
-			self._executionContext(0).LexicalEnvironment = lexicalEnvironment
-		}()
-		// TODO If necessary, convert TypeError<runtime> => TypeError
-		// That, is, such errors can be thrown despite not being JavaScript "native"
-		self.localSet(node.Catch.Identifier, tryCatchValue)
-
-		tryCatchValue, exception = self.tryCatchEvaluate(func() Value {
-			return self.evaluate(node.Catch.Body)
-		})
-	}
-
-	if node.Finally != nil {
-		finallyValue := self.evaluate(node.Finally)
-		if finallyValue.isResult() {
-			return finallyValue
-		}
-	}
-
-	if exception {
-		panic(tryCatchValue)
-	}
-
-	return tryCatchValue
-}
-
-func (self *_runtime) evaluateVariableDeclarationList(node *_variableDeclarationListNode) Value {
-	for _, node := range node.VariableList {
-		self.evaluateVariableDeclaration(node)
-	}
-	return emptyValue()
-}
-
-func (self *_runtime) evaluateVariableDeclaration(node *_variableDeclarationNode) Value {
-	if node.Operator != "" {
-		// FIXME If reference is nil
-		left := getIdentifierReference(self.LexicalEnvironment(), node.Identifier, false, node)
-		right := self.evaluate(node.Initializer)
-		rightValue := self.GetValue(right)
-
-		self.PutValue(left, rightValue)
-	}
-	return toValue_string(node.Identifier)
-}
-
-func (self *_runtime) evaluateThrow(node *_throwNode) Value {
-	panic(self.GetValue(self.evaluate(node.Argument)))
-}
-
-func (self *_runtime) evaluateReturn(node *_returnNode) Value {
-	value := UndefinedValue()
-	if node.Argument != nil {
-		value = self.GetValue(self.evaluate(node.Argument))
-	}
-
-	return toValue(newReturnResult(value))
-}
-
-func (self *_runtime) evaluateIf(node *_ifNode) Value {
-	test := self.evaluate(node.Test)
-	testValue := self.GetValue(test)
-	if toBoolean(testValue) {
-		return self.evaluate(node.Consequent)
-	} else if node.Alternate != nil {
-		return self.evaluate(node.Alternate)
-	}
-
-	return emptyValue()
-}
-
-func (self *_runtime) evaluateWith(node *_withNode) Value {
-	object := self.evaluate(node.Object)
-	objectValue := self.GetValue(object)
-	previousLexicalEnvironment, lexicalEnvironment := self._executionContext(0).newLexicalEnvironment(self.toObject(objectValue))
-	lexicalEnvironment.ProvideThis = true
-	defer func() {
-		self._executionContext(0).LexicalEnvironment = previousLexicalEnvironment
-	}()
-
-	return self.evaluate(node.Body)
-}
-
-func (self *_runtime) evaluateBlock(node *_blockNode) Value {
-
-	body := node.Body
-	labelSet := node.labelSet
-
-	blockValue := self.evaluateBody(body)
-	if blockValue.evaluateBreak(labelSet) == resultBreak {
-		return Value{}
-	}
-	return blockValue
-}
-
-func (self *_runtime) evaluateDoWhile(node *_doWhileNode) Value {
-
-	test := node.Test
-	body := node.body
-	labelSet := node.labelSet
-
-	doWhileValue := Value{}
-resultBreak:
-	for {
-		for _, node := range body {
-			value := self.evaluate(node)
-			switch value.evaluateBreakContinue(labelSet) {
-			case resultReturn:
-				return value
-			case resultBreak:
-				break resultBreak
-			case resultContinue:
-				goto resultContinue
-			default: // resultNormal
-			}
-			if !value.isEmpty() {
-				doWhileValue = value
-			}
-		}
-	resultContinue:
-		if !self.GetValue(self.evaluate(test)).isTrue() {
-			// Stahp: do ... while (false)
-			break
-		}
-	}
-	return doWhileValue
-}
-
-func (self *_runtime) evaluateWhile(node *_whileNode) Value {
-
-	test := node.Test
-	body := node.body
-	labelSet := node.labelSet
-
-	whileValue := Value{}
-resultBreakContinue:
-	for {
-		if !self.GetValue(self.evaluate(test)).isTrue() {
-			// Stahp: while (false) ...
-			break
-		}
-		for _, node := range body {
-			value := self.evaluate(node)
-			switch value.evaluateBreakContinue(labelSet) {
-			case resultReturn:
-				return value
-			case resultBreak:
-				break resultBreakContinue
-			case resultContinue:
-				continue resultBreakContinue
-			default: // resultNormal
-			}
-			if !value.isEmpty() {
-				whileValue = value
-			}
-		}
-	}
-	return whileValue
-}
-
-func (self *_runtime) evaluateFor(node *_forNode) Value {
-
-	initial := node.Initial
-	test := node.Test
-	body := node.body
-	update := node.Update
-	labelSet := node.labelSet
-
-	if initial != nil {
-		initialResult := self.evaluate(initial)
-		self.GetValue(initialResult) // Side-effect trigger
-	}
-
-	forValue := Value{}
-resultBreak:
-	for {
-		if test != nil {
-			testResult := self.evaluate(test)
-			testResultValue := self.GetValue(testResult)
-			if toBoolean(testResultValue) == false {
-				break
-			}
-		}
-		if test != nil {
-			if !self.GetValue(self.evaluate(test)).isTrue() {
-				// Stahp: for (...; false; ...) ...
-				break
-			}
-		}
-		for _, node := range body {
-			value := self.evaluate(node)
-			switch value.evaluateBreakContinue(labelSet) {
-			case resultReturn:
-				return value
-			case resultBreak:
-				break resultBreak
-			case resultContinue:
-				goto resultContinue
-			default: // resultNormal
-			}
-			if !value.isEmpty() {
-				forValue = value
-			}
-		}
-	resultContinue:
-		if update != nil {
-			updateResult := self.evaluate(update)
-			self.GetValue(updateResult) // Side-effect trigger
-		}
-	}
-	return forValue
-}
-
-func (self *_runtime) evaluateForIn(node *_forInNode) Value {
-
-	source := self.evaluate(node.Source)
-	sourceValue := self.GetValue(source)
-
-	switch sourceValue._valueType {
-	case valueUndefined, valueNull:
-		return emptyValue()
-	}
-
-	sourceObject := self.toObject(sourceValue)
-
-	into := node.Into
-	body := node.body
-	labelSet := node.labelSet
-
-	forInValue := Value{}
-	object := sourceObject
-	for object != nil {
-		enumerateValue := Value{}
-		object.enumerate(false, func(name string) bool {
-			into := self.evaluate(into)
-			// In the case of: for (var abc in def) ...
-			if into.reference() == nil {
-				identifier := toString(into)
-				// TODO Should be true or false (strictness) depending on context
-				into = toValue(getIdentifierReference(self.LexicalEnvironment(), identifier, false, node))
-			}
-			self.PutValue(into.reference(), toValue_string(name))
-			for _, node := range body {
-				value := self.evaluate(node)
-				switch value.evaluateBreakContinue(labelSet) {
-				case resultReturn:
-					enumerateValue = value
-					return false
-				case resultBreak:
-					object = nil
-					return false
-				case resultContinue:
-					return true
-				default: // resultNormal
-				}
-				if !value.isEmpty() {
-					enumerateValue = value
-				}
-			}
-			return true
-		})
-		if object == nil {
-			break
-		}
-		object = object.prototype
-		if !enumerateValue.isEmpty() {
-			forInValue = enumerateValue
-		}
-	}
-	return forInValue
-}
-
-func (self *_runtime) evaluateSwitch(node *_switchNode) Value {
-
-	discriminantResult := self.evaluate(node.Discriminant)
-	target := node.Default
-
-	for index, clause := range node.CaseList {
-		test := clause.Test
-		if test != nil {
-			if self.calculateComparison("===", discriminantResult, self.evaluate(test)) {
-				target = index
-				break
-			}
-		}
-	}
-
-	switchValue := Value{}
-	if target != -1 {
-		labelSet := node.labelSet
-
-		for _, clause := range node.CaseList[target:] {
-			value := self.evaluateBody(clause.Body)
-			switch value.evaluateBreak(labelSet) {
-			case resultReturn:
-				return value
-			case resultBreak:
-				return Value{}
-			}
-			if !value.isEmpty() {
-				switchValue = value
-			}
-		}
-	}
-
-	return switchValue
-}
diff --git a/vendor/github.com/robertkrimen/otto/execution_context.go b/vendor/github.com/robertkrimen/otto/execution_context.go
deleted file mode 100644
index 07d891022..000000000
--- a/vendor/github.com/robertkrimen/otto/execution_context.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package otto
-
-type _executionContext struct {
-	LexicalEnvironment  _environment
-	VariableEnvironment _environment
-	this                *_object
-	eval                bool // Replace this with kind?
-}
-
-func newExecutionContext(lexical _environment, variable _environment, this *_object) *_executionContext {
-	return &_executionContext{
-		LexicalEnvironment:  lexical,
-		VariableEnvironment: variable,
-		this:                this,
-	}
-}
-
-func (self *_executionContext) getValue(name string) Value {
-	strict := false
-	return self.LexicalEnvironment.GetValue(name, strict)
-}
-
-func (self *_executionContext) setValue(name string, value Value, throw bool) {
-	self.LexicalEnvironment.SetValue(name, value, throw)
-}
-
-func (self *_executionContext) newLexicalEnvironment(object *_object) (_environment, *_objectEnvironment) {
-	// Get runtime from the object (for now)
-	runtime := object.runtime
-	previousLexical := self.LexicalEnvironment
-	newLexical := runtime.newObjectEnvironment(object, self.LexicalEnvironment)
-	self.LexicalEnvironment = newLexical
-	return previousLexical, newLexical
-}
-
-func (self *_executionContext) newDeclarativeEnvironment(runtime *_runtime) _environment {
-	previousLexical := self.LexicalEnvironment
-	self.LexicalEnvironment = runtime.newDeclarativeEnvironment(self.LexicalEnvironment)
-	return previousLexical
-}
diff --git a/vendor/github.com/robertkrimen/otto/function_test.go b/vendor/github.com/robertkrimen/otto/function_test.go
deleted file mode 100644
index 3ed197769..000000000
--- a/vendor/github.com/robertkrimen/otto/function_test.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestFunction(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`String.prototype.substring.length`, "2")
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(Function, "prototype");
-        [   [ typeof Function.prototype, typeof Function.prototype.length, Function.prototype.length ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "function,number,0,false,false,false")
-}
-
-func TestFunction_apply(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`String.prototype.substring.length`, "2")
-	test(`String.prototype.substring.apply("abc", [1, 11])`, "bc")
-}
-
-func TestFunction_call(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`String.prototype.substring.length`, "2")
-	test(`String.prototype.substring.call("abc", 1, 11)`, "bc")
-}
-
-func TestFunctionArguments(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	// Should not be able to delete arguments
-	test(`
-        function abc(def, arguments){
-            delete def;
-            return def;
-        }
-        abc(1);
-    `, "1")
-
-	// Again, should not be able to delete arguments
-	test(`
-        function abc(def){
-            delete def;
-            return def;
-        }
-        abc(1);
-    `, "1")
-
-	// Test typeof of a function argument
-	test(`
-        function abc(def, ghi, jkl){
-            return typeof jkl
-        }
-        abc("1st", "2nd", "3rd", "4th", "5th");
-    `, "string")
-
-	test(`
-        function abc(def, ghi, jkl){
-            arguments[0] = 3.14;
-            arguments[1] = 'Nothing happens';
-            arguments[2] = 42;
-            if (3.14 === def && 'Nothing happens' === ghi && 42 === jkl)
-                return true;
-        }
-        abc(-1, 4.2, 314);
-    `, "true")
-}
-
-func TestFunctionDeclarationInFunction(t *testing.T) {
-	Terst(t)
-
-	// Function declarations happen AFTER parameter/argument declarations
-	// That is, a function declared within a function will shadow/overwrite
-	// declared parameters
-	test := runTest()
-	test(`
-        function abc(def){
-            return def;
-            function def(){
-                return 1;
-            }
-        }
-        typeof abc();
-    `, "function")
-}
-
-func TestFunction_bind(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        abc = function(){
-            return "abc";
-        };
-        def = abc.bind();
-        def();
-    `, "abc")
-
-	test(`
-        abc = function(){
-            return arguments[1];
-        };
-        def = abc.bind(undefined, "abc");
-        ghi = abc.bind(undefined, "abc", "ghi");
-        [ def(), def("def"), ghi("def") ];
-    `, ",def,ghi")
-}
diff --git a/vendor/github.com/robertkrimen/otto/global.go b/vendor/github.com/robertkrimen/otto/global.go
deleted file mode 100644
index ba2ad073f..000000000
--- a/vendor/github.com/robertkrimen/otto/global.go
+++ /dev/null
@@ -1,218 +0,0 @@
-package otto
-
-import (
-	"strconv"
-	Time "time"
-)
-
-var (
-	prototypeValueObject   = interface{}(nil)
-	prototypeValueFunction = _functionObject{
-		call: _nativeCallFunction(func(_ FunctionCall) Value {
-			return UndefinedValue()
-		}),
-	}
-	prototypeValueString = _stringObject{
-		value: Value{
-			_valueType: valueString,
-			value:      "",
-		},
-		value16: []uint16(nil),
-	}
-	prototypeValueBoolean = Value{
-		_valueType: valueBoolean,
-		value:      false,
-	}
-	prototypeValueNumber = Value{
-		_valueType: valueNumber,
-		value:      0,
-	}
-	prototypeValueDate = _dateObject{
-		epoch: 0,
-		isNaN: false,
-		time:  Time.Unix(0, 0).UTC(),
-		value: Value{
-			_valueType: valueNumber,
-			value:      0,
-		},
-	}
-	prototypeValueRegExp = _regExpObject{
-		regularExpression: nil,
-		global:            false,
-		ignoreCase:        false,
-		multiline:         false,
-		source:            "",
-		flags:             "",
-	}
-)
-
-func newContext() *_runtime {
-
-	self := &_runtime{}
-
-	self.GlobalEnvironment = self.newObjectEnvironment(nil, nil)
-	self.GlobalObject = self.GlobalEnvironment.Object
-
-	self.EnterGlobalExecutionContext()
-
-	_newContext(self)
-
-	self.eval = self.GlobalObject.property["eval"].value.(Value).value.(*_object)
-	self.GlobalObject.prototype = self.Global.ObjectPrototype
-
-	return self
-}
-
-func (runtime *_runtime) newBaseObject() *_object {
-	self := newObject(runtime, "")
-	return self
-}
-
-func (runtime *_runtime) newClassObject(class string) *_object {
-	return newObject(runtime, class)
-}
-
-func (runtime *_runtime) newPrimitiveObject(class string, value Value) *_object {
-	self := runtime.newClassObject(class)
-	self.value = value
-	return self
-}
-
-func (self *_object) primitiveValue() Value {
-	switch value := self.value.(type) {
-	case Value:
-		return value
-	case _stringObject:
-		return value.value
-	}
-	return Value{}
-}
-
-func (self *_object) hasPrimitive() bool {
-	switch self.value.(type) {
-	case Value, *_stringObject:
-		return true
-	}
-	return false
-}
-
-func (runtime *_runtime) newObject() *_object {
-	self := runtime.newClassObject("Object")
-	self.prototype = runtime.Global.ObjectPrototype
-	return self
-}
-
-func (runtime *_runtime) newArray(length uint32) *_object {
-	self := runtime.newArrayObject(length)
-	self.prototype = runtime.Global.ArrayPrototype
-	return self
-}
-
-func (runtime *_runtime) newArrayOf(valueArray []Value) *_object {
-	self := runtime.newArray(uint32(len(valueArray)))
-	for index, value := range valueArray {
-		if value.isEmpty() {
-			continue
-		}
-		self.defineProperty(strconv.FormatInt(int64(index), 10), value, 0111, false)
-	}
-	return self
-}
-
-func (runtime *_runtime) newString(value Value) *_object {
-	self := runtime.newStringObject(value)
-	self.prototype = runtime.Global.StringPrototype
-	return self
-}
-
-func (runtime *_runtime) newBoolean(value Value) *_object {
-	self := runtime.newBooleanObject(value)
-	self.prototype = runtime.Global.BooleanPrototype
-	return self
-}
-
-func (runtime *_runtime) newNumber(value Value) *_object {
-	self := runtime.newNumberObject(value)
-	self.prototype = runtime.Global.NumberPrototype
-	return self
-}
-
-func (runtime *_runtime) newRegExp(patternValue Value, flagsValue Value) *_object {
-
-	pattern := ""
-	flags := ""
-	if object := patternValue._object(); object != nil && object.class == "RegExp" {
-		if flagsValue.IsDefined() {
-			panic(newTypeError("Cannot supply flags when constructing one RegExp from another"))
-		}
-		regExp := object.regExpValue()
-		pattern = regExp.source
-		flags = regExp.flags
-	} else {
-		if patternValue.IsDefined() {
-			pattern = toString(patternValue)
-		}
-		if flagsValue.IsDefined() {
-			flags = toString(flagsValue)
-		}
-	}
-
-	return runtime._newRegExp(pattern, flags)
-}
-
-func (runtime *_runtime) _newRegExp(pattern string, flags string) *_object {
-	self := runtime.newRegExpObject(pattern, flags)
-	self.prototype = runtime.Global.RegExpPrototype
-	return self
-}
-
-// TODO Should (probably) be one argument, right? This is redundant
-func (runtime *_runtime) newDate(epoch float64) *_object {
-	self := runtime.newDateObject(epoch)
-	self.prototype = runtime.Global.DatePrototype
-	return self
-}
-
-func (runtime *_runtime) newError(name string, message Value) *_object {
-	var self *_object
-	switch name {
-	case "EvalError":
-		return runtime.newEvalError(message)
-	case "TypeError":
-		return runtime.newTypeError(message)
-	case "RangeError":
-		return runtime.newRangeError(message)
-	case "ReferenceError":
-		return runtime.newReferenceError(message)
-	case "SyntaxError":
-		return runtime.newSyntaxError(message)
-	case "URIError":
-		return runtime.newURIError(message)
-	}
-
-	self = runtime.newErrorObject(message)
-	self.prototype = runtime.Global.ErrorPrototype
-	if name != "" {
-		self.defineProperty("name", toValue_string(name), 0111, false)
-	}
-	return self
-}
-
-func (runtime *_runtime) newNativeFunction(_nativeFunction _nativeFunction) *_object {
-	self := runtime.newNativeFunctionObject(_nativeFunction, 0)
-	self.prototype = runtime.Global.FunctionPrototype
-	prototype := runtime.newObject()
-	self.defineProperty("prototype", toValue_object(prototype), 0100, false)
-	prototype.defineProperty("constructor", toValue_object(self), 0100, false)
-	return self
-}
-
-func (runtime *_runtime) newNodeFunction(node *_functionNode, scopeEnvironment _environment) *_object {
-	// TODO Implement 13.2 fully
-	self := runtime.newNodeFunctionObject(node, scopeEnvironment)
-	self.prototype = runtime.Global.FunctionPrototype
-	prototype := runtime.newObject()
-	self.defineProperty("prototype", toValue_object(prototype), 0100, false)
-	prototype.defineProperty("constructor", toValue_object(self), 0101, false)
-	return self
-}
diff --git a/vendor/github.com/robertkrimen/otto/global_test.go b/vendor/github.com/robertkrimen/otto/global_test.go
deleted file mode 100644
index fa34e688a..000000000
--- a/vendor/github.com/robertkrimen/otto/global_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"fmt"
-	//"net/url"
-	"strings"
-	"testing"
-	//"unicode/utf16"
-)
-
-func TestGlobal(t *testing.T) {
-	Terst(t)
-
-	Otto, test := runTestWithOtto()
-	runtime := Otto.runtime
-
-	{
-		//trueValue, falseValue := TrueValue(), FalseValue()
-
-		result := runtime.localGet("Object")._object().Call(UndefinedValue(), []Value{toValue(runtime.newObject())})
-		Is(result.IsObject(), true)
-		Is(result, "[object Object]")
-		Is(result._object().prototype == runtime.Global.ObjectPrototype, true)
-		Is(result._object().prototype == runtime.Global.Object.get("prototype")._object(), true)
-		Is(runtime.newObject().prototype == runtime.Global.Object.get("prototype")._object(), true)
-		Is(result._object().get("toString"), "[function]")
-		//Is(result.Object().CallMethod("hasOwnProperty", "hasOwnProperty"), falseValue)
-		//Is(result.Object().get("toString").Object().prototype.CallMethod("toString"), "[function]")
-		//Is(result.Object().get("toString").Object().get("toString").Object(), "[function]")
-		//Is(result.Object().get("toString").Object().get("toString"), "[function]")
-		//Is(runtime.localGet("Object").Object().CallMethod("isPrototypeOf", result), falseValue)
-		//Is(runtime.localGet("Object").Object().get("prototype").Object().CallMethod("isPrototypeOf", result), trueValue)
-		//Is(runtime.localGet("Function").Object().CallMethod("isPrototypeOf", result), falseValue)
-		//Is(result.Object().CallMethod("propertyIsEnumerable", "isPrototypeOf"), falseValue)
-		//result.Object().WriteValue("xyzzy", toValue("Nothing happens."), false)
-		//Is(result.Object().CallMethod("propertyIsEnumerable", "xyzzy"), trueValue)
-		//Is(result.Object().get("xyzzy"), "Nothing happens.")
-
-		abc := runtime.newBoolean(TrueValue())
-		Is(abc, "true")
-
-		def := runtime.localGet("Boolean")._object().Construct(UndefinedValue(), []Value{})
-		Is(def, "false")
-	}
-
-	test(`new Number().constructor == Number`, "true")
-
-	test(`this.hasOwnProperty`, "[function]")
-
-	test(`eval.length === 1`, "true")
-	test(`eval.prototype === undefined`, "true")
-	test(`raise: new eval()`, "TypeError: [function] is not a constructor")
-
-	test(`
-        [
-            [ delete undefined, undefined ],
-            [ delete NaN, NaN ],
-            [ delete Infinity, Infinity ],
-        ];
-    `, "false,,false,NaN,false,Infinity")
-
-	test(`
-        Object.getOwnPropertyNames(Function('return this')()).sort();
-    `, "Array,Boolean,Date,Error,EvalError,Function,Infinity,Math,NaN,Number,Object,RangeError,ReferenceError,RegExp,String,SyntaxError,TypeError,URIError,console,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,escape,eval,isFinite,isNaN,parseFloat,parseInt,undefined,unescape")
-
-	// __defineGetter__,__defineSetter__,__lookupGetter__,__lookupSetter__,constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf
-	test(`
-        Object.getOwnPropertyNames(Object.prototype).sort();
-    `, "constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf")
-
-	// arguments,caller,length,name,prototype
-	test(`
-        Object.getOwnPropertyNames(EvalError).sort();
-    `, "length,prototype")
-
-	test(`
-        var abc = [];
-        var def = [EvalError, RangeError, ReferenceError, SyntaxError, TypeError, URIError];
-        for (constructor in def) {
-            abc.push(def[constructor] === def[constructor].prototype.constructor);
-        }
-        def = [Array, Boolean, Date, Function, Number, Object, RegExp, String, SyntaxError];
-        for (constructor in def) {
-            abc.push(def[constructor] === def[constructor].prototype.constructor);
-        }
-        abc;
-    `, "true,true,true,true,true,true,true,true,true,true,true,true,true,true,true")
-
-	test(`
-        [ Array.prototype.constructor === Array, Array.constructor === Function ];
-    `, "true,true")
-
-	test(`
-        [ Number.prototype.constructor === Number, Number.constructor === Function ];
-    `, "true,true")
-
-	test(`
-        [ Function.prototype.constructor === Function, Function.constructor === Function ];
-    `, "true,true")
-}
-
-func TestGlobalLength(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`Object.length`, "1")
-	test(`Function.length`, "1")
-	test(`RegExp.length`, "2")
-	test(`Math.length`, "undefined")
-}
-
-func TestGlobalError(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`TypeError.length`, "1")
-	test(`TypeError()`, "TypeError")
-	test(`TypeError("Nothing happens.")`, "TypeError: Nothing happens.")
-
-	test(`URIError.length`, "1")
-	test(`URIError()`, "URIError")
-	test(`URIError("Nothing happens.")`, "URIError: Nothing happens.")
-}
-
-func TestGlobalReadOnly(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`Number.POSITIVE_INFINITY`, "Infinity")
-	test(`Number.POSITIVE_INFINITY = 1`, "1")
-	test(`Number.POSITIVE_INFINITY`, "Infinity")
-}
-
-func Test_isNaN(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`isNaN(0)`, "false")
-	test(`isNaN("Xyzzy")`, "true")
-	test(`isNaN()`, "true")
-	test(`isNaN(NaN)`, "true")
-	test(`isNaN(Infinity)`, "false")
-
-	test(`isNaN.length === 1`, "true")
-	test(`isNaN.prototype === undefined`, "true")
-}
-
-func Test_isFinite(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`isFinite(0)`, "true")
-	test(`isFinite("Xyzzy")`, "false")
-	test(`isFinite()`, "false")
-	test(`isFinite(NaN)`, "false")
-	test(`isFinite(Infinity)`, "false")
-	test(`isFinite(new Number(451));`, "true")
-
-	test(`isFinite.length === 1`, "true")
-	test(`isFinite.prototype === undefined`, "true")
-}
-
-func Test_parseInt(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`parseInt("0")`, "0")
-	test(`parseInt("11")`, "11")
-	test(`parseInt(" 11")`, "11")
-	test(`parseInt("11 ")`, "11")
-	test(`parseInt(" 11 ")`, "11")
-	test(`parseInt(" 11\n")`, "11")
-	test(`parseInt(" 11\n", 16)`, "17")
-
-	test(`parseInt("Xyzzy")`, "NaN")
-
-	test(`parseInt(" 0x11\n", 16)`, "17")
-	test(`parseInt("0x0aXyzzy", 16)`, "10")
-	test(`parseInt("0x1", 0)`, "1")
-	if false {
-		// TODO parseInt("0x10000000000000000000", 16)
-		test(`parseInt("0x10000000000000000000", 16)`, "75557863725914323419136")
-	}
-
-	test(`parseInt.length === 2`, "true")
-	test(`parseInt.prototype === undefined`, "true")
-}
-
-func Test_parseFloat(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`parseFloat("0")`, "0")
-	test(`parseFloat("11")`, "11")
-	test(`parseFloat(" 11")`, "11")
-	test(`parseFloat("11 ")`, "11")
-	test(`parseFloat(" 11 ")`, "11")
-	test(`parseFloat(" 11\n")`, "11")
-	test(`parseFloat(" 11\n", 16)`, "11")
-	test(`parseFloat("11.1")`, "11.1")
-
-	test(`parseFloat("Xyzzy")`, "NaN")
-
-	test(`parseFloat(" 0x11\n", 16)`, "0")
-	test(`parseFloat("0x0a")`, "0")
-	test(`parseFloat("0x0aXyzzy")`, "0")
-	test(`parseFloat("Infinity")`, "Infinity")
-	test(`parseFloat("infinity")`, "NaN")
-	test(`parseFloat("0x")`, "0")
-	test(`parseFloat("11x")`, "11")
-	test(`parseFloat("Infinity1")`, "Infinity")
-
-	test(`parseFloat.length === 1`, "true")
-	test(`parseFloat.prototype === undefined`, "true")
-}
-
-func Test_encodeURI(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`encodeURI("http://example.com/ Nothing happens.")`, "http://example.com/%20Nothing%20happens.")
-	test(`encodeURI("http://example.com/ _^#")`, "http://example.com/%20_%5E#")
-	test(`encodeURI(String.fromCharCode("0xE000"))`, "%EE%80%80")
-	test(`encodeURI(String.fromCharCode("0xFFFD"))`, "%EF%BF%BD")
-	test(`raise: encodeURI(String.fromCharCode("0xDC00"))`, "URIError: URI malformed")
-
-	test(`encodeURI.length === 1`, "true")
-	test(`encodeURI.prototype === undefined`, "true")
-}
-
-func Test_encodeURIComponent(t *testing.T) {
-	Terst(t)
-
-	return
-	test := runTest()
-	test(`encodeURIComponent("http://example.com/ Nothing happens.")`, "http%3A%2F%2Fexample.com%2F%20Nothing%20happens.")
-	test(`encodeURIComponent("http://example.com/ _^#")`, "http%3A%2F%2Fexample.com%2F%20_%5E%23")
-}
-
-func Test_decodeURI(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`decodeURI(encodeURI("http://example.com/ Nothing happens."))`, "http://example.com/ Nothing happens.")
-	test(`decodeURI(encodeURI("http://example.com/ _^#"))`, "http://example.com/ _^#")
-	test(`raise: decodeURI("http://example.com/ _^#%")`, "URIError: URI malformed")
-	test(`raise: decodeURI("%DF%7F")`, "URIError: URI malformed")
-	for _, check := range strings.Fields("+ %3B %2F %3F %3A %40 %26 %3D %2B %24 %2C %23") {
-		test(fmt.Sprintf(`decodeURI("%s")`, check), check)
-	}
-
-	test(`decodeURI.length === 1`, "true")
-	test(`decodeURI.prototype === undefined`, "true")
-}
-
-func Test_decodeURIComponent(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`decodeURIComponent(encodeURI("http://example.com/ Nothing happens."))`, "http://example.com/ Nothing happens.")
-	test(`decodeURIComponent(encodeURI("http://example.com/ _^#"))`, "http://example.com/ _^#")
-
-	test(`decodeURIComponent.length === 1`, "true")
-	test(`decodeURIComponent.prototype === undefined`, "true")
-
-	test(`
-        var global = Function('return this')();
-        var abc = Object.getOwnPropertyDescriptor(global, "decodeURIComponent");
-        [ abc.value === global.decodeURIComponent, abc.writable, abc.enumerable, abc.configurable ];
-    `, "true,true,false,true")
-}
-
-func TestGlobal_skipEnumeration(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var found = [];
-        for (var test in this) {
-            if (false ||
-                test === 'NaN' ||
-                test === 'undefined' ||
-                test === 'Infinity' ||
-                false) {
-                found.push(test)
-            }
-        }
-        found;
-    `, "")
-
-	test(`
-        var found = [];
-        for (var test in this) {
-            if (false ||
-                test === 'Object' ||
-                test === 'Function' ||
-                test === 'String' ||
-                test === 'Number' ||
-                test === 'Array' ||
-                test === 'Boolean' ||
-                test === 'Date' ||
-                test === 'RegExp' ||
-                test === 'Error' ||
-                test === 'EvalError' ||
-                test === 'RangeError' ||
-                test === 'ReferenceError' ||
-                test === 'SyntaxError' ||
-                test === 'TypeError' ||
-                test === 'URIError' ||
-                false) {
-                found.push(test)
-            }
-        }
-        found;
-    `, "")
-}
diff --git a/vendor/github.com/robertkrimen/otto/inline b/vendor/github.com/robertkrimen/otto/inline
deleted file mode 100644
index 53edc90d3..000000000
--- a/vendor/github.com/robertkrimen/otto/inline
+++ /dev/null
@@ -1,1049 +0,0 @@
-#!/usr/bin/env perl
-
-my $_fmt;
-$_fmt = "gofmt";
-$_fmt = "cat -n" if "cat" eq ($ARGV[0] || "");
-
-use strict;
-use warnings;
-use IO::File;
-
-my $self = __PACKAGE__;
-
-sub functionLabel ($) {
-    return "$_[0]_function";
-}
-
-sub trim ($) {
-    local $_ = shift;
-    s/^\s*//, s/\s*$// for $_;
-    return $_;
-}
-
-open my $fmt, "|-", "$_fmt" or die $!;
-
-$fmt->print(<<_END_);
-package otto
-
-import (
-    "math"
-)
-
-func _newContext(runtime *_runtime) {
-@{[ join "\n", $self->newContext() ]}
-}    
-
-func newConsoleObject(runtime *_runtime) *_object {
-@{[ join "\n", $self->newConsoleObject() ]}
-}    
-_END_
-
-for (qw/int int8 int16 int32 int64 uint uint8 uint16 uint32 uint64 float32 float64/) {
-    $fmt->print(<<_END_);
-
-func toValue_$_(value $_) Value {
-    return Value{
-        _valueType: valueNumber,
-        value: value,
-    }
-}
-_END_
-}
-
-$fmt->print(<<_END_);
-
-func toValue_string(value string) Value {
-    return Value{
-        _valueType: valueString,
-        value: value,
-    }
-}
-
-func toValue_string16(value []uint16) Value {
-    return Value{
-        _valueType: valueString,
-        value: value,
-    }
-}
-
-func toValue_bool(value bool) Value {
-    return Value{
-        _valueType: valueBoolean,
-        value: value,
-    }
-}
-
-func toValue_object(value *_object) Value {
-    return Value{
-        _valueType: valueObject,
-        value: value,
-    }
-}
-_END_
-
-close $fmt;
-
-sub newConsoleObject {
-    my $self = shift;
-
-    return
-        $self->block(sub {
-            my $class = "Console";
-            my @got = $self->functionDeclare(
-                $class,
-                "log", 0,
-                "debug:log", 0,
-                "info:log", 0,
-                "error", 0,
-                "warn:error", 0,
-                "dir", 0,
-                "time", 0,
-                "timeEnd", 0,
-                "trace", 0,
-                "assert", 0,
-            );
-            return
-            "return @{[ $self->newObject(@got) ]}"
-        }),
-    ;
-}
-
-sub newContext {
-    my $self = shift;
-    return
-        # ObjectPrototype
-        $self->block(sub {
-            my $class = "Object";
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                undef,
-                "prototypeValueObject",
-            ),
-        }),
-
-        # FunctionPrototype
-        $self->block(sub {
-            my $class = "Function";
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                "prototypeValueFunction",
-            ),
-        }),
-
-        # ObjectPrototype
-        $self->block(sub {
-            my $class = "Object";
-            my @got = $self->functionDeclare(
-                $class,
-                "valueOf", 0,
-                "toString", 0,
-                "toLocaleString", 0,
-                "hasOwnProperty", 1,
-                "isPrototypeOf", 1,
-                "propertyIsEnumerable", 1,
-            );
-            my @propertyMap = $self->propertyMap(
-                @got,
-                $self->property("constructor", undef),
-            );
-            my $propertyOrder = $self->propertyOrder(@propertyMap);
-            $propertyOrder =~ s/^propertyOrder: //;
-            return
-            ".${class}Prototype.property =", @propertyMap,
-            ".${class}Prototype.propertyOrder =", $propertyOrder,
-        }),
-
-        # FunctionPrototype
-        $self->block(sub {
-            my $class = "Function";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "apply", 2,
-                "call", 2,
-                "bind", 1,
-            );
-            my @propertyMap = $self->propertyMap(
-                @got,
-                $self->property("constructor", undef),
-                $self->property("length", $self->numberValue(0), "0"),
-            );
-            my $propertyOrder = $self->propertyOrder(@propertyMap);
-            $propertyOrder =~ s/^propertyOrder: //;
-            return
-            ".${class}Prototype.property =", @propertyMap,
-            ".${class}Prototype.propertyOrder =", $propertyOrder,
-        }),
-
-        # Object
-        $self->block(sub {
-            my $class = "Object";
-            return
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-                    "getPrototypeOf", 1,
-                    "getOwnPropertyDescriptor", 2,
-                    "defineProperty", 3,
-                    "defineProperties", 2,
-                    "create", 2,
-                    "isExtensible", 1,
-                    "preventExtensions", 1,
-                    "isSealed", 1,
-                    "seal", 1,
-                    "isFrozen", 1,
-                    "freeze", 1,
-                    "keys", 1,
-                    "getOwnPropertyNames", 1,
-                ),
-            ),
-        }),
-
-        # Function
-        $self->block(sub {
-            my $class = "Function";
-            return
-            "Function :=",
-            $self->globalFunction(
-                $class,
-                1,
-            ),
-            ".$class = Function",
-        }),
-
-        # Array
-        $self->block(sub {
-            my $class = "Array";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "toLocaleString", 0,
-                "concat", 1,
-                "join", 1,
-                "splice", 2,
-                "shift", 0,
-                "pop", 0,
-                "push", 1,
-                "slice", 2,
-                "unshift", 1,
-                "reverse", 0,
-                "sort", 0,
-                "indexOf", 1,
-                "lastIndexOf", 1,
-                "every", 1,
-                "some", 1,
-                "forEach", 1,
-                "map", 1,
-                "filter", 1,
-                "reduce", 1,
-                "reduceRight", 1,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classArray",
-                ".ObjectPrototype",
-                undef,
-                $self->property("length", $self->numberValue("uint32(0)"), "0100"),
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-                    "isArray", 0,
-                ),
-            ),
-        }),
-
-        # String
-        $self->block(sub {
-            my $class = "String";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "valueOf", 0,
-                "charAt", 1,
-                "charCodeAt", 1,
-                "concat", 1,
-                "indexOf", 1,
-                "lastIndexOf", 1,
-                "match", 1,
-                "replace", 2,
-                "search", 1,
-                "split", 2,
-                "slice", 2,
-                "substring", 2,
-                "toLowerCase", 0,
-                "toUpperCase", 0,
-                "substr", 2,
-                "trim", 0,
-                "trimLeft", 0,
-                "trimRight", 0,
-                "localeCompare", 1,
-                "toLocaleLowerCase", 0,
-                "toLocaleUpperCase", 0,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classString",
-                ".ObjectPrototype",
-                "prototypeValueString",
-                $self->property("length", $self->numberValue("int(0)"), "0"),
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-		            "fromCharCode", 1,
-                ),
-            ),
-        }),
-
-        # Boolean
-        $self->block(sub {
-            my $class = "Boolean";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "valueOf", 0,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                "prototypeValueBoolean",
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-                ),
-            ),
-        }),
-
-        # Number
-        $self->block(sub {
-            my $class = "Number";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "valueOf", 0,
-                "toFixed", 1,
-                "toExponential", 1,
-                "toPrecision", 1,
-                "toLocaleString", 1,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                "prototypeValueNumber",
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-                ),
-                $self->numberConstantDeclare(
-                    "MAX_VALUE", "math.MaxFloat64",
-                    "MIN_VALUE", "math.SmallestNonzeroFloat64",
-                    "NaN", "math.NaN()",
-                    "NEGATIVE_INFINITY", "math.Inf(-1)",
-                    "POSITIVE_INFINITY", "math.Inf(+1)",
-                ),
-            ),
-        }),
-
-        # Math
-        $self->block(sub {
-            my $class = "Math";
-            return
-            ".$class =",
-            $self->globalObject(
-                $class,
-                $self->functionDeclare(
-                    $class,
-                    "abs", 1,
-                    "acos", 1,
-                    "asin", 1,
-                    "atan", 1,
-                    "atan2", 1,
-                    "ceil", 1,
-                    "cos", 1,
-                    "exp", 1,
-                    "floor", 1,
-                    "log", 1,
-                    "max", 2,
-                    "min", 2,
-                    "pow", 2,
-                    "random", 0,
-                    "round", 1,
-                    "sin", 1,
-                    "sqrt", 1,
-                    "tan", 1,
-                ),
-                $self->numberConstantDeclare(
-                    "E", "math.E",
-                    "LN10", "math.Ln10",
-                    "LN2", "math.Ln2",
-                    "LOG2E", "math.Log2E",
-                    "LOG10E", "math.Log10E",
-                    "PI", "math.Pi",
-                    "SQRT1_2", "sqrt1_2",
-                    "SQRT2", "math.Sqrt2",
-                )
-            ),
-        }),
-
-        # Date
-        $self->block(sub {
-            my $class = "Date";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "toDateString", 0,
-                "toTimeString", 0,
-                "toUTCString", 0,
-                "toISOString", 0,
-                "toJSON", 1,
-                "toGMTString", 0,
-                "toLocaleString", 0,
-                "toLocaleDateString", 0,
-                "toLocaleTimeString", 0,
-                "valueOf", 0,
-                "getTime", 0,
-                "getYear", 0,
-                "getFullYear", 0,
-                "getUTCFullYear", 0,
-                "getMonth", 0,
-                "getUTCMonth", 0,
-                "getDate", 0,
-                "getUTCDate", 0,
-                "getDay", 0,
-                "getUTCDay", 0,
-                "getHours", 0,
-                "getUTCHours", 0,
-                "getMinutes", 0,
-                "getUTCMinutes", 0,
-                "getSeconds", 0,
-                "getUTCSeconds", 0,
-                "getMilliseconds", 0,
-                "getUTCMilliseconds", 0,
-                "getTimezoneOffset", 0,
-                "setTime", 1,
-                "setMilliseconds", 1,
-                "setUTCMilliseconds", 1,
-                "setSeconds", 1,
-                "setUTCSeconds", 1,
-                "setMinutes", 1,
-                "setUTCMinutes", 1,
-                "setHours", 1,
-                "setUTCHours", 1,
-                "setDate", 1,
-                "setUTCDate", 1,
-                "setMonth", 1,
-                "setUTCMonth", 1,
-                "setYear", 1,
-                "setFullYear", 1,
-                "setUTCFullYear", 1,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                "prototypeValueDate",
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                7,
-                $self->functionDeclare(
-                    $class,
-                    "parse", 0,
-                    "UTC", 0,
-                    "now", 0,
-                ),
-            ),
-        }),
-
-        # RegExp
-        $self->block(sub {
-            my $class = "RegExp";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-                "exec", 1,
-                "test", 1,
-                "compile", 1,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                "prototypeValueRegExp",
-                @got,
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                2,
-                $self->functionDeclare(
-                    $class,
-                ),
-            ),
-        }),
-
-        # Error
-        $self->block(sub {
-            my $class = "Error";
-            my @got = $self->functionDeclare(
-                $class,
-                "toString", 0,
-            );
-            return
-            ".${class}Prototype =",
-            $self->globalPrototype(
-                $class,
-                "_classObject",
-                ".ObjectPrototype",
-                undef,
-                @got,
-                $self->property("name", $self->stringValue("Error")),
-                $self->property("message", $self->stringValue("")),
-            ),
-            ".$class =",
-            $self->globalFunction(
-                $class,
-                1,
-                $self->functionDeclare(
-                    $class,
-                ),
-            ),
-        }),
-
-        (map {
-            my $class = "${_}Error";
-            $self->block(sub {
-                my @got = $self->functionDeclare(
-                    $class,
-                );
-                return
-                ".${class}Prototype =",
-                $self->globalPrototype(
-                    $class,
-                    "_classObject",
-                    ".ErrorPrototype",
-                    undef,
-                    @got,
-                    $self->property("name", $self->stringValue($class)),
-                ),
-                ".$class =",
-                $self->globalFunction(
-                    $class,
-                    1,
-                    $self->functionDeclare(
-                        $class,
-                    ),
-                ),
-            });
-        } qw/Eval Type Range Reference Syntax URI/),
-
-        # Global
-        $self->block(sub {
-            my $class = "Global";
-            my @got = $self->functionDeclare(
-                $class,
-                "eval", 1,
-                "parseInt", 2,
-                "parseFloat", 1,
-                "isNaN", 1,
-                "isFinite", 1,
-                "decodeURI", 1,
-                "decodeURIComponent", 1,
-                "encodeURI", 1,
-                "encodeURIComponent", 1,
-                "escape", 1,
-                "unescape", 1,
-            );
-            my @propertyMap = $self->propertyMap(
-                @got,
-                $self->globalDeclare(
-                    "Object",
-                    "Function",
-                    "Array",
-                    "String",
-                    "Boolean",
-                    "Number",
-                    "Math",
-                    "Date",
-                    "RegExp",
-                    "Error",
-                    "EvalError",
-                    "TypeError",
-                    "RangeError",
-                    "ReferenceError",
-                    "SyntaxError",
-                    "URIError",
-                ),
-                $self->property("undefined", $self->undefinedValue(), "0"),
-                $self->property("NaN", $self->numberValue("math.NaN()"), "0"),
-                $self->property("Infinity", $self->numberValue("math.Inf(+1)"), "0"),
-            );
-            my $propertyOrder = $self->propertyOrder(@propertyMap);
-            $propertyOrder =~ s/^propertyOrder: //;
-            return
-            "runtime.GlobalObject.property =",
-            @propertyMap,
-            "runtime.GlobalObject.propertyOrder =",
-            $propertyOrder,
-            ;
-        }),
-    ;
-}
-
-sub propertyMap {
-    my $self = shift;
-    return "map[string]_property{", (join ",\n", @_, ""), "}",
-}
-
-our (@preblock, @postblock);
-sub block {
-    my $self = shift;
-    local @preblock = ();
-    local @postblock = ();
-    my @input = $_[0]->();
-    my @output;
-    while (@input) {
-        local $_ = shift @input;
-        if (m/^\./) {
-            $_ = "runtime.Global$_";
-        }
-        if (m/ :?=$/) {
-            $_ .= shift @input;
-        }
-        push @output, $_;
-    }
-    return
-    "{",
-        @preblock,
-        @output,
-        @postblock,
-    "}",
-    ;
-}
-
-sub numberConstantDeclare {
-    my $self = shift;
-    my @got;
-    while (@_) {
-        my $name = shift;
-        my $value = shift;
-        push @got, $self->property($name, $self->numberValue($value), "0"),
-    }
-    return @got;
-}
-
-sub functionDeclare {
-    my $self = shift;
-    my $class = shift;
-    my $builtin = "builtin${class}";
-    my @got;
-    while (@_) {
-        my $name = shift;
-        my $length = shift;
-        $name = $self->newFunction($name, "${builtin}_", $length);
-        push @got, $self->functionProperty($name),
-    }
-    return @got;
-}
-
-sub globalDeclare {
-    my $self = shift;
-    my @got;
-    while (@_) {
-        my $name = shift;
-        push @got, $self->property($name, $self->objectValue("runtime.Global.$name"), "0101"),
-    }
-    return @got;
-}
-
-sub propertyOrder {
-    my $self = shift;
-    my $propertyMap = join "", @_;
-
-    my (@keys) = $propertyMap =~ m/("\w+"):/g;
-    my $propertyOrder =
-        join "\n", "propertyOrder: []string{", (join ",\n", @keys, ""), "}";
-    return $propertyOrder;
-}
-
-sub globalObject {
-    my $self = shift;
-    my $name = shift;
-    
-    my $propertyMap = "";
-    if (@_) {
-        $propertyMap = join "\n", $self->propertyMap(@_);
-        my $propertyOrder = $self->propertyOrder($propertyMap);
-        $propertyMap = "property: $propertyMap,\n$propertyOrder,";
-    }
-
-    return trim <<_END_;
-&_object{
-    runtime: runtime,
-    class: "$name",
-    objectClass: _classObject,
-    prototype: runtime.Global.ObjectPrototype,
-    extensible: true,
-    $propertyMap
-}
-_END_
-}
-
-sub globalFunction {
-    my $self = shift;
-    my $name = shift;
-    my $length = shift;
-    
-    my $builtin = "builtin${name}";
-    my $builtinNew = "builtinNew${name}";
-    my $prototype = "runtime.Global.${name}Prototype";
-    my $propertyMap = "";
-    unshift @_,
-        $self->property("length", $self->numberValue($length), "0"),
-        $self->property("prototype", $self->objectValue($prototype), "0"),
-    ;
-
-    if (@_) {
-        $propertyMap = join "\n", $self->propertyMap(@_);
-        my $propertyOrder = $self->propertyOrder($propertyMap);
-        $propertyMap = "property: $propertyMap,\n$propertyOrder,";
-    }
-
-    push @postblock, $self->statement(
-        "$prototype.property[\"constructor\"] =",
-        $self->property(undef, $self->objectValue("runtime.Global.${name}"), "0101"),
-    );
-
-    return trim <<_END_;
-&_object{
-    runtime: runtime,
-    class: "Function",
-    objectClass: _classObject,
-    prototype: runtime.Global.FunctionPrototype,
-    extensible: true,
-    value: @{[ $self->functionOf($self->nativeCallFunction($builtin), $builtinNew) ]},
-    $propertyMap
-}
-_END_
-}
-
-sub nativeCallFunction {
-    my $self = shift;
-    my $func = shift;
-    return trim <<_END_;
-_nativeCallFunction($func)
-_END_
-}
-
-sub globalPrototype {
-    my $self = shift;
-    my $class = shift;
-    my $classObject = shift;
-    my $prototype = shift;
-    my $value = shift;
-
-    if (!defined $prototype) {
-        $prototype = "nil";
-    }
-
-    if (!defined $value) {
-        $value = "nil";
-    }
-
-    if ($prototype =~ m/^\./) {
-        $prototype = "runtime.Global$prototype";
-    }
-
-    my $propertyMap = "";
-    if (@_) {
-        $propertyMap = join "\n", $self->propertyMap(@_);
-        my $propertyOrder = $self->propertyOrder($propertyMap);
-        $propertyMap = "property: $propertyMap,\n$propertyOrder,";
-    }
-
-    return trim <<_END_;
-&_object{
-    runtime: runtime,
-    class: "$class",
-    objectClass: $classObject,
-    prototype: $prototype,
-    extensible: true,
-    value: $value,
-    $propertyMap
-}
-_END_
-}
-
-sub newFunction {
-    my $self = shift;
-    my $name = shift;
-    my $func = shift;
-    my $length = shift;
-
-    my @name = ($name, $name);
-    if ($name =~ m/^(\w+):(\w+)$/) {
-        @name = ($1, $2);
-        $name = $name[0];
-    }
-
-    if ($func =~ m/^builtin\w+_$/) {
-        $func = "$func$name[1]";
-    }
-
-    my $propertyOrder = "";
-    my @propertyMap = (
-        $self->property("length", $self->numberValue($length), "0"),
-    );
-
-    if (@propertyMap) {
-        $propertyOrder = $self->propertyOrder(@propertyMap);
-        $propertyOrder = "$propertyOrder,";
-    }
-
-    my $label = functionLabel($name);
-    push @preblock, $self->statement(
-        "$label := @{[ trim <<_END_ ]}",
-&_object{
-    runtime: runtime,
-    class: "Function",
-    objectClass: _classObject,
-    prototype: runtime.Global.FunctionPrototype,
-    extensible: true,
-    property: @{[ join "\n", $self->propertyMap(@propertyMap) ]},
-    $propertyOrder
-    value: @{[ $self->functionOf($self->nativeCallFunction($func)) ]},
-} 
-_END_
-    );
-
-    return $name;
-}
-
-sub newObject {
-    my $self = shift;
-
-    my $propertyMap = join "\n", $self->propertyMap(@_);
-    my $propertyOrder = $self->propertyOrder($propertyMap);
-
-    return trim <<_END_;
-&_object{
-    runtime: runtime,
-    class: "Object",
-    objectClass: _classObject,
-    prototype: runtime.Global.ObjectPrototype,
-    extensible: true,
-    property: $propertyMap,
-    $propertyOrder,
-} 
-_END_
-}
-
-sub newPrototypeObject {
-    my $self = shift;
-    my $class = shift;
-    my $objectClass = shift;
-    my $value = shift;
-    if (defined $value) {
-        $value = "value: $value,";
-    }
-
-    my $propertyMap = join "\n", $self->propertyMap(@_);
-    my $propertyOrder = $self->propertyOrder($propertyMap);
-
-    return trim <<_END_;
-&_object{
-    runtime: runtime,
-    class: "$class",
-    objectClass: $objectClass,
-    prototype: runtime.Global.ObjectPrototype,
-    extensible: true,
-    property: $propertyMap,
-    $propertyOrder,
-    $value
-} 
-_END_
-}
-
-sub functionProperty {
-    my $self = shift;
-    my $name = shift;
-
-    return $self->property(
-        $name,
-        $self->objectValue(functionLabel($name))
-    );
-}
-
-sub statement {
-    my $self = shift;
-    return join "\n", @_;
-}
-
-sub functionOf {
-    my $self = shift;
-    my $call = shift;
-    my $construct = shift;
-    if ($construct) {
-        $construct = "construct: $construct,";
-    } else {
-        $construct = "";
-    }
-
-    return trim <<_END_
-_functionObject{
-    call: $call,
-    $construct
-}
-_END_
-}
-
-sub nameProperty {
-    my $self = shift;
-    my $name = shift;
-    my $value = shift;
-
-    return trim <<_END_;
-"$name": _property{
-    mode: 0101,
-    value: $value,
-}
-_END_
-}
-
-sub numberValue {
-    my $self = shift;
-    my $value = shift;
-    return trim <<_END_;
-Value{
-    _valueType: valueNumber,
-    value: $value,
-}
-_END_
-}
-
-sub property {
-    my $self = shift;
-    my $name = shift;
-    my $value = shift;
-    my $mode = shift;
-    $mode = "0101" unless defined $mode;
-    if (! defined $value) {
-        $value = "Value{}";
-    }
-    if (defined $name) {
-        return trim <<_END_;
-"$name": _property{
-    mode: $mode,
-    value: $value,
-}
-_END_
-    } else {
-        return trim <<_END_;
-_property{
-    mode: $mode,
-    value: $value,
-}
-_END_
-    }
-
-}
-
-sub objectProperty {
-    my $self = shift;
-    my $name = shift;
-    my $value = shift;
-
-    return trim <<_END_;
-"$name": _property{
-    mode: 0101,
-    value: @{[ $self->objectValue($value)]},
-}
-_END_
-}
-
-sub objectValue {
-    my $self = shift;
-    my $value = shift;
-    return trim <<_END_
-Value{
-    _valueType: valueObject,
-    value: $value,
-}
-_END_
-}
-
-sub stringValue {
-    my $self = shift;
-    my $value = shift;
-    return trim <<_END_
-Value{
-    _valueType: valueString,
-    value: "$value",
-}
-_END_
-}
-
-sub booleanValue {
-    my $self = shift;
-    my $value = shift;
-    return trim <<_END_
-Value{
-    _valueType: valueBoolean,
-    value: $value,
-}
-_END_
-}
-
-sub undefinedValue {
-    my $self = shift;
-    return trim <<_END_
-Value{
-    _valueType: valueUndefined,
-}
-_END_
-}
diff --git a/vendor/github.com/robertkrimen/otto/inline.go b/vendor/github.com/robertkrimen/otto/inline.go
deleted file mode 100644
index 3d8c68bda..000000000
--- a/vendor/github.com/robertkrimen/otto/inline.go
+++ /dev/null
@@ -1,6382 +0,0 @@
-package otto
-
-import (
-	"math"
-)
-
-func _newContext(runtime *_runtime) {
-	{
-		runtime.Global.ObjectPrototype = &_object{
-			runtime:     runtime,
-			class:       "Object",
-			objectClass: _classObject,
-			prototype:   nil,
-			extensible:  true,
-			value:       prototypeValueObject,
-		}
-	}
-	{
-		runtime.Global.FunctionPrototype = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueFunction,
-		}
-	}
-	{
-		valueOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_valueOf),
-			},
-		}
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_toString),
-			},
-		}
-		toLocaleString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_toLocaleString),
-			},
-		}
-		hasOwnProperty_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_hasOwnProperty),
-			},
-		}
-		isPrototypeOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_isPrototypeOf),
-			},
-		}
-		propertyIsEnumerable_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_propertyIsEnumerable),
-			},
-		}
-		runtime.Global.ObjectPrototype.property = map[string]_property{
-			"valueOf": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      valueOf_function,
-				},
-			},
-			"toString": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      toString_function,
-				},
-			},
-			"toLocaleString": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      toLocaleString_function,
-				},
-			},
-			"hasOwnProperty": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      hasOwnProperty_function,
-				},
-			},
-			"isPrototypeOf": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      isPrototypeOf_function,
-				},
-			},
-			"propertyIsEnumerable": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      propertyIsEnumerable_function,
-				},
-			},
-			"constructor": _property{
-				mode:  0101,
-				value: Value{},
-			},
-		}
-		runtime.Global.ObjectPrototype.propertyOrder = []string{
-			"valueOf",
-			"toString",
-			"toLocaleString",
-			"hasOwnProperty",
-			"isPrototypeOf",
-			"propertyIsEnumerable",
-			"constructor",
-		}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinFunction_toString),
-			},
-		}
-		apply_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinFunction_apply),
-			},
-		}
-		call_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinFunction_call),
-			},
-		}
-		bind_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinFunction_bind),
-			},
-		}
-		runtime.Global.FunctionPrototype.property = map[string]_property{
-			"toString": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      toString_function,
-				},
-			},
-			"apply": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      apply_function,
-				},
-			},
-			"call": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      call_function,
-				},
-			},
-			"bind": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      bind_function,
-				},
-			},
-			"constructor": _property{
-				mode:  0101,
-				value: Value{},
-			},
-			"length": _property{
-				mode: 0,
-				value: Value{
-					_valueType: valueNumber,
-					value:      0,
-				},
-			},
-		}
-		runtime.Global.FunctionPrototype.propertyOrder = []string{
-			"toString",
-			"apply",
-			"call",
-			"bind",
-			"constructor",
-			"length",
-		}
-	}
-	{
-		getPrototypeOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_getPrototypeOf),
-			},
-		}
-		getOwnPropertyDescriptor_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_getOwnPropertyDescriptor),
-			},
-		}
-		defineProperty_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      3,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_defineProperty),
-			},
-		}
-		defineProperties_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_defineProperties),
-			},
-		}
-		create_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_create),
-			},
-		}
-		isExtensible_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_isExtensible),
-			},
-		}
-		preventExtensions_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_preventExtensions),
-			},
-		}
-		isSealed_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_isSealed),
-			},
-		}
-		seal_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_seal),
-			},
-		}
-		isFrozen_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_isFrozen),
-			},
-		}
-		freeze_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_freeze),
-			},
-		}
-		keys_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_keys),
-			},
-		}
-		getOwnPropertyNames_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinObject_getOwnPropertyNames),
-			},
-		}
-		runtime.Global.Object = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinObject),
-				construct: builtinNewObject,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.ObjectPrototype,
-					},
-				},
-				"getPrototypeOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getPrototypeOf_function,
-					},
-				},
-				"getOwnPropertyDescriptor": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getOwnPropertyDescriptor_function,
-					},
-				},
-				"defineProperty": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      defineProperty_function,
-					},
-				},
-				"defineProperties": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      defineProperties_function,
-					},
-				},
-				"create": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      create_function,
-					},
-				},
-				"isExtensible": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      isExtensible_function,
-					},
-				},
-				"preventExtensions": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      preventExtensions_function,
-					},
-				},
-				"isSealed": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      isSealed_function,
-					},
-				},
-				"seal": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      seal_function,
-					},
-				},
-				"isFrozen": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      isFrozen_function,
-					},
-				},
-				"freeze": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      freeze_function,
-					},
-				},
-				"keys": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      keys_function,
-					},
-				},
-				"getOwnPropertyNames": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getOwnPropertyNames_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-				"getPrototypeOf",
-				"getOwnPropertyDescriptor",
-				"defineProperty",
-				"defineProperties",
-				"create",
-				"isExtensible",
-				"preventExtensions",
-				"isSealed",
-				"seal",
-				"isFrozen",
-				"freeze",
-				"keys",
-				"getOwnPropertyNames",
-			},
-		}
-		runtime.Global.ObjectPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Object,
-				},
-			}
-	}
-	{
-		Function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinFunction),
-				construct: builtinNewFunction,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.FunctionPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.Function = Function
-		runtime.Global.FunctionPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Function,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_toString),
-			},
-		}
-		toLocaleString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_toLocaleString),
-			},
-		}
-		concat_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_concat),
-			},
-		}
-		join_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_join),
-			},
-		}
-		splice_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_splice),
-			},
-		}
-		shift_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_shift),
-			},
-		}
-		pop_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_pop),
-			},
-		}
-		push_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_push),
-			},
-		}
-		slice_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_slice),
-			},
-		}
-		unshift_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_unshift),
-			},
-		}
-		reverse_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_reverse),
-			},
-		}
-		sort_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_sort),
-			},
-		}
-		indexOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_indexOf),
-			},
-		}
-		lastIndexOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_lastIndexOf),
-			},
-		}
-		every_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_every),
-			},
-		}
-		some_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_some),
-			},
-		}
-		forEach_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_forEach),
-			},
-		}
-		map_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_map),
-			},
-		}
-		filter_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_filter),
-			},
-		}
-		reduce_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_reduce),
-			},
-		}
-		reduceRight_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_reduceRight),
-			},
-		}
-		isArray_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinArray_isArray),
-			},
-		}
-		runtime.Global.ArrayPrototype = &_object{
-			runtime:     runtime,
-			class:       "Array",
-			objectClass: _classArray,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0100,
-					value: Value{
-						_valueType: valueNumber,
-						value:      uint32(0),
-					},
-				},
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"toLocaleString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleString_function,
-					},
-				},
-				"concat": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      concat_function,
-					},
-				},
-				"join": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      join_function,
-					},
-				},
-				"splice": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      splice_function,
-					},
-				},
-				"shift": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      shift_function,
-					},
-				},
-				"pop": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      pop_function,
-					},
-				},
-				"push": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      push_function,
-					},
-				},
-				"slice": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      slice_function,
-					},
-				},
-				"unshift": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      unshift_function,
-					},
-				},
-				"reverse": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      reverse_function,
-					},
-				},
-				"sort": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      sort_function,
-					},
-				},
-				"indexOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      indexOf_function,
-					},
-				},
-				"lastIndexOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      lastIndexOf_function,
-					},
-				},
-				"every": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      every_function,
-					},
-				},
-				"some": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      some_function,
-					},
-				},
-				"forEach": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      forEach_function,
-					},
-				},
-				"map": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      map_function,
-					},
-				},
-				"filter": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      filter_function,
-					},
-				},
-				"reduce": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      reduce_function,
-					},
-				},
-				"reduceRight": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      reduceRight_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"toString",
-				"toLocaleString",
-				"concat",
-				"join",
-				"splice",
-				"shift",
-				"pop",
-				"push",
-				"slice",
-				"unshift",
-				"reverse",
-				"sort",
-				"indexOf",
-				"lastIndexOf",
-				"every",
-				"some",
-				"forEach",
-				"map",
-				"filter",
-				"reduce",
-				"reduceRight",
-			},
-		}
-		runtime.Global.Array = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinArray),
-				construct: builtinNewArray,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.ArrayPrototype,
-					},
-				},
-				"isArray": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      isArray_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-				"isArray",
-			},
-		}
-		runtime.Global.ArrayPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Array,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_toString),
-			},
-		}
-		valueOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_valueOf),
-			},
-		}
-		charAt_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_charAt),
-			},
-		}
-		charCodeAt_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_charCodeAt),
-			},
-		}
-		concat_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_concat),
-			},
-		}
-		indexOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_indexOf),
-			},
-		}
-		lastIndexOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_lastIndexOf),
-			},
-		}
-		match_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_match),
-			},
-		}
-		replace_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_replace),
-			},
-		}
-		search_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_search),
-			},
-		}
-		split_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_split),
-			},
-		}
-		slice_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_slice),
-			},
-		}
-		substring_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_substring),
-			},
-		}
-		toLowerCase_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_toLowerCase),
-			},
-		}
-		toUpperCase_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_toUpperCase),
-			},
-		}
-		substr_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_substr),
-			},
-		}
-		trim_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_trim),
-			},
-		}
-		trimLeft_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_trimLeft),
-			},
-		}
-		trimRight_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_trimRight),
-			},
-		}
-		localeCompare_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_localeCompare),
-			},
-		}
-		toLocaleLowerCase_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_toLocaleLowerCase),
-			},
-		}
-		toLocaleUpperCase_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_toLocaleUpperCase),
-			},
-		}
-		fromCharCode_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinString_fromCharCode),
-			},
-		}
-		runtime.Global.StringPrototype = &_object{
-			runtime:     runtime,
-			class:       "String",
-			objectClass: _classString,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueString,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      int(0),
-					},
-				},
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"valueOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      valueOf_function,
-					},
-				},
-				"charAt": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      charAt_function,
-					},
-				},
-				"charCodeAt": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      charCodeAt_function,
-					},
-				},
-				"concat": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      concat_function,
-					},
-				},
-				"indexOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      indexOf_function,
-					},
-				},
-				"lastIndexOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      lastIndexOf_function,
-					},
-				},
-				"match": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      match_function,
-					},
-				},
-				"replace": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      replace_function,
-					},
-				},
-				"search": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      search_function,
-					},
-				},
-				"split": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      split_function,
-					},
-				},
-				"slice": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      slice_function,
-					},
-				},
-				"substring": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      substring_function,
-					},
-				},
-				"toLowerCase": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLowerCase_function,
-					},
-				},
-				"toUpperCase": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toUpperCase_function,
-					},
-				},
-				"substr": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      substr_function,
-					},
-				},
-				"trim": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      trim_function,
-					},
-				},
-				"trimLeft": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      trimLeft_function,
-					},
-				},
-				"trimRight": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      trimRight_function,
-					},
-				},
-				"localeCompare": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      localeCompare_function,
-					},
-				},
-				"toLocaleLowerCase": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleLowerCase_function,
-					},
-				},
-				"toLocaleUpperCase": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleUpperCase_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"toString",
-				"valueOf",
-				"charAt",
-				"charCodeAt",
-				"concat",
-				"indexOf",
-				"lastIndexOf",
-				"match",
-				"replace",
-				"search",
-				"split",
-				"slice",
-				"substring",
-				"toLowerCase",
-				"toUpperCase",
-				"substr",
-				"trim",
-				"trimLeft",
-				"trimRight",
-				"localeCompare",
-				"toLocaleLowerCase",
-				"toLocaleUpperCase",
-			},
-		}
-		runtime.Global.String = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinString),
-				construct: builtinNewString,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.StringPrototype,
-					},
-				},
-				"fromCharCode": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      fromCharCode_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-				"fromCharCode",
-			},
-		}
-		runtime.Global.StringPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.String,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinBoolean_toString),
-			},
-		}
-		valueOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinBoolean_valueOf),
-			},
-		}
-		runtime.Global.BooleanPrototype = &_object{
-			runtime:     runtime,
-			class:       "Boolean",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueBoolean,
-			property: map[string]_property{
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"valueOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      valueOf_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"toString",
-				"valueOf",
-			},
-		}
-		runtime.Global.Boolean = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinBoolean),
-				construct: builtinNewBoolean,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.BooleanPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.BooleanPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Boolean,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_toString),
-			},
-		}
-		valueOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_valueOf),
-			},
-		}
-		toFixed_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_toFixed),
-			},
-		}
-		toExponential_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_toExponential),
-			},
-		}
-		toPrecision_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_toPrecision),
-			},
-		}
-		toLocaleString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinNumber_toLocaleString),
-			},
-		}
-		runtime.Global.NumberPrototype = &_object{
-			runtime:     runtime,
-			class:       "Number",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueNumber,
-			property: map[string]_property{
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"valueOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      valueOf_function,
-					},
-				},
-				"toFixed": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toFixed_function,
-					},
-				},
-				"toExponential": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toExponential_function,
-					},
-				},
-				"toPrecision": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toPrecision_function,
-					},
-				},
-				"toLocaleString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleString_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"toString",
-				"valueOf",
-				"toFixed",
-				"toExponential",
-				"toPrecision",
-				"toLocaleString",
-			},
-		}
-		runtime.Global.Number = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinNumber),
-				construct: builtinNewNumber,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.NumberPrototype,
-					},
-				},
-				"MAX_VALUE": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.MaxFloat64,
-					},
-				},
-				"MIN_VALUE": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.SmallestNonzeroFloat64,
-					},
-				},
-				"NaN": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.NaN(),
-					},
-				},
-				"NEGATIVE_INFINITY": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Inf(-1),
-					},
-				},
-				"POSITIVE_INFINITY": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Inf(+1),
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-				"MAX_VALUE",
-				"MIN_VALUE",
-				"NaN",
-				"NEGATIVE_INFINITY",
-				"POSITIVE_INFINITY",
-			},
-		}
-		runtime.Global.NumberPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Number,
-				},
-			}
-	}
-	{
-		abs_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_abs),
-			},
-		}
-		acos_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_acos),
-			},
-		}
-		asin_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_asin),
-			},
-		}
-		atan_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_atan),
-			},
-		}
-		atan2_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_atan2),
-			},
-		}
-		ceil_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_ceil),
-			},
-		}
-		cos_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_cos),
-			},
-		}
-		exp_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_exp),
-			},
-		}
-		floor_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_floor),
-			},
-		}
-		log_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_log),
-			},
-		}
-		max_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_max),
-			},
-		}
-		min_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_min),
-			},
-		}
-		pow_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_pow),
-			},
-		}
-		random_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_random),
-			},
-		}
-		round_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_round),
-			},
-		}
-		sin_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_sin),
-			},
-		}
-		sqrt_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_sqrt),
-			},
-		}
-		tan_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinMath_tan),
-			},
-		}
-		runtime.Global.Math = &_object{
-			runtime:     runtime,
-			class:       "Math",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"abs": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      abs_function,
-					},
-				},
-				"acos": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      acos_function,
-					},
-				},
-				"asin": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      asin_function,
-					},
-				},
-				"atan": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      atan_function,
-					},
-				},
-				"atan2": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      atan2_function,
-					},
-				},
-				"ceil": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      ceil_function,
-					},
-				},
-				"cos": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      cos_function,
-					},
-				},
-				"exp": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      exp_function,
-					},
-				},
-				"floor": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      floor_function,
-					},
-				},
-				"log": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      log_function,
-					},
-				},
-				"max": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      max_function,
-					},
-				},
-				"min": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      min_function,
-					},
-				},
-				"pow": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      pow_function,
-					},
-				},
-				"random": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      random_function,
-					},
-				},
-				"round": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      round_function,
-					},
-				},
-				"sin": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      sin_function,
-					},
-				},
-				"sqrt": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      sqrt_function,
-					},
-				},
-				"tan": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      tan_function,
-					},
-				},
-				"E": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.E,
-					},
-				},
-				"LN10": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Ln10,
-					},
-				},
-				"LN2": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Ln2,
-					},
-				},
-				"LOG2E": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Log2E,
-					},
-				},
-				"LOG10E": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Log10E,
-					},
-				},
-				"PI": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Pi,
-					},
-				},
-				"SQRT1_2": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      sqrt1_2,
-					},
-				},
-				"SQRT2": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      math.Sqrt2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"abs",
-				"acos",
-				"asin",
-				"atan",
-				"atan2",
-				"ceil",
-				"cos",
-				"exp",
-				"floor",
-				"log",
-				"max",
-				"min",
-				"pow",
-				"random",
-				"round",
-				"sin",
-				"sqrt",
-				"tan",
-				"E",
-				"LN10",
-				"LN2",
-				"LOG2E",
-				"LOG10E",
-				"PI",
-				"SQRT1_2",
-				"SQRT2",
-			},
-		}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toString),
-			},
-		}
-		toDateString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toDateString),
-			},
-		}
-		toTimeString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toTimeString),
-			},
-		}
-		toUTCString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toUTCString),
-			},
-		}
-		toISOString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toISOString),
-			},
-		}
-		toJSON_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toJSON),
-			},
-		}
-		toGMTString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toGMTString),
-			},
-		}
-		toLocaleString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toLocaleString),
-			},
-		}
-		toLocaleDateString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toLocaleDateString),
-			},
-		}
-		toLocaleTimeString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_toLocaleTimeString),
-			},
-		}
-		valueOf_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_valueOf),
-			},
-		}
-		getTime_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getTime),
-			},
-		}
-		getYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getYear),
-			},
-		}
-		getFullYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getFullYear),
-			},
-		}
-		getUTCFullYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCFullYear),
-			},
-		}
-		getMonth_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getMonth),
-			},
-		}
-		getUTCMonth_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCMonth),
-			},
-		}
-		getDate_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getDate),
-			},
-		}
-		getUTCDate_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCDate),
-			},
-		}
-		getDay_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getDay),
-			},
-		}
-		getUTCDay_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCDay),
-			},
-		}
-		getHours_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getHours),
-			},
-		}
-		getUTCHours_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCHours),
-			},
-		}
-		getMinutes_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getMinutes),
-			},
-		}
-		getUTCMinutes_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCMinutes),
-			},
-		}
-		getSeconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getSeconds),
-			},
-		}
-		getUTCSeconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCSeconds),
-			},
-		}
-		getMilliseconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getMilliseconds),
-			},
-		}
-		getUTCMilliseconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getUTCMilliseconds),
-			},
-		}
-		getTimezoneOffset_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_getTimezoneOffset),
-			},
-		}
-		setTime_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setTime),
-			},
-		}
-		setMilliseconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setMilliseconds),
-			},
-		}
-		setUTCMilliseconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCMilliseconds),
-			},
-		}
-		setSeconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setSeconds),
-			},
-		}
-		setUTCSeconds_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCSeconds),
-			},
-		}
-		setMinutes_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setMinutes),
-			},
-		}
-		setUTCMinutes_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCMinutes),
-			},
-		}
-		setHours_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setHours),
-			},
-		}
-		setUTCHours_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCHours),
-			},
-		}
-		setDate_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setDate),
-			},
-		}
-		setUTCDate_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCDate),
-			},
-		}
-		setMonth_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setMonth),
-			},
-		}
-		setUTCMonth_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCMonth),
-			},
-		}
-		setYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setYear),
-			},
-		}
-		setFullYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setFullYear),
-			},
-		}
-		setUTCFullYear_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_setUTCFullYear),
-			},
-		}
-		parse_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_parse),
-			},
-		}
-		UTC_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_UTC),
-			},
-		}
-		now_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinDate_now),
-			},
-		}
-		runtime.Global.DatePrototype = &_object{
-			runtime:     runtime,
-			class:       "Date",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueDate,
-			property: map[string]_property{
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"toDateString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toDateString_function,
-					},
-				},
-				"toTimeString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toTimeString_function,
-					},
-				},
-				"toUTCString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toUTCString_function,
-					},
-				},
-				"toISOString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toISOString_function,
-					},
-				},
-				"toJSON": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toJSON_function,
-					},
-				},
-				"toGMTString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toGMTString_function,
-					},
-				},
-				"toLocaleString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleString_function,
-					},
-				},
-				"toLocaleDateString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleDateString_function,
-					},
-				},
-				"toLocaleTimeString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toLocaleTimeString_function,
-					},
-				},
-				"valueOf": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      valueOf_function,
-					},
-				},
-				"getTime": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getTime_function,
-					},
-				},
-				"getYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getYear_function,
-					},
-				},
-				"getFullYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getFullYear_function,
-					},
-				},
-				"getUTCFullYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCFullYear_function,
-					},
-				},
-				"getMonth": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getMonth_function,
-					},
-				},
-				"getUTCMonth": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCMonth_function,
-					},
-				},
-				"getDate": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getDate_function,
-					},
-				},
-				"getUTCDate": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCDate_function,
-					},
-				},
-				"getDay": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getDay_function,
-					},
-				},
-				"getUTCDay": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCDay_function,
-					},
-				},
-				"getHours": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getHours_function,
-					},
-				},
-				"getUTCHours": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCHours_function,
-					},
-				},
-				"getMinutes": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getMinutes_function,
-					},
-				},
-				"getUTCMinutes": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCMinutes_function,
-					},
-				},
-				"getSeconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getSeconds_function,
-					},
-				},
-				"getUTCSeconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCSeconds_function,
-					},
-				},
-				"getMilliseconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getMilliseconds_function,
-					},
-				},
-				"getUTCMilliseconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getUTCMilliseconds_function,
-					},
-				},
-				"getTimezoneOffset": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      getTimezoneOffset_function,
-					},
-				},
-				"setTime": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setTime_function,
-					},
-				},
-				"setMilliseconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setMilliseconds_function,
-					},
-				},
-				"setUTCMilliseconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCMilliseconds_function,
-					},
-				},
-				"setSeconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setSeconds_function,
-					},
-				},
-				"setUTCSeconds": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCSeconds_function,
-					},
-				},
-				"setMinutes": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setMinutes_function,
-					},
-				},
-				"setUTCMinutes": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCMinutes_function,
-					},
-				},
-				"setHours": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setHours_function,
-					},
-				},
-				"setUTCHours": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCHours_function,
-					},
-				},
-				"setDate": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setDate_function,
-					},
-				},
-				"setUTCDate": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCDate_function,
-					},
-				},
-				"setMonth": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setMonth_function,
-					},
-				},
-				"setUTCMonth": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCMonth_function,
-					},
-				},
-				"setYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setYear_function,
-					},
-				},
-				"setFullYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setFullYear_function,
-					},
-				},
-				"setUTCFullYear": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      setUTCFullYear_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"toString",
-				"toDateString",
-				"toTimeString",
-				"toUTCString",
-				"toISOString",
-				"toJSON",
-				"toGMTString",
-				"toLocaleString",
-				"toLocaleDateString",
-				"toLocaleTimeString",
-				"valueOf",
-				"getTime",
-				"getYear",
-				"getFullYear",
-				"getUTCFullYear",
-				"getMonth",
-				"getUTCMonth",
-				"getDate",
-				"getUTCDate",
-				"getDay",
-				"getUTCDay",
-				"getHours",
-				"getUTCHours",
-				"getMinutes",
-				"getUTCMinutes",
-				"getSeconds",
-				"getUTCSeconds",
-				"getMilliseconds",
-				"getUTCMilliseconds",
-				"getTimezoneOffset",
-				"setTime",
-				"setMilliseconds",
-				"setUTCMilliseconds",
-				"setSeconds",
-				"setUTCSeconds",
-				"setMinutes",
-				"setUTCMinutes",
-				"setHours",
-				"setUTCHours",
-				"setDate",
-				"setUTCDate",
-				"setMonth",
-				"setUTCMonth",
-				"setYear",
-				"setFullYear",
-				"setUTCFullYear",
-			},
-		}
-		runtime.Global.Date = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinDate),
-				construct: builtinNewDate,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      7,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.DatePrototype,
-					},
-				},
-				"parse": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      parse_function,
-					},
-				},
-				"UTC": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      UTC_function,
-					},
-				},
-				"now": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      now_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-				"parse",
-				"UTC",
-				"now",
-			},
-		}
-		runtime.Global.DatePrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Date,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinRegExp_toString),
-			},
-		}
-		exec_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinRegExp_exec),
-			},
-		}
-		test_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinRegExp_test),
-			},
-		}
-		compile_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinRegExp_compile),
-			},
-		}
-		runtime.Global.RegExpPrototype = &_object{
-			runtime:     runtime,
-			class:       "RegExp",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       prototypeValueRegExp,
-			property: map[string]_property{
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"exec": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      exec_function,
-					},
-				},
-				"test": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      test_function,
-					},
-				},
-				"compile": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      compile_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"toString",
-				"exec",
-				"test",
-				"compile",
-			},
-		}
-		runtime.Global.RegExp = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinRegExp),
-				construct: builtinNewRegExp,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.RegExpPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.RegExpPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.RegExp,
-				},
-			}
-	}
-	{
-		toString_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinError_toString),
-			},
-		}
-		runtime.Global.ErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "Error",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"toString": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      toString_function,
-					},
-				},
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "Error",
-					},
-				},
-				"message": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"toString",
-				"name",
-				"message",
-			},
-		}
-		runtime.Global.Error = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinError),
-				construct: builtinNewError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.ErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.ErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Error,
-				},
-			}
-	}
-	{
-		runtime.Global.EvalErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "EvalError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "EvalError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.EvalError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinEvalError),
-				construct: builtinNewEvalError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.EvalErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.EvalErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.EvalError,
-				},
-			}
-	}
-	{
-		runtime.Global.TypeErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "TypeError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "TypeError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.TypeError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinTypeError),
-				construct: builtinNewTypeError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.TypeErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.TypeErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.TypeError,
-				},
-			}
-	}
-	{
-		runtime.Global.RangeErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "RangeError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "RangeError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.RangeError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinRangeError),
-				construct: builtinNewRangeError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.RangeErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.RangeErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.RangeError,
-				},
-			}
-	}
-	{
-		runtime.Global.ReferenceErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "ReferenceError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "ReferenceError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.ReferenceError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinReferenceError),
-				construct: builtinNewReferenceError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.ReferenceErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.ReferenceErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.ReferenceError,
-				},
-			}
-	}
-	{
-		runtime.Global.SyntaxErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "SyntaxError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "SyntaxError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.SyntaxError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinSyntaxError),
-				construct: builtinNewSyntaxError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.SyntaxErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.SyntaxErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.SyntaxError,
-				},
-			}
-	}
-	{
-		runtime.Global.URIErrorPrototype = &_object{
-			runtime:     runtime,
-			class:       "URIError",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ErrorPrototype,
-			extensible:  true,
-			value:       nil,
-			property: map[string]_property{
-				"name": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueString,
-						value:      "URIError",
-					},
-				},
-			},
-			propertyOrder: []string{
-				"name",
-			},
-		}
-		runtime.Global.URIError = &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			value: _functionObject{
-				call:      _nativeCallFunction(builtinURIError),
-				construct: builtinNewURIError,
-			},
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-				"prototype": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueObject,
-						value:      runtime.Global.URIErrorPrototype,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-				"prototype",
-			},
-		}
-		runtime.Global.URIErrorPrototype.property["constructor"] =
-			_property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.URIError,
-				},
-			}
-	}
-	{
-		eval_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_eval),
-			},
-		}
-		parseInt_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      2,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_parseInt),
-			},
-		}
-		parseFloat_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_parseFloat),
-			},
-		}
-		isNaN_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_isNaN),
-			},
-		}
-		isFinite_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_isFinite),
-			},
-		}
-		decodeURI_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_decodeURI),
-			},
-		}
-		decodeURIComponent_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_decodeURIComponent),
-			},
-		}
-		encodeURI_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_encodeURI),
-			},
-		}
-		encodeURIComponent_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_encodeURIComponent),
-			},
-		}
-		escape_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_escape),
-			},
-		}
-		unescape_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      1,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinGlobal_unescape),
-			},
-		}
-		runtime.GlobalObject.property = map[string]_property{
-			"eval": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      eval_function,
-				},
-			},
-			"parseInt": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      parseInt_function,
-				},
-			},
-			"parseFloat": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      parseFloat_function,
-				},
-			},
-			"isNaN": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      isNaN_function,
-				},
-			},
-			"isFinite": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      isFinite_function,
-				},
-			},
-			"decodeURI": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      decodeURI_function,
-				},
-			},
-			"decodeURIComponent": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      decodeURIComponent_function,
-				},
-			},
-			"encodeURI": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      encodeURI_function,
-				},
-			},
-			"encodeURIComponent": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      encodeURIComponent_function,
-				},
-			},
-			"escape": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      escape_function,
-				},
-			},
-			"unescape": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      unescape_function,
-				},
-			},
-			"Object": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Object,
-				},
-			},
-			"Function": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Function,
-				},
-			},
-			"Array": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Array,
-				},
-			},
-			"String": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.String,
-				},
-			},
-			"Boolean": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Boolean,
-				},
-			},
-			"Number": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Number,
-				},
-			},
-			"Math": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Math,
-				},
-			},
-			"Date": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Date,
-				},
-			},
-			"RegExp": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.RegExp,
-				},
-			},
-			"Error": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.Error,
-				},
-			},
-			"EvalError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.EvalError,
-				},
-			},
-			"TypeError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.TypeError,
-				},
-			},
-			"RangeError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.RangeError,
-				},
-			},
-			"ReferenceError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.ReferenceError,
-				},
-			},
-			"SyntaxError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.SyntaxError,
-				},
-			},
-			"URIError": _property{
-				mode: 0101,
-				value: Value{
-					_valueType: valueObject,
-					value:      runtime.Global.URIError,
-				},
-			},
-			"undefined": _property{
-				mode: 0,
-				value: Value{
-					_valueType: valueUndefined,
-				},
-			},
-			"NaN": _property{
-				mode: 0,
-				value: Value{
-					_valueType: valueNumber,
-					value:      math.NaN(),
-				},
-			},
-			"Infinity": _property{
-				mode: 0,
-				value: Value{
-					_valueType: valueNumber,
-					value:      math.Inf(+1),
-				},
-			},
-		}
-		runtime.GlobalObject.propertyOrder = []string{
-			"eval",
-			"parseInt",
-			"parseFloat",
-			"isNaN",
-			"isFinite",
-			"decodeURI",
-			"decodeURIComponent",
-			"encodeURI",
-			"encodeURIComponent",
-			"escape",
-			"unescape",
-			"Object",
-			"Function",
-			"Array",
-			"String",
-			"Boolean",
-			"Number",
-			"Math",
-			"Date",
-			"RegExp",
-			"Error",
-			"EvalError",
-			"TypeError",
-			"RangeError",
-			"ReferenceError",
-			"SyntaxError",
-			"URIError",
-			"undefined",
-			"NaN",
-			"Infinity",
-		}
-	}
-}
-
-func newConsoleObject(runtime *_runtime) *_object {
-	{
-		log_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_log),
-			},
-		}
-		debug_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_log),
-			},
-		}
-		info_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_log),
-			},
-		}
-		error_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_error),
-			},
-		}
-		warn_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_error),
-			},
-		}
-		dir_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_dir),
-			},
-		}
-		time_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_time),
-			},
-		}
-		timeEnd_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_timeEnd),
-			},
-		}
-		trace_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_trace),
-			},
-		}
-		assert_function := &_object{
-			runtime:     runtime,
-			class:       "Function",
-			objectClass: _classObject,
-			prototype:   runtime.Global.FunctionPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"length": _property{
-					mode: 0,
-					value: Value{
-						_valueType: valueNumber,
-						value:      0,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"length",
-			},
-			value: _functionObject{
-				call: _nativeCallFunction(builtinConsole_assert),
-			},
-		}
-		return &_object{
-			runtime:     runtime,
-			class:       "Object",
-			objectClass: _classObject,
-			prototype:   runtime.Global.ObjectPrototype,
-			extensible:  true,
-			property: map[string]_property{
-				"log": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      log_function,
-					},
-				},
-				"debug": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      debug_function,
-					},
-				},
-				"info": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      info_function,
-					},
-				},
-				"error": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      error_function,
-					},
-				},
-				"warn": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      warn_function,
-					},
-				},
-				"dir": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      dir_function,
-					},
-				},
-				"time": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      time_function,
-					},
-				},
-				"timeEnd": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      timeEnd_function,
-					},
-				},
-				"trace": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      trace_function,
-					},
-				},
-				"assert": _property{
-					mode: 0101,
-					value: Value{
-						_valueType: valueObject,
-						value:      assert_function,
-					},
-				},
-			},
-			propertyOrder: []string{
-				"log",
-				"debug",
-				"info",
-				"error",
-				"warn",
-				"dir",
-				"time",
-				"timeEnd",
-				"trace",
-				"assert",
-			},
-		}
-	}
-}
-
-func toValue_int(value int) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_int8(value int8) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_int16(value int16) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_int32(value int32) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_int64(value int64) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_uint(value uint) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_uint8(value uint8) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_uint16(value uint16) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_uint32(value uint32) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_uint64(value uint64) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_float32(value float32) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_float64(value float64) Value {
-	return Value{
-		_valueType: valueNumber,
-		value:      value,
-	}
-}
-
-func toValue_string(value string) Value {
-	return Value{
-		_valueType: valueString,
-		value:      value,
-	}
-}
-
-func toValue_string16(value []uint16) Value {
-	return Value{
-		_valueType: valueString,
-		value:      value,
-	}
-}
-
-func toValue_bool(value bool) Value {
-	return Value{
-		_valueType: valueBoolean,
-		value:      value,
-	}
-}
-
-func toValue_object(value *_object) Value {
-	return Value{
-		_valueType: valueObject,
-		value:      value,
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/lexer.go b/vendor/github.com/robertkrimen/otto/lexer.go
deleted file mode 100644
index 92e3dfd87..000000000
--- a/vendor/github.com/robertkrimen/otto/lexer.go
+++ /dev/null
@@ -1,694 +0,0 @@
-package otto
-
-import (
-	"bytes"
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode"
-	"unicode/utf16"
-	"unicode/utf8"
-)
-
-var keywordTable map[string]bool = boolFields(`
-	break
-	case
-	catch
-	continue
-	default
-	delete
-	do
-	else
-	finally
-	for
-	function
-	if
-	in
-	instanceof
-	new
-	null
-	return
-	switch
-	this
-	throw
-	try
-	typeof
-	var
-	while
-	with
-	void
-
-	debugger
-	const
-`)
-
-var futureKeywordTable map[string]bool = boolFields(`
-    class
-    enum
-    export
-    extends
-    import
-    super
-`)
-
-func init() {
-	for keyword, _ := range futureKeywordTable {
-		keywordTable[keyword] = true
-	}
-}
-
-var punctuatorTable map[string]bool
-
-func init() {
-
-	punctuatorTable = boolFields(`
-		>>>= === !== >>> <<= >>=
-	`)
-
-	// 2-character
-	// <= >= == != ++ -- << >> && ||
-	// += -= *= %= &= |= ^= /=
-	for _, value := range "<>=!+-*%&|^/" {
-		punctuatorTable[string(value)+"="] = true
-	}
-
-	for _, value := range "+-<>&|" {
-		punctuatorTable[string(value)+string(value)] = true
-	}
-
-	// 1-character
-	for _, value := range "[]<>+-*%&|^!~?:=/;{},()" {
-		punctuatorTable[string(value)] = true
-	}
-}
-
-type _token struct {
-	Line, Column, Character int
-	Kind, File, Text        string
-	Error                   bool
-}
-
-func (self _token) IsValid() bool {
-	return self.Kind != ""
-}
-
-type _lexer struct {
-	Source string
-	//Tail		int
-	//Head		int
-	//Width		int
-
-	lineCount        int
-	zeroColumnOffset int
-
-	readIn       []rune
-	readInOffset int
-	atEndOfFile  bool
-	head         int
-	tail         int
-
-	headOffset int
-	tailOffset int
-}
-
-// Only called for testing (for now)
-func newLexer(source string) _lexer {
-	self := _lexer{
-		Source: source,
-		readIn: make([]rune, 0, len(source)), // Guestimate
-	}
-	return self
-}
-
-func (self _lexer) Copy() *_lexer {
-	newSelf := self
-	return &newSelf
-}
-
-func (self *_lexer) scanEndOfLine(chr rune, consume bool) bool {
-	if !isLineTerminator(chr) {
-		return false
-	}
-	if consume {
-		self.next()
-	}
-	if chr == '\r' && self.peek() == '\n' {
-		self.next() // Consume \n
-	}
-	self.lineCount += 1
-	return true
-}
-
-func (self *_lexer) ScanLineComment() {
-	for {
-		chr := self.next()
-		if chr == endOfFile || self.scanEndOfLine(chr, false) {
-			return
-		}
-	}
-}
-
-func (self *_lexer) ScanBlockComment() int {
-	lineCount := 0
-	for {
-		chr := self.next()
-		switch {
-		case chr == '*' && self.peek() == '/':
-			self.next() // /
-			return lineCount
-		case chr == endOfFile:
-			panic(&_syntaxError{
-				Message: "Unexpected token ILLEGAL",
-			})
-		case self.scanEndOfLine(chr, false):
-			lineCount += 1
-		}
-	}
-	panic(hereBeDragons())
-}
-
-func (self *_lexer) ScanSkip() int {
-
-	lineCount := 0
-
-	for {
-		chr := self.peek()
-		switch {
-		case chr == '/':
-			read, _, found, width := self.read(2)
-			switch read[1] {
-			case '/':
-				self.tail += found
-				self.tailOffset += width
-				self.ScanLineComment()
-				lineCount += 1
-			case '*':
-				self.tail += found
-				self.tailOffset += width
-				lineCount += self.ScanBlockComment()
-			default:
-				goto RETURN
-			}
-			self.ignore()
-			self.zeroColumnOffset = self.tailOffset
-		case isWhiteSpace(chr):
-			self.next()
-			self.ignore()
-		case self.scanEndOfLine(chr, true):
-			lineCount += 1
-			self.ignore()
-			self.zeroColumnOffset = self.tailOffset
-		default:
-			goto RETURN
-		}
-	}
-
-RETURN:
-	return lineCount
-}
-
-func (self *_lexer) ScanLineSkip() bool {
-	return self.ScanSkip() > 0
-}
-
-func (self *_lexer) ScanRegularExpression() _token {
-
-	self.ScanSkip()
-
-	token := self.scanQuoteLiteral()
-	if token.Kind != "//" {
-		panic(token.newSyntaxError("Invalid regular expression"))
-	}
-	return token
-}
-
-func (self *_lexer) Scan() (token _token) {
-
-	self.ScanSkip()
-
-	if self.peek() == endOfFile {
-		return self.emit("EOF")
-	}
-
-	if token = self.scanPunctuator(); token.IsValid() {
-		return
-	}
-
-	chr := self.peek()
-
-	if chr == '\'' || chr == '"' {
-		if token = self.scanQuoteLiteral(); token.IsValid() {
-			return
-		}
-	}
-
-	if chr == '.' || isDecimalDigit(chr) {
-		if token = self.scanNumericLiteral(); token.IsValid() {
-			return
-		}
-	}
-
-	if token = self.scanIdentifierKeyword(); token.IsValid() {
-		return
-	}
-
-	return self.scanIllegal()
-}
-
-func (self *_lexer) scanQuoteLiteral() _token {
-
-	value := self.next()
-	quote := value
-	kind := "string"
-	if value == '/' {
-		kind = "//"
-	}
-
-	errorIllegal := func() _token {
-		self.back()
-		return self.emit("illegal")
-	}
-
-	var text bytes.Buffer
-
-	for {
-		value = self.next()
-		switch value {
-		case endOfFile:
-			return errorIllegal()
-		case quote:
-			return self.emitWith(kind, text.String())
-		case '\\':
-			value = self.next()
-			if isLineTerminator(value) {
-				if quote == '/' {
-					return errorIllegal()
-				}
-				self.scanEndOfLine(value, false)
-				continue
-			}
-			if quote == '/' { // RegularExpression
-				// TODO Handle the case of [\]?
-				text.WriteRune('\\')
-				text.WriteRune(value)
-				continue
-			}
-			switch value {
-			case 'n':
-				text.WriteRune('\n')
-			case 'r':
-				text.WriteRune('\r')
-			case 't':
-				text.WriteRune('\t')
-			case 'b':
-				text.WriteRune('\b')
-			case 'f':
-				text.WriteRune('\f')
-			case 'v':
-				text.WriteRune('\v')
-			case '0':
-				text.WriteRune(0)
-			case 'u':
-				result := self.scanHexadecimalRune(4)
-				if result != utf8.RuneError {
-					text.WriteRune(result)
-				} else {
-					return errorIllegal()
-				}
-
-			case 'x':
-				result := self.scanHexadecimalRune(2)
-				if result != utf8.RuneError {
-					text.WriteRune(result)
-				} else {
-					return errorIllegal()
-				}
-			default:
-				text.WriteRune(value)
-			}
-			// TODO Octal escaping
-		default:
-			if isLineTerminator(value) {
-				return errorIllegal()
-			}
-			text.WriteRune(value)
-		}
-	}
-
-	return self.emit("illegal")
-}
-
-func convertHexadecimalRune(word string) rune {
-	value, err := strconv.ParseUint(word, 16, len(word)*4)
-	if err != nil {
-		// Not a valid hexadecimal sequence
-		return utf8.RuneError
-	}
-	return utf16.Decode([]uint16{uint16(value)})[0]
-}
-
-func (self *_lexer) scanHexadecimalRune(size int) rune {
-	_, word, found, width := self.read(size)
-	chr := convertHexadecimalRune(word)
-	if chr == utf8.RuneError {
-		return chr
-	}
-	self.tail += found
-	self.tailOffset += width
-	return chr
-}
-
-func (self *_lexer) scanPunctuator() (token _token) {
-
-	if self.accept(";{},()") {
-		return self.emit("punctuator")
-	}
-
-	accept := func(count int) {
-		for count > 0 {
-			count--
-			self.next()
-		}
-	}
-
-	read, word, _, _ := self.read(4)
-
-	if read[0] == '.' && !isDecimalDigit(read[1]) {
-		accept(1)
-		return self.emit("punctuator")
-	}
-
-	for len(word) > 0 {
-		if punctuatorTable[word] {
-			accept(len(word))
-			return self.emit("punctuator")
-		}
-		word = word[:len(word)-1]
-	}
-
-	return
-	// I think this doesn't make any sense
-	//return self.emit("punctuator")
-}
-
-func (self *_lexer) scanNumericLiteral() _token {
-	// FIXME Make sure this is according to the specification
-
-	isHex, isOctal := false, false
-	{
-		acceptable := "0123456789"
-		if !self.accept(".") && self.accept("0") {
-			if self.accept("xX") {
-				acceptable = "0123456789abcdefABCDEF"
-				isHex = true
-			} else if self.accept("01234567") {
-				acceptable = "01234567"
-				isOctal = true
-			} else if self.accept("89") {
-				return self.emit("illegal")
-			}
-		}
-
-		self.acceptRun(acceptable)
-		if !isHex && !isOctal && self.accept(".") {
-			self.acceptRun(acceptable)
-		}
-
-		if self.length() == 2 && isHex { // 0x$ or 0X$
-			return self.emit("illegal")
-		}
-	}
-
-	if !isHex && !isOctal && self.accept("eE") {
-		self.accept("+-")
-		length := self.length()
-		self.acceptRun("0123456789")
-		if length == self.length() { // <number>e$
-			return self.emit("illegal")
-		}
-	}
-
-	if isAlphaNumeric(self.peek()) {
-		self.next()
-		// Bad number
-		return self.emit("illegal")
-	}
-
-	return self.emit("number")
-}
-
-func (self *_lexer) scanIdentifierKeyword() (token _token) {
-	word := []rune{}
-
-	// The first character should be of the class isIdentifierStart
-	identifierCheck := isIdentifierStart
-
-	for {
-		switch chr := self.peek(); {
-		case identifierCheck(chr):
-			if chr == '\\' {
-				read, _, _, _ := self.read(6)
-				if read[1] == 'u' {
-					chr := convertHexadecimalRune(string(read[2:]))
-					if chr == utf8.RuneError {
-						word = append(word, 'u')
-						self.skip(2) // Skip \u
-					} else {
-						if chr == '\\' || !identifierCheck(chr) {
-							return
-						}
-						word = append(word, chr)
-						self.skip(6) // Skip \u????
-					}
-				} else {
-					return
-				}
-			} else {
-				// Basically a skip of 1
-				word = append(word, self.next())
-			}
-		default:
-			if len(word) == 0 {
-				// Did not scan at least one identifier character, so return with failure
-				return
-			}
-			word := string(word)
-			switch {
-			case keywordTable[word] == true:
-				return self.emitWith(word, word)
-			case word == "true", word == "false":
-				return self.emitWith("boolean", word)
-			default:
-				return self.emitWith("identifier", word)
-			}
-			return
-		}
-
-		// Now we're looking at the body of the identiifer
-		identifierCheck = isIdentifierPart
-	}
-
-	return
-}
-
-func (self *_lexer) scanIllegal() _token {
-	return self.emit("illegal")
-}
-
-func (self *_lexer) emitWith(kind string, text string) _token {
-	token := _token{
-		Character: 1 + self.tailOffset,
-		Line:      1 + self.lineCount,
-		Column:    1 + self.tailOffset - self.zeroColumnOffset,
-
-		Kind:  kind,
-		Text:  text,
-		Error: false,
-	}
-	if kind == "punctuator" {
-		token.Kind = token.Text
-	}
-
-	self.headOffset = self.tailOffset
-	self.head = self.tail
-
-	if ottoDebug {
-		fmt.Printf("emit: %s %s\n", token.Kind, token.Text)
-	}
-	if kind == "illegal" {
-		token.Error = true
-	}
-	return token
-}
-
-func (self *_lexer) emit(kind string) _token {
-	return self.emitWith(kind, self.word())
-}
-
-func (self *_lexer) read(count int) ([]rune, string, int, int) {
-	head := self.tail
-	tail := head + count
-	unread := tail - len(self.readIn)
-	for unread > 0 {
-		unread--
-		self.read1()
-	}
-
-	var read []rune
-	found := 0
-	length := len(self.readIn)
-	if tail >= length {
-		read = make([]rune, count)
-		index, head := 0, head
-		for index < count {
-			if head >= length {
-				read[index] = endOfFile
-			} else {
-				found++
-				read[index] = self.readIn[head]
-			}
-			index++
-			head++
-		}
-	} else {
-		found = count
-		read = self.readIn[head:tail]
-	}
-
-	width := 0
-	word := ""
-	if found > 0 {
-		width = len(string(read[:found]))
-		word = string(read[:found])
-	}
-
-	return read, word, found, width
-}
-
-func (self *_lexer) next() rune {
-	chr, width := self.peek1()
-	if width != 0 {
-		self.tail += 1
-		self.tailOffset += width
-	}
-	return chr
-}
-
-func (self *_lexer) skip(count int) {
-	read := self.readIn[self.tail : self.tail+count]
-	for _, chr := range read {
-		self.tail += 1
-		self.tailOffset += utf8.RuneLen(chr)
-	}
-}
-
-func (self *_lexer) peek1() (chr rune, width int) {
-	if self.tail < len(self.readIn) {
-		chr = self.readIn[self.tail]
-		width = utf8.RuneLen(chr)
-	} else {
-		chr, width = self.read1()
-	}
-	return
-}
-
-func (self *_lexer) read1() (rune, int) {
-	if self.readInOffset >= len(self.Source) {
-		self.atEndOfFile = true
-		return endOfFile, 0
-	}
-	chr, width := utf8.DecodeRuneInString(self.Source[self.readInOffset:])
-	self.readIn = append(self.readIn, chr)
-	self.readInOffset += width
-	return chr, width
-}
-
-func (self *_lexer) peek() rune {
-	chr, _ := self.peek1()
-	return chr
-}
-
-func (self *_lexer) back() {
-	if self.tail > self.head && self.tail > 0 {
-		self.tailOffset -= utf8.RuneLen(self.readIn[self.tail-1])
-		self.tail -= 1
-	}
-}
-
-func (self *_lexer) ignore() {
-	self.head = self.tail
-	self.headOffset = self.tailOffset
-}
-
-func (self *_lexer) accept(valid string) bool {
-	if strings.IndexRune(valid, self.peek()) >= 0 {
-		self.next()
-		return true
-	}
-	return false
-}
-
-func (self *_lexer) acceptRun(valid string) bool {
-	found := false
-	for strings.IndexRune(valid, self.peek()) >= 0 {
-		self.next()
-		found = true
-	}
-	return found
-}
-
-func (self *_lexer) word() string {
-	return self.Source[self.headOffset:self.tailOffset]
-}
-
-func (self *_lexer) length() int {
-	return self.tailOffset - self.headOffset
-}
-
-func isDecimalDigit(rune rune) bool {
-	return unicode.IsDigit(rune)
-}
-
-func isAlphaNumeric(chr rune) bool {
-	return chr == '_' || unicode.IsLetter(chr) || unicode.IsDigit(chr)
-}
-
-func isIdentifierStart(chr rune) bool {
-	return chr == '$' || chr == '_' || chr == '\\' || unicode.IsLetter(chr)
-}
-
-func isIdentifierPart(chr rune) bool {
-	return chr == '$' || chr == '_' || chr == '\\' || unicode.IsLetter(chr) || unicode.IsDigit(chr)
-}
-
-func isWhiteSpace(chr rune) bool {
-	switch chr {
-	case '\u0009', '\u000b', '\u000c', '\u0020', '\u00a0', '\ufeff':
-		return true
-	case '\u000a', '\u000d', '\u2028', '\u2029':
-		return false
-	case '\u0085':
-		return false
-	}
-	return unicode.IsSpace(chr)
-}
-
-func isLineTerminator(chr rune) bool {
-	switch chr {
-	case '\u000a', '\u000d', '\u2028', '\u2029':
-		return true
-	}
-	return false
-}
-
-func isWhiteSpaceOrLineTerminator(chr rune) bool {
-	switch chr {
-	case '\u0009', '\u000b', '\u000c', '\u0020', '\u00a0', '\ufeff':
-		return true
-	case '\u000a', '\u000d', '\u2028', '\u2029':
-		return true
-	case '\u0085':
-		return false
-	}
-	return unicode.IsSpace(chr)
-}
diff --git a/vendor/github.com/robertkrimen/otto/lexer_test.go b/vendor/github.com/robertkrimen/otto/lexer_test.go
deleted file mode 100644
index 0fa9881ff..000000000
--- a/vendor/github.com/robertkrimen/otto/lexer_test.go
+++ /dev/null
@@ -1,299 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func lexerCollect(source string) (result []_token) {
-	parser := newParser()
-	parser.lexer.Source = source
-	for {
-		token := parser.Next()
-		result = append(result, token)
-		if token.Error || token.Kind == "EOF" {
-			break
-		}
-	}
-	return
-}
-
-func lexerCollectAndTest(input string, arguments ...string) {
-	result := lexerCollect(input)
-	for index, expect := range arguments {
-		result := result[index]
-		got := result.Kind
-		if strings.Contains(expect, " ") {
-			got = fmt.Sprintf("%s %s", result.Kind, result.Text)
-		}
-		Is(got, expect)
-	}
-}
-
-func testLexerRead(lexer *_lexer, count int, wantRead []rune, wantWord string, wantFound, wantWidth int) {
-	haveRead, haveWord, haveFound, haveWidth := lexer.read(count)
-	Is(haveRead, wantRead)
-	Is(haveWord, wantWord)
-	Is(haveFound, wantFound)
-	Is(haveWidth, wantWidth)
-}
-
-func TestLexer(t *testing.T) {
-	Terst(t)
-
-	{
-		lexer := newLexer("")
-		token := lexer.Scan()
-		Is(token.Kind, "EOF")
-
-		lexer = newLexer("1")
-		token = lexer.Scan()
-		Is(token.Kind, "number")
-	}
-
-	{
-		test := testLexerRead
-
-		lexer := newLexer("")
-		test(&lexer, 1, []rune{-1}, "", 0, 0)
-		lexer.next()
-		test(&lexer, 1, []rune{-1}, "", 0, 0)
-
-		lexer = newLexer("1")
-		test(&lexer, 1, []rune{49}, "1", 1, 1)
-		lexer.next()
-		test(&lexer, 1, []rune{-1}, "", 0, 0)
-		lexer.next()
-		test(&lexer, 1, []rune{-1}, "", 0, 0)
-
-		lexer = newLexer("abc")
-		test(&lexer, 2, []rune{97, 98}, "ab", 2, 2)
-		lexer.next()
-		test(&lexer, 2, []rune{98, 99}, "bc", 2, 2)
-		lexer.next()
-		test(&lexer, 2, []rune{99, -1}, "c", 1, 1)
-		lexer.next()
-		test(&lexer, 2, []rune{-1, -1}, "", 0, 0)
-
-		lexer = newLexer("abcdef")
-		lexer.next()
-		lexer.next()
-		test(&lexer, 8, []rune{99, 100, 101, 102, -1, -1, -1, -1}, "cdef", 4, 4)
-		lexer.back()
-		test(&lexer, 8, []rune{98, 99, 100, 101, 102, -1, -1, -1}, "bcdef", 5, 5)
-		for limit := 8; limit > 0; limit-- {
-			lexer.back()
-		}
-		test(&lexer, 2, []rune{97, 98}, "ab", 2, 2)
-		// Should get the same thing twice.
-		test(&lexer, 2, []rune{97, 98}, "ab", 2, 2)
-		lexer.next()
-		test(&lexer, 2, []rune{98, 99}, "bc", 2, 2)
-		lexer.skip(1)
-		test(&lexer, 2, []rune{99, 100}, "cd", 2, 2)
-		lexer.skip(3)
-		test(&lexer, 2, []rune{102, -1}, "f", 1, 1)
-	}
-}
-
-func TestParserLexer(t *testing.T) {
-	Terst(t)
-
-	test := lexerCollectAndTest
-
-	test("",
-		"EOF",
-	)
-
-	test("1",
-		"number 1",
-		"EOF",
-	)
-
-	test(".0",
-		"number .0",
-		"EOF",
-	)
-
-	test("xyzzy",
-		"identifier xyzzy",
-		"EOF",
-	)
-
-	test("xyzzy(1)",
-		"identifier xyzzy",
-		"(",
-		"number 1",
-		")",
-		"EOF")
-
-	test(".",
-		".",
-		"EOF")
-
-	test(".0",
-		"number .0",
-		"EOF")
-
-	test("===.",
-		"===",
-		".",
-		"EOF")
-
-	test(">>>=",
-		">>>=",
-		"EOF")
-
-	test(">>>=.0",
-		">>>=",
-		"number .0",
-		"EOF")
-
-	test(">>>=0.0.",
-		">>>=",
-		"number 0.0",
-		".",
-		"EOF")
-
-	test("\"Xyzzy\"",
-		"string Xyzzy",
-		"EOF")
-
-	test("xyzzy = //",
-		"identifier xyzzy",
-		"=",
-		"EOF")
-
-	test("xyzzy = 1 / 2",
-		"identifier xyzzy",
-		"=",
-		"number 1",
-		"/",
-		"number 2",
-		"EOF")
-
-	test("xyzzy = 'Nothing happens.'",
-		"identifier xyzzy",
-		"=",
-		"string Nothing happens.",
-		"EOF")
-
-	test("xyzzy = !false",
-		"identifier xyzzy",
-		"=",
-		"!",
-		"boolean false",
-		"EOF")
-
-	test("xyzzy = !!true",
-		"identifier xyzzy",
-		"=",
-		"!",
-		"!",
-		"boolean true",
-		"EOF")
-
-	test("xyzzy *= 1",
-		"identifier xyzzy",
-		"*=",
-		"number 1",
-		"EOF")
-
-	test("if 1 else",
-		"if",
-		"number 1",
-		"else",
-		"EOF")
-
-	test("null",
-		"null",
-		"EOF")
-
-	test("3ea",
-		"illegal 3e",
-	)
-
-	test("3in",
-		"illegal 3i",
-	)
-
-	test(`"\u007a\x79\u000a\x78"`,
-		"string zy\nx",
-	)
-
-	test(`
-	"[First line \
-Second line \
- Third line\
-.     ]"
-	`,
-		"string [First line Second line  Third line.     ]",
-	)
-
-	test("/",
-		"/",
-		"EOF",
-	)
-
-	test("var abc = \"abc\uFFFFabc\"",
-		"var",
-		"identifier abc",
-		"=",
-		"string abc\uFFFFabc",
-		"EOF",
-	)
-
-	test(`'\t' === '\r'`,
-		"string \t",
-		"===",
-		"string \r",
-		"EOF",
-	)
-
-	test("\"Hello\nWorld\"",
-		"illegal \"Hello",
-	)
-
-	test("\u203f = 10",
-		"illegal",
-	)
-
-	test(`var \u0024 = 1`,
-		"var",
-		"identifier $",
-		"=",
-		"number 1",
-		"EOF",
-	)
-
-	test("10e10000",
-		"number 10e10000",
-	)
-
-	test(`"\x0G"`,
-		"illegal",
-	)
-
-	test(`var if var class`,
-		"var",
-		"if",
-		"var",
-		"class",
-	)
-
-	test(`-0`,
-		"-",
-		"number 0",
-	)
-
-	test(`.01`,
-		"number .01",
-	)
-
-	test(`.01e+2`,
-		"number .01e+2",
-	)
-
-}
diff --git a/vendor/github.com/robertkrimen/otto/math_test.go b/vendor/github.com/robertkrimen/otto/math_test.go
deleted file mode 100644
index 2c4cdadad..000000000
--- a/vendor/github.com/robertkrimen/otto/math_test.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestMath_toString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.toString()`, "[object Math]")
-}
-
-func TestMath_abs(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.abs(NaN)`, "NaN")
-	test(`Math.abs(2)`, "2")
-	test(`Math.abs(-2)`, "2")
-	test(`Math.abs(-Infinity)`, "Infinity")
-
-	test(`Math.acos(0.5)`, "1.0471975511965976")
-
-	test(`Math.abs('-1')`, "1")
-	test(`Math.abs(-2)`, "2")
-	test(`Math.abs(null)`, "0")
-	test(`Math.abs("string")`, "NaN")
-	test(`Math.abs()`, "NaN")
-}
-
-func TestMath_acos(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.acos(NaN)`, "NaN")
-	test(`Math.acos(2)`, "NaN")
-	test(`Math.acos(-2)`, "NaN")
-	test(`1/Math.acos(1)`, "Infinity")
-
-	test(`Math.acos(0.5)`, "1.0471975511965976")
-}
-
-func TestMath_asin(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.asin(NaN)`, "NaN")
-	test(`Math.asin(2)`, "NaN")
-	test(`Math.asin(-2)`, "NaN")
-	test(`1/Math.asin(0)`, "Infinity")
-	test(`1/Math.asin(-0)`, "-Infinity")
-
-	test(`Math.asin(0.5)`, "0.5235987755982989")
-}
-
-func TestMath_atan(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.atan(NaN)`, "NaN")
-	test(`1/Math.atan(0)`, "Infinity")
-	test(`1/Math.atan(-0)`, "-Infinity")
-	test(`Math.atan(Infinity)`, "1.5707963267948966")
-	test(`Math.atan(-Infinity)`, "-1.5707963267948966")
-
-	// freebsd/386 1.03 => 0.4636476090008061
-	// darwin 1.03 => 0.46364760900080604
-	test(`Math.atan(0.5).toPrecision(10)`, "0.463647609")
-}
-
-func TestMath_atan2(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.atan2()`, "NaN")
-	test(`Math.atan2(NaN)`, "NaN")
-	test(`Math.atan2(0, NaN)`, "NaN")
-
-	test(`Math.atan2(1, 0)`, "1.5707963267948966")
-	test(`Math.atan2(1, -0)`, "1.5707963267948966")
-
-	test(`1/Math.atan2(0, 1)`, "Infinity")
-	test(`1/Math.atan2(0, 0)`, "Infinity")
-	test(`Math.atan2(0, -0)`, "3.141592653589793")
-	test(`Math.atan2(0, -1)`, "3.141592653589793")
-
-	test(`1/Math.atan2(-0, 1)`, "-Infinity")
-	test(`1/Math.atan2(-0, 0)`, "-Infinity")
-	test(`Math.atan2(-0, -0)`, "-3.141592653589793")
-	test(`Math.atan2(-0, -1)`, "-3.141592653589793")
-
-	test(`Math.atan2(-1, 0)`, "-1.5707963267948966")
-	test(`Math.atan2(-1, -0)`, "-1.5707963267948966")
-
-	test(`1/Math.atan2(1, Infinity)`, "Infinity")
-	test(`Math.atan2(1, -Infinity)`, "3.141592653589793")
-	test(`1/Math.atan2(-1, Infinity)`, "-Infinity")
-	test(`Math.atan2(-1, -Infinity)`, "-3.141592653589793")
-
-	test(`Math.atan2(Infinity, 1)`, "1.5707963267948966")
-	test(`Math.atan2(-Infinity, 1)`, "-1.5707963267948966")
-
-	test(`Math.atan2(Infinity, Infinity)`, "0.7853981633974483")
-	test(`Math.atan2(Infinity, -Infinity)`, "2.356194490192345")
-	test(`Math.atan2(-Infinity, Infinity)`, "-0.7853981633974483")
-	test(`Math.atan2(-Infinity, -Infinity)`, "-2.356194490192345")
-}
-
-func TestMath_ceil(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.ceil(NaN)`, "NaN")
-	test(`Math.ceil(+0)`, "0")
-	test(`1/Math.ceil(-0)`, "-Infinity")
-	test(`Math.ceil(Infinity)`, "Infinity")
-	test(`Math.ceil(-Infinity)`, "-Infinity")
-	test(`1/Math.ceil(-0.5)`, "-Infinity")
-
-	test(`Math.ceil(-11)`, "-11")
-	test(`Math.ceil(-0.5)`, "0")
-	test(`Math.ceil(1.5)`, "2")
-}
-
-func TestMath_cos(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.cos(NaN)`, "NaN")
-	test(`Math.cos(+0)`, "1")
-	test(`Math.cos(-0)`, "1")
-	test(`Math.cos(Infinity)`, "NaN")
-	test(`Math.cos(-Infinity)`, "NaN")
-
-	test(`Math.cos(0.5)`, "0.8775825618903728")
-}
-
-func TestMath_exp(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.exp(NaN)`, "NaN")
-	test(`Math.exp(+0)`, "1")
-	test(`Math.exp(-0)`, "1")
-	test(`Math.exp(Infinity)`, "Infinity")
-	test(`Math.exp(-Infinity)`, "0")
-}
-
-func TestMath_floor(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.floor(NaN)`, "NaN")
-	test(`Math.floor(+0)`, "0")
-	test(`1/Math.floor(-0)`, "-Infinity")
-	test(`Math.floor(Infinity)`, "Infinity")
-	test(`Math.floor(-Infinity)`, "-Infinity")
-
-	test(`Math.floor(-11)`, "-11")
-	test(`Math.floor(-0.5)`, "-1")
-	test(`Math.floor(1.5)`, "1")
-}
-
-func TestMath_log(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.log(NaN)`, "NaN")
-	test(`Math.log(-1)`, "NaN")
-	test(`Math.log(+0)`, "-Infinity")
-	test(`Math.log(-0)`, "-Infinity")
-	test(`1/Math.log(1)`, "Infinity")
-	test(`Math.log(Infinity)`, "Infinity")
-
-	test(`Math.log(0.5)`, "-0.6931471805599453")
-}
-
-func TestMath_max(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.max(-11, -1, 0, 1, 2, 3, 11)`, "11")
-}
-
-func TestMath_min(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.min(-11, -1, 0, 1, 2, 3, 11)`, "-11")
-}
-
-func TestMath_pow(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.pow(0, NaN)`, "NaN")
-	test(`Math.pow(0, 0)`, "1")
-	test(`Math.pow(NaN, 0)`, "1")
-	test(`Math.pow(0, -0)`, "1")
-	test(`Math.pow(NaN, -0)`, "1")
-	test(`Math.pow(NaN, 1)`, "NaN")
-	test(`Math.pow(2, Infinity)`, "Infinity")
-	test(`1/Math.pow(2, -Infinity)`, "Infinity")
-	test(`Math.pow(1, Infinity)`, "NaN")
-	test(`Math.pow(1, -Infinity)`, "NaN")
-	test(`1/Math.pow(0.1, Infinity)`, "Infinity")
-	test(`Math.pow(0.1, -Infinity)`, "Infinity")
-	test(`Math.pow(Infinity, 1)`, "Infinity")
-	test(`1/Math.pow(Infinity, -1)`, "Infinity")
-	test(`Math.pow(-Infinity, 1)`, "-Infinity")
-	test(`Math.pow(-Infinity, 2)`, "Infinity")
-	test(`1/Math.pow(-Infinity, -1)`, "-Infinity")
-	test(`1/Math.pow(-Infinity, -2)`, "Infinity")
-	test(`1/Math.pow(0, 1)`, "Infinity")
-	test(`Math.pow(0, -1)`, "Infinity")
-	test(`1/Math.pow(-0, 1)`, "-Infinity")
-	test(`1/Math.pow(-0, 2)`, "Infinity")
-	test(`Math.pow(-0, -1)`, "-Infinity")
-	test(`Math.pow(-0, -2)`, "Infinity")
-	test(`Math.pow(-1, 0.1)`, "NaN")
-}
-
-func TestMath_round(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.round(NaN)`, "NaN")
-	test(`1/Math.round(0)`, "Infinity")
-	test(`1/Math.round(-0)`, "-Infinity")
-	test(`Math.round(Infinity)`, "Infinity")
-	test(`Math.round(-Infinity)`, "-Infinity")
-	test(`1/Math.round(0.1)`, "Infinity")
-	test(`1/Math.round(-0.1)`, "-Infinity")
-
-	test(`Math.round(3.5)`, "4")
-	test(`Math.round(-3.5)`, "-3")
-}
-
-func TestMath_sin(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.sin(NaN)`, "NaN")
-	test(`1/Math.sin(+0)`, "Infinity")
-	test(`1/Math.sin(-0)`, "-Infinity")
-	test(`Math.sin(Infinity)`, "NaN")
-	test(`Math.sin(-Infinity)`, "NaN")
-
-	test(`Math.sin(0.5)`, "0.479425538604203")
-}
-
-func TestMath_sqrt(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.sqrt(NaN)`, "NaN")
-	test(`Math.sqrt(-1)`, "NaN")
-	test(`1/Math.sqrt(+0)`, "Infinity")
-	test(`1/Math.sqrt(-0)`, "-Infinity")
-	test(`Math.sqrt(Infinity)`, "Infinity")
-
-	test(`Math.sqrt(2)`, "1.4142135623730951")
-}
-
-func TestMath_tan(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Math.tan(NaN)`, "NaN")
-	test(`1/Math.tan(+0)`, "Infinity")
-	test(`1/Math.tan(-0)`, "-Infinity")
-	test(`Math.tan(Infinity)`, "NaN")
-	test(`Math.tan(-Infinity)`, "NaN")
-
-	test(`Math.tan(0.5)`, "0.5463024898437905")
-}
diff --git a/vendor/github.com/robertkrimen/otto/node.go b/vendor/github.com/robertkrimen/otto/node.go
deleted file mode 100644
index aa19eca27..000000000
--- a/vendor/github.com/robertkrimen/otto/node.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"reflect"
-	"sort"
-	"strings"
-)
-
-type _node interface {
-	Type() _nodeType
-	String() string
-	setPosition(int)
-	position() int
-}
-
-type _nodeType int
-
-func (self _nodeType) Type() _nodeType {
-	return self
-}
-
-type _node_ struct {
-	_nodeType
-	Line int // Line in the source
-}
-
-func (self *_node_) setPosition(Line int) {
-	self.Line = Line
-}
-
-func (self *_node_) position() int {
-	return self.Line
-}
-
-const (
-	nodeEmpty _nodeType = iota
-	nodeCall
-	nodeBlock
-	nodeFunction
-	nodeCatch
-	nodeProgram
-	nodeSwitch
-	nodeCase
-	nodeTryCatch
-	nodeWhile
-	nodeDoWhile
-	nodeString
-	nodeBoolean
-	nodeNull
-	nodeAssignment
-	nodeUnaryOperation
-	nodeBinaryOperation
-	nodeBreak
-	nodeContinue
-	nodeComparison
-	nodeIdentifier
-	nodeReturn
-	nodeIf
-	nodeNumber
-	nodeThrow
-	nodeVariableDeclaration
-	nodeVariableDeclarationList
-	nodeWith
-	nodeFor
-	nodeForIn
-	nodeDotMember
-	nodeBracketMember
-
-	nodeObject
-	nodeObjectProperty
-
-	nodeArray
-	nodeRegExp
-
-	nodeNew
-
-	nodeValue
-	nodeThis
-	nodeComma
-)
-
-// _labelSet
-
-type _labelSet map[string]bool
-
-func (self _labelSet) label(target string) string {
-	tmp := []string{}
-	for label, _ := range self {
-		if len(label) == 0 {
-			continue
-		}
-		tmp = append(tmp, label)
-	}
-	sort.Strings(tmp)
-	tmp = append([]string{target}, tmp...)
-	return strings.Join(tmp, ":")
-}
-
-// _declaration
-
-type _declaration struct {
-	Name       string
-	Definition _node
-}
-
-// _node*String
-
-func _fmtNodeSliceString(input interface{}) string {
-	result := []string{}
-	inputValue := reflect.ValueOf(input)
-	for i := 0; i < inputValue.Len(); i++ {
-		result = append(result, fmt.Sprintf("%v", inputValue.Index(i).Interface()))
-	}
-	if len(result) == 0 {
-		return "_"
-	}
-	return strings.Join(result, " ")
-}
-
-func fmtNodeString(argument0 interface{}, arguments ...interface{}) string {
-	if _, yes := argument0.(string); yes {
-		return _fmtNodeString(argument0.(string), arguments...)
-	}
-
-	result := ""
-
-	if argument0 != nil {
-		result = fmt.Sprintf("%v", argument0)
-	} else if len(arguments) > 0 {
-		result = fmt.Sprintf("%v", arguments[0])
-	}
-
-	return result
-}
-
-func _fmtNodeString(head string, arguments ...interface{}) string {
-	tail := []interface{}{}
-	for _, argument := range arguments {
-		value := argument
-		if reflect.ValueOf(argument).Kind() == reflect.Slice {
-			tail = append(tail, _fmtNodeSliceString(value))
-		} else {
-			tail = append(tail, value)
-		}
-	}
-	result := fmt.Sprintf(head, tail...)
-	if false && result != "{}" {
-		result = fmt.Sprintf("{ %s }", result)
-	}
-	return result
-}
diff --git a/vendor/github.com/robertkrimen/otto/node_expression.go b/vendor/github.com/robertkrimen/otto/node_expression.go
deleted file mode 100644
index 999ac91a4..000000000
--- a/vendor/github.com/robertkrimen/otto/node_expression.go
+++ /dev/null
@@ -1,424 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-type _arrayNode struct {
-	_nodeType
-	_node_
-	nodeList []_node
-}
-
-func newArrayNode(nodeList []_node) *_arrayNode {
-	return &_arrayNode{
-		_nodeType: nodeArray,
-		nodeList:  nodeList,
-	}
-}
-
-func (self *_arrayNode) String() string {
-	if len(self.nodeList) == 0 {
-		return "[]"
-	}
-	return fmtNodeString("[ %s ]", self.nodeList)
-}
-
-type _assignmentNode struct {
-	_nodeType
-	_node_
-	Assignment string
-	Operator   string
-	Left       _node
-	Right      _node
-}
-
-func newAssignmentNode(assignment string, left _node, right _node) *_assignmentNode {
-	return &_assignmentNode{
-		_nodeType:  nodeAssignment,
-		Assignment: assignment,
-		Operator:   assignmentTable[assignment],
-		Left:       left,
-		Right:      right,
-	}
-}
-
-func (self _assignmentNode) String() string {
-	return fmt.Sprintf("{ %s= %s %s }", self.Operator, self.Left, self.Right)
-}
-
-type _binaryOperationNode struct {
-	_nodeType
-	_node_
-	Operator string
-	Left     _node
-	Right    _node
-}
-
-func newBinaryOperationNode(operator string, left _node, right _node) *_binaryOperationNode {
-	return &_binaryOperationNode{
-		_nodeType: nodeBinaryOperation,
-		Operator:  operator,
-		Left:      left,
-		Right:     right,
-	}
-}
-
-func (self _binaryOperationNode) String() string {
-	return fmt.Sprintf("{ %s %s %s }", self.Operator, self.Left, self.Right)
-}
-
-type _callNode struct {
-	_nodeType
-	_node_
-	Callee       _node
-	ArgumentList []_node
-}
-
-func newCallNode(callee _node) *_callNode {
-	return &_callNode{
-		_nodeType:    nodeCall,
-		Callee:       callee,
-		ArgumentList: []_node{},
-	}
-}
-
-func (self _callNode) String() string {
-	return fmtNodeString("{ <call> %s %s }", self.Callee, self.ArgumentList)
-}
-
-type _commaNode struct {
-	_nodeType
-	_node_
-	Sequence []_node
-}
-
-func newCommaNode(sequence []_node) *_commaNode {
-	return &_commaNode{
-		_nodeType: nodeComma,
-		Sequence:  sequence,
-	}
-}
-
-func (self _commaNode) String() string {
-	return fmtNodeString("{ %s }", self.Sequence)
-}
-
-type _comparisonNode struct {
-	_nodeType
-	_node_
-	Comparator string
-	Left       _node
-	Right      _node
-}
-
-func newComparisonNode(comparator string, left _node, right _node) *_comparisonNode {
-	return &_comparisonNode{
-		_nodeType:  nodeComparison,
-		Comparator: comparator,
-		Left:       left,
-		Right:      right,
-	}
-}
-
-func (self _comparisonNode) String() string {
-	return fmt.Sprintf("{ %s %s %s }", self.Comparator, self.Left, self.Right)
-}
-
-type _conditionalNode struct {
-	_nodeType
-	_node_
-	Test       _node
-	Consequent _node
-	Alternate  _node
-}
-
-func newConditionalNode(test _node, consequent _node, alternate _node) *_conditionalNode {
-	return &_conditionalNode{
-		Test:       test,
-		Consequent: consequent,
-		Alternate:  alternate,
-	}
-}
-
-func (self _conditionalNode) String() string {
-	return fmtNodeString("{ ?: %s %s %s }", self.Test, self.Consequent, self.Alternate)
-}
-
-type _functionNode struct {
-	_nodeType
-	_node_
-	_declaration         bool
-	ParameterList        []string
-	Body                 []_node
-	VariableList         []_declaration
-	FunctionList         []_declaration
-	ArgumentsIsParameter bool // A hint that "arguments" exists as a parameter
-}
-
-func newFunctionNode() *_functionNode {
-	return &_functionNode{
-		_nodeType: nodeFunction,
-	}
-}
-
-func (self _functionNode) String() string {
-	return fmtNodeString("{ <function> %s }", self.Body)
-}
-
-func (self *_functionNode) AddParameter(identifier string) {
-	self.ParameterList = append(self.ParameterList, identifier)
-}
-
-type _identifierNode struct {
-	_nodeType
-	_node_
-	Value string
-}
-
-func newIdentifierNode(value string) *_identifierNode {
-	return &_identifierNode{
-		_nodeType: nodeIdentifier,
-		Value:     value,
-	}
-}
-
-func (self *_identifierNode) String() string {
-	return self.Value
-}
-
-type _dotMemberNode struct {
-	_nodeType
-	_node_
-	Target _node
-	Member string
-}
-
-func newDotMemberNode(target _node, member string) *_dotMemberNode {
-	return &_dotMemberNode{
-		_nodeType: nodeDotMember,
-		Target:    target,
-		Member:    member,
-	}
-}
-
-func (self *_dotMemberNode) String() string {
-	return fmtNodeString("{ . %s %s }", self.Target, self.Member)
-}
-
-type _bracketMemberNode struct {
-	_nodeType
-	_node_
-	Target _node
-	Member _node
-}
-
-func newBracketMemberNode(target _node, member _node) *_bracketMemberNode {
-	return &_bracketMemberNode{
-		_nodeType: nodeBracketMember,
-		Target:    target,
-		Member:    member,
-	}
-}
-
-func (self *_bracketMemberNode) String() string {
-	return fmtNodeString("{ [ %s %s }", self.Target, self.Member)
-}
-
-type _newNode struct {
-	_nodeType
-	_node_
-	Callee       _node
-	ArgumentList []_node
-}
-
-func newnewNode(callee _node) *_newNode {
-	return &_newNode{
-		_nodeType:    nodeNew,
-		Callee:       callee,
-		ArgumentList: []_node{},
-	}
-}
-
-func (self _newNode) String() string {
-	return fmtNodeString("{ <new> %s %s }", self.Callee, self.ArgumentList)
-}
-
-type _objectNode struct {
-	_nodeType
-	_node_
-	propertyList []*_objectPropertyNode
-}
-
-func newObjectNode() *_objectNode {
-	return &_objectNode{
-		_nodeType: nodeObject,
-	}
-}
-
-func (self *_objectNode) AddProperty(property *_objectPropertyNode) {
-	self.propertyList = append(self.propertyList, property)
-}
-
-func (self *_objectNode) String() string {
-	if len(self.propertyList) == 0 {
-		return "{[]}"
-	}
-	return fmtNodeString("{[ %s ]}", self.propertyList)
-}
-
-type _objectPropertyNode struct {
-	_nodeType
-	_node_
-	Key   string
-	Value _node
-}
-
-func newObjectPropertyNode(key string, value _node) *_objectPropertyNode {
-	return &_objectPropertyNode{
-		_nodeType: nodeObjectProperty,
-		Key:       key,
-		Value:     value,
-	}
-}
-
-func (self *_objectPropertyNode) String() string {
-	return fmtNodeString("{ %s: %s }", self.Key, self.Value)
-}
-
-type _regExpNode struct {
-	_nodeType
-	_node_
-	Pattern string
-	Flags   string
-}
-
-func newRegExpNode(pattern string, flags string) *_regExpNode {
-	return &_regExpNode{
-		_nodeType: nodeRegExp,
-		Pattern:   pattern,
-		Flags:     flags,
-	}
-}
-
-func (self *_regExpNode) String() string {
-	return fmtNodeString("{ /%s/%s }", self.Pattern, self.Flags)
-}
-
-type _thisNode struct {
-	_nodeType
-	_node_
-}
-
-func newThisNode() *_thisNode {
-	return &_thisNode{
-		_nodeType: nodeThis,
-	}
-}
-
-func (self *_thisNode) String() string {
-	return "this"
-}
-
-type _unaryOperationNode struct {
-	_nodeType
-	_node_
-	Operator string
-	Target   _node
-}
-
-func newUnaryOperationNode(operator string, target _node) *_unaryOperationNode {
-	return &_unaryOperationNode{
-		_nodeType: nodeUnaryOperation,
-		Operator:  operator,
-		Target:    target,
-	}
-}
-
-func (self _unaryOperationNode) String() string {
-	return fmt.Sprintf("{ %s %s }", self.Operator, self.Target)
-}
-
-type _valueNodeType int
-
-const (
-	valueNodeUndefined _valueNodeType = iota
-	valueNodeNull
-	valueNodeBoolean
-	valueNodeString
-	valueNodeNumber
-)
-
-type _valueNode struct {
-	_nodeType
-	_node_
-	Value Value
-	Text  string
-	Kind  _valueNodeType
-}
-
-func newUndefinedNode() *_valueNode {
-	return &_valueNode{
-		_nodeType: nodeValue,
-		Text:      "undefined",
-		Value:     UndefinedValue(),
-		Kind:      valueNodeUndefined,
-	}
-}
-
-func newNullNode(text string) *_valueNode {
-	return &_valueNode{
-		_nodeType: nodeValue,
-		Text:      text,
-		Value:     NullValue(),
-		Kind:      valueNodeNull,
-	}
-}
-
-func newBooleanNode(text string) *_valueNode {
-	node := &_valueNode{
-		_nodeType: nodeValue,
-		Text:      text,
-		Kind:      valueNodeBoolean,
-	}
-	switch text {
-	case "true":
-		node.Value = TrueValue()
-	case "false":
-		node.Value = FalseValue()
-	default:
-		throwHereBeDragons()
-	}
-	return node
-}
-
-func newNumberNode(text string) *_valueNode {
-	// TODO Can there be an error here? Is NaN a good catch-all?
-	value := stringToFloat(text)
-	//value, err := strconv.ParseFloat(text, 64)
-	//if err != nil {
-	//    throwHereBeDragons(error)
-	//}
-	return &_valueNode{
-		_nodeType: nodeValue,
-		Text:      text,
-		Value:     toValue_float64(value),
-		Kind:      valueNodeNumber,
-	}
-}
-
-func newStringNode(text string) *_valueNode {
-	return &_valueNode{
-		_nodeType: nodeValue,
-		Text:      text,
-		Value:     toValue_string(text),
-		Kind:      valueNodeString, // Slightly less ugh, but still ugh
-	}
-}
-
-func (self *_valueNode) String() string {
-	if self.Kind == valueNodeString {
-		return fmt.Sprintf("\"%s\"", self.Text)
-	}
-	return fmt.Sprintf("%s", self.Text)
-}
diff --git a/vendor/github.com/robertkrimen/otto/node_statement.go b/vendor/github.com/robertkrimen/otto/node_statement.go
deleted file mode 100644
index 71699d689..000000000
--- a/vendor/github.com/robertkrimen/otto/node_statement.go
+++ /dev/null
@@ -1,453 +0,0 @@
-package otto
-
-import (
-	"fmt"
-)
-
-type _blockNode struct {
-	_nodeType
-	_node_
-	Body     []_node
-	labelSet _labelSet
-}
-
-func newBlockNode() *_blockNode {
-	return &_blockNode{
-		_nodeType: nodeBlock,
-		labelSet:  _labelSet{},
-	}
-}
-
-func (self _blockNode) String() string {
-	if len(self.Body) == 0 {
-		return "{}"
-	}
-	return fmtNodeString("{ %s }", self.Body)
-}
-
-type _breakNode struct {
-	_nodeType
-	_node_
-	Target string
-}
-
-func newBreakNode(target string) *_breakNode {
-	return &_breakNode{
-		_nodeType: nodeBreak,
-		Target:    target,
-	}
-}
-
-func (self _breakNode) String() string {
-	return fmt.Sprintf("<break:%s>", self.Target)
-}
-
-type _continueNode struct {
-	_nodeType
-	_node_
-	Target string
-}
-
-func newContinueNode(target string) *_continueNode {
-	return &_continueNode{
-		_nodeType: nodeContinue,
-		Target:    target,
-	}
-}
-
-func (self _continueNode) String() string {
-	return fmt.Sprintf("<continue:%s>", self.Target)
-}
-
-type _emptyNode struct {
-	_nodeType
-	_node_
-}
-
-func newEmptyNode() *_emptyNode {
-	return &_emptyNode{
-		_nodeType: nodeEmpty,
-	}
-}
-
-func (self _emptyNode) String() string {
-	return ";"
-}
-
-type _iteratorNode struct {
-	body []_node
-}
-
-func (self _iteratorNode) String() string {
-	if len(self.body) == 0 {
-		return "{}"
-	}
-	return fmtNodeString("{ %s }", self.body)
-}
-
-type _doWhileNode struct {
-	_nodeType
-	_node_
-	_iteratorNode
-	Test     _node
-	labelSet _labelSet
-}
-
-func newDoWhileNode(test _node, body []_node) *_doWhileNode {
-	self := &_doWhileNode{
-		_nodeType: nodeDoWhile,
-		Test:      test,
-		_iteratorNode: _iteratorNode{
-			body: body,
-		},
-		labelSet: _labelSet{},
-	}
-	return self
-}
-
-func (self _doWhileNode) String() string {
-	return fmtNodeString("{ <%s> %s %s }", self.labelSet.label("do-while"), self.Test, self._iteratorNode)
-}
-
-type _forNode struct {
-	_nodeType
-	_node_
-	_iteratorNode
-	Initial  _node
-	Test     _node
-	Update   _node
-	labelSet _labelSet
-}
-
-func newForNode(initial _node, test _node, update _node, body []_node) *_forNode {
-	self := &_forNode{
-		_nodeType: nodeFor,
-		Initial:   initial,
-		Test:      test,
-		Update:    update,
-		_iteratorNode: _iteratorNode{
-			body: body,
-		},
-		labelSet: _labelSet{},
-	}
-	return self
-}
-
-func (self _forNode) String() string {
-
-	return fmtNodeString("{ <%s> %s %s %s %s }", self.labelSet.label("for"),
-		fmtNodeString(self.Initial, ";"),
-		fmtNodeString(self.Test, ";"),
-		fmtNodeString(self.Update, ";"),
-		self._iteratorNode,
-	)
-}
-
-type _forInNode struct {
-	_nodeType
-	_node_
-	_iteratorNode
-	Into     _node
-	Source   _node
-	labelSet _labelSet
-}
-
-func newForInNode(into _node, source _node, body []_node) *_forInNode {
-	self := &_forInNode{
-		_nodeType: nodeForIn,
-		Into:      into,
-		Source:    source,
-		_iteratorNode: _iteratorNode{
-			body: body,
-		},
-		labelSet: _labelSet{},
-	}
-	return self
-}
-
-func (self _forInNode) String() string {
-
-	return fmtNodeString("{ <%s> %s in %s %s }", self.labelSet.label("for-in"),
-		self.Into,
-		self.Source,
-		self._iteratorNode,
-	)
-}
-
-type _whileNode struct {
-	_nodeType
-	_node_
-	_iteratorNode
-	Test     _node
-	labelSet _labelSet
-}
-
-func newWhileNode(test _node, body []_node) *_whileNode {
-	self := &_whileNode{
-		_nodeType: nodeWhile,
-		Test:      test,
-		_iteratorNode: _iteratorNode{
-			body: body,
-		},
-		labelSet: _labelSet{},
-	}
-	return self
-}
-
-func (self _whileNode) String() string {
-	return fmtNodeString("{ <%s> %s %s }", self.labelSet.label("while"), self.Test, self._iteratorNode)
-}
-
-type _ifNode struct {
-	_nodeType
-	_node_
-	Test       _node
-	Consequent _node
-	Alternate  _node
-}
-
-func newIfNode(test _node, consequent _node) *_ifNode {
-	return &_ifNode{
-		_nodeType:  nodeIf,
-		Test:       test,
-		Consequent: consequent,
-	}
-}
-
-func newIfElseNode(test _node, consequent _node, alternate _node) *_ifNode {
-	return &_ifNode{
-		Test:       test,
-		Consequent: consequent,
-		Alternate:  alternate,
-	}
-}
-
-func (self _ifNode) String() string {
-	if self.Alternate != nil {
-		return fmtNodeString("{ <if> %s %s %s }", self.Test, self.Consequent, self.Alternate)
-	}
-	return fmtNodeString("{ <if> %s %s }", self.Test, self.Consequent)
-}
-
-type _programNode struct {
-	_nodeType
-	_node_
-	Body         []_node
-	VariableList []_declaration
-	FunctionList []_declaration
-}
-
-func newProgramNode() *_programNode {
-	return &_programNode{
-		_nodeType: nodeProgram,
-	}
-}
-
-func (self _programNode) String() string {
-	return fmtNodeString("{ @ %s }", self.Body)
-}
-
-func (self _programNode) toFunction(parameterList []string) *_functionNode {
-	node := newFunctionNode()
-	node.ParameterList = parameterList
-	node.Body = self.Body
-	node.VariableList = self.VariableList
-	node.FunctionList = self.FunctionList
-	return node
-}
-
-type _returnNode struct {
-	_nodeType
-	_node_
-	Argument _node
-}
-
-func newReturnNode() *_returnNode {
-	return &_returnNode{
-		_nodeType: nodeReturn,
-	}
-}
-
-func (self _returnNode) String() string {
-	if self.Argument != nil {
-		return fmt.Sprintf("{ <return> %s }", self.Argument)
-	}
-	return fmt.Sprintf("{ <return> }")
-}
-
-type _switchNode struct {
-	_nodeType
-	_node_
-	Discriminant _node
-	Default      int
-	CaseList     [](*_caseNode)
-	labelSet     _labelSet
-}
-
-func newSwitchNode(discriminant _node) *_switchNode {
-	return &_switchNode{
-		_nodeType:    nodeSwitch,
-		Discriminant: discriminant,
-		Default:      -1,
-		labelSet:     _labelSet{},
-	}
-}
-
-func (self *_switchNode) AddCase(_node *_caseNode) {
-	self.CaseList = append(self.CaseList, _node)
-}
-
-func (self _switchNode) String() string {
-	return fmtNodeString("{ <switch> %s %s }", self.Discriminant, self.CaseList)
-}
-
-type _caseNode struct {
-	_nodeType
-	_node_
-	Test _node
-	Body []_node
-}
-
-func newCaseNode(test _node) *_caseNode {
-	return &_caseNode{
-		_nodeType: nodeCase,
-		Test:      test,
-	}
-}
-
-func newDefaultCaseNode() *_caseNode {
-	return &_caseNode{}
-}
-
-func (self _caseNode) String() string {
-	if self.Test != nil {
-		return fmtNodeString("{ <case> %s %s }", self.Test, self.Body)
-	}
-	return fmtNodeString("{ <default> %s }", self.Body)
-}
-
-type _throwNode struct {
-	_nodeType
-	_node_
-	Argument _node
-}
-
-func newThrowNode(argument _node) *_throwNode {
-	return &_throwNode{
-		_nodeType: nodeThrow,
-		Argument:  argument,
-	}
-}
-
-func (self _throwNode) String() string {
-	return fmt.Sprintf("{ <throw> %s }", self.Argument)
-}
-
-type _tryCatchNode struct {
-	_nodeType
-	_node_
-	Try     _node
-	Catch   *_catchNode
-	Finally *_blockNode
-}
-
-func newTryCatchNode(try _node) *_tryCatchNode {
-	return &_tryCatchNode{
-		_nodeType: nodeTryCatch,
-		Try:       try,
-	}
-}
-
-func (self _tryCatchNode) String() string {
-	return fmtNodeString("{ <try> %s %s </try> }", self.Try, func() string {
-		result := ""
-		if self.Catch != nil && self.Finally != nil {
-			result = fmtNodeString("%s <finally> %s", self.Catch, self.Finally)
-		} else if self.Catch != nil {
-			result = fmtNodeString("%s", self.Catch)
-		} else {
-			result = fmtNodeString("<finally> %s", self.Finally)
-		}
-		return result
-	}())
-}
-
-func (self *_tryCatchNode) AddCatch(identifier string, body *_blockNode) {
-	self.Catch = newCatchNode(identifier, body)
-}
-
-type _catchNode struct {
-	_nodeType
-	_node_
-	Identifier string
-	Body       *_blockNode
-}
-
-func newCatchNode(identifier string, body *_blockNode) *_catchNode {
-	return &_catchNode{
-		_nodeType:  nodeCatch,
-		Identifier: identifier,
-		Body:       body,
-	}
-}
-
-func (self _catchNode) String() string {
-	return fmtNodeString("<catch> %s %s", self.Identifier, self.Body)
-}
-
-type _variableDeclarationListNode struct {
-	_nodeType
-	_node_
-	VariableList []*_variableDeclarationNode
-}
-
-func newVariableDeclarationListNode() *_variableDeclarationListNode {
-	return &_variableDeclarationListNode{
-		_nodeType: nodeVariableDeclarationList,
-	}
-}
-
-func (self _variableDeclarationListNode) String() string {
-	return fmtNodeString("%s", self.VariableList)
-}
-
-type _variableDeclarationNode struct {
-	_nodeType
-	_node_
-	Identifier  string
-	Operator    string
-	Initializer _node
-}
-
-func newVariableDeclarationNode(identifier string) *_variableDeclarationNode {
-	return &_variableDeclarationNode{
-		_nodeType:  nodeVariableDeclaration,
-		Identifier: identifier,
-	}
-}
-
-func (self _variableDeclarationNode) String() string {
-	if self.Operator != "" {
-		return fmtNodeString("{ <var> %s %s %s }", self.Operator, self.Identifier, self.Initializer)
-	}
-	return fmtNodeString("{ <var> %s }", self.Identifier)
-}
-
-type _withNode struct {
-	_nodeType
-	_node_
-	Object _node
-	Body   _node
-}
-
-func newWithNode(object _node, body _node) *_withNode {
-	return &_withNode{
-		_nodeType: nodeWith,
-		Object:    object,
-		Body:      body,
-	}
-}
-
-func (self _withNode) String() string {
-	return fmt.Sprintf("{ <with> %s %s }", self.Object, self.Body)
-}
diff --git a/vendor/github.com/robertkrimen/otto/number_test.go b/vendor/github.com/robertkrimen/otto/number_test.go
deleted file mode 100644
index a0b01a837..000000000
--- a/vendor/github.com/robertkrimen/otto/number_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestNumber(t *testing.T) {
-	Terst(t)
-	test := runTest()
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(Number, "prototype");
-        [   [ typeof Number.prototype ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "object,false,false,false")
-}
-
-func TestNumber_toString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        new Number(451).toString();
-    `, "451")
-
-	test(`
-        new Number(451).toString(10);
-    `, "451")
-
-	test(`
-        new Number(451).toString(8);
-    `, "703")
-
-	test(`raise:
-        new Number(451).toString(1);
-    `, "RangeError: RangeError: toString() radix must be between 2 and 36")
-
-	test(`raise:
-        new Number(451).toString(Infinity);
-    `, "RangeError: RangeError: toString() radix must be between 2 and 36")
-
-	test(`
-        new Number(NaN).toString()
-    `, "NaN")
-
-	test(`
-        new Number(Infinity).toString()
-    `, "Infinity")
-
-	test(`
-        new Number(Infinity).toString(16)
-    `, "Infinity")
-}
-
-func TestNumber_toFixed(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`new Number(451).toFixed(2)`, "451.00")
-	test(`12345.6789.toFixed()`, "12346")
-	test(`12345.6789.toFixed(1)`, "12345.7")
-	test(`12345.6789.toFixed(6)`, "12345.678900")
-	test(`(1.23e-20).toFixed(2)`, "0.00")
-	test(`2.34.toFixed(1)`, "2.3")
-	test(`-2.34.toFixed(1)`, "-2.3")
-	test(`(-2.34).toFixed(1)`, "-2.3")
-}
-
-func TestNumber_toExponential(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`new Number(451).toExponential(2)`, "4.51e+02")
-	test(`77.1234.toExponential()`, "7.71234e+01")
-	test(`77.1234.toExponential(4)`, "7.7123e+01")
-	test(`77.1234.toExponential(2)`, "7.71e+01")
-	test(`77 .toExponential()`, "7.7e+01")
-}
-
-func TestNumber_toPrecision(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`new Number(451).toPrecision()`, "451")
-	test(`new Number(451).toPrecision(1)`, "5e+02")
-	test(`5.123456.toPrecision()`, "5.123456")
-	test(`5.123456.toPrecision(5)`, "5.1235")
-	test(`5.123456.toPrecision(2)`, "5.1")
-	test(`5.123456.toPrecision(1)`, "5")
-}
-
-func TestNumber_toLocaleString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        [
-        new Number(451).toLocaleString(),
-        new Number(451).toLocaleString(10),
-        new Number(451).toLocaleString(8)
-        ];
-    `, "451,451,703")
-}
diff --git a/vendor/github.com/robertkrimen/otto/object.go b/vendor/github.com/robertkrimen/otto/object.go
deleted file mode 100644
index fe6f58729..000000000
--- a/vendor/github.com/robertkrimen/otto/object.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package otto
-
-type _object struct {
-	runtime *_runtime
-
-	class       string
-	objectClass *_objectClass
-	value       interface{}
-
-	prototype  *_object
-	extensible bool
-
-	property      map[string]_property
-	propertyOrder []string
-}
-
-func newObject(runtime *_runtime, class string) *_object {
-	self := &_object{
-		runtime:     runtime,
-		class:       class,
-		objectClass: _classObject,
-		property:    make(map[string]_property),
-		extensible:  true,
-	}
-	return self
-}
-
-// 8.12
-
-// 8.12.1
-func (self *_object) getOwnProperty(name string) *_property {
-	return self.objectClass.getOwnProperty(self, name)
-}
-
-// 8.12.2
-func (self *_object) getProperty(name string) *_property {
-	return self.objectClass.getProperty(self, name)
-}
-
-// 8.12.3
-func (self *_object) get(name string) Value {
-	return self.objectClass.get(self, name)
-}
-
-// 8.12.4
-func (self *_object) canPut(name string) bool {
-	return self.objectClass.canPut(self, name)
-}
-
-// 8.12.5
-func (self *_object) put(name string, value Value, throw bool) {
-	self.objectClass.put(self, name, value, throw)
-}
-
-// 8.12.6
-func (self *_object) hasProperty(name string) bool {
-	return self.objectClass.hasProperty(self, name)
-}
-
-func (self *_object) hasOwnProperty(name string) bool {
-	return self.objectClass.hasOwnProperty(self, name)
-}
-
-type _defaultValueHint int
-
-const (
-	defaultValueNoHint _defaultValueHint = iota
-	defaultValueHintString
-	defaultValueHintNumber
-)
-
-// 8.12.8
-func (self *_object) DefaultValue(hint _defaultValueHint) Value {
-	if hint == defaultValueNoHint {
-		if self.class == "Date" {
-			// Date exception
-			hint = defaultValueHintString
-		} else {
-			hint = defaultValueHintNumber
-		}
-	}
-	methodSequence := []string{"valueOf", "toString"}
-	if hint == defaultValueHintString {
-		methodSequence = []string{"toString", "valueOf"}
-	}
-	for _, methodName := range methodSequence {
-		method := self.get(methodName)
-		if method.isCallable() {
-			result := method._object().Call(toValue_object(self))
-			if result.IsPrimitive() {
-				return result
-			}
-		}
-	}
-
-	panic(newTypeError())
-	return UndefinedValue()
-}
-
-func (self *_object) String() string {
-	return toString(self.DefaultValue(defaultValueHintString))
-}
-
-func (self *_object) defineProperty(name string, value Value, mode _propertyMode, throw bool) bool {
-	return self.defineOwnProperty(name, _property{value, mode}, throw)
-}
-
-// 8.12.9
-func (self *_object) defineOwnProperty(name string, descriptor _property, throw bool) bool {
-	return self.objectClass.defineOwnProperty(self, name, descriptor, throw)
-}
-
-func (self *_object) delete(name string, throw bool) bool {
-	return self.objectClass.delete(self, name, throw)
-}
-
-func (self *_object) enumerate(all bool, each func(string) bool) {
-	self.objectClass.enumerate(self, all, each)
-}
-
-func (self *_object) _exists(name string) bool {
-	_, exists := self.property[name]
-	return exists
-}
-
-func (self *_object) _read(name string) (_property, bool) {
-	property, exists := self.property[name]
-	return property, exists
-}
-
-func (self *_object) _write(name string, value interface{}, mode _propertyMode) {
-	if value == nil {
-		value = UndefinedValue()
-	}
-	_, exists := self.property[name]
-	self.property[name] = _property{value, mode}
-	if !exists {
-		self.propertyOrder = append(self.propertyOrder, name)
-	}
-}
-
-func (self *_object) _delete(name string) {
-	_, exists := self.property[name]
-	delete(self.property, name)
-	if exists {
-		for index, property := range self.propertyOrder {
-			if name == property {
-				if index == len(self.propertyOrder)-1 {
-					self.propertyOrder = self.propertyOrder[:index]
-				} else {
-					self.propertyOrder = append(self.propertyOrder[:index], self.propertyOrder[index+1:]...)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/object_class.go b/vendor/github.com/robertkrimen/otto/object_class.go
deleted file mode 100644
index 26d1f7716..000000000
--- a/vendor/github.com/robertkrimen/otto/object_class.go
+++ /dev/null
@@ -1,384 +0,0 @@
-package otto
-
-type _objectClass struct {
-	getOwnProperty    func(*_object, string) *_property
-	getProperty       func(*_object, string) *_property
-	get               func(*_object, string) Value
-	canPut            func(*_object, string) bool
-	put               func(*_object, string, Value, bool)
-	hasProperty       func(*_object, string) bool
-	hasOwnProperty    func(*_object, string) bool
-	defineOwnProperty func(*_object, string, _property, bool) bool
-	delete            func(*_object, string, bool) bool
-	enumerate         func(*_object, bool, func(string) bool)
-	clone             func(*_object, *_object, *_clone) *_object
-}
-
-func objectEnumerate(self *_object, all bool, each func(string) bool) {
-	for _, name := range self.propertyOrder {
-		if all || self.property[name].enumerable() {
-			if !each(name) {
-				return
-			}
-		}
-	}
-}
-
-var (
-	_classObject,
-	_classArray,
-	_classString,
-	_classArguments,
-	_classGoStruct,
-	_classGoMap,
-	_classGoArray,
-	_classGoSlice,
-	_ *_objectClass
-)
-
-func init() {
-	_classObject = &_objectClass{
-		objectGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		objectDefineOwnProperty,
-		objectDelete,
-		objectEnumerate,
-		objectClone,
-	}
-
-	_classArray = &_objectClass{
-		objectGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		arrayDefineOwnProperty,
-		objectDelete,
-		objectEnumerate,
-		objectClone,
-	}
-
-	_classString = &_objectClass{
-		stringGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		objectDefineOwnProperty,
-		objectDelete,
-		stringEnumerate,
-		objectClone,
-		//stringClone,
-	}
-
-	_classArguments = &_objectClass{
-		argumentsGetOwnProperty,
-		objectGetProperty,
-		argumentsGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		argumentsDefineOwnProperty,
-		argumentsDelete,
-		argumentsEnumerate,
-		//argumentsClone
-		objectClone,
-	}
-
-	_classGoStruct = &_objectClass{
-		goStructGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		goStructCanPut,
-		goStructPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		objectDefineOwnProperty,
-		objectDelete,
-		goStructEnumerate,
-		objectClone,
-	}
-
-	_classGoMap = &_objectClass{
-		goMapGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		goMapDefineOwnProperty,
-		goMapDelete,
-		goMapEnumerate,
-		objectClone,
-	}
-
-	_classGoArray = &_objectClass{
-		goArrayGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		goArrayDefineOwnProperty,
-		goArrayDelete,
-		goArrayEnumerate,
-		objectClone,
-	}
-
-	_classGoSlice = &_objectClass{
-		goSliceGetOwnProperty,
-		objectGetProperty,
-		objectGet,
-		objectCanPut,
-		objectPut,
-		objectHasProperty,
-		objectHasOwnProperty,
-		goSliceDefineOwnProperty,
-		goSliceDelete,
-		goSliceEnumerate,
-		objectClone,
-	}
-}
-
-// Allons-y
-
-// 8.12.1
-func objectGetOwnProperty(self *_object, name string) *_property {
-	// Return a _copy_ of the property
-	property, exists := self._read(name)
-	if !exists {
-		return nil
-	}
-	return &property
-}
-
-// 8.12.2
-func objectGetProperty(self *_object, name string) *_property {
-	property := self.getOwnProperty(name)
-	if property != nil {
-		return property
-	}
-	if self.prototype != nil {
-		return self.prototype.getProperty(name)
-	}
-	return nil
-}
-
-// 8.12.3
-func objectGet(self *_object, name string) Value {
-	property := self.getProperty(name)
-	if property != nil {
-		return property.value.(Value)
-	}
-	return UndefinedValue()
-}
-
-// 8.12.4
-func objectCanPut(self *_object, name string) bool {
-
-	property := self.getOwnProperty(name)
-	if property != nil {
-		switch value := property.value.(type) {
-		case Value:
-			return property.writable()
-		case _propertyGetSet:
-			return value[1] != nil
-		default:
-			panic(newTypeError())
-		}
-	}
-
-	if self.prototype == nil {
-		return self.extensible
-	}
-
-	property = self.prototype.getOwnProperty(name)
-	if property == nil {
-		return self.extensible
-	}
-
-	switch value := property.value.(type) {
-	case Value:
-		if !self.extensible {
-			return false
-		}
-		return property.writable()
-	case _propertyGetSet:
-		return value[1] != nil
-	default:
-		panic(newTypeError())
-	}
-
-	return false
-}
-
-// 8.12.5
-func objectPut(self *_object, name string, value Value, throw bool) {
-	if !self.canPut(name) {
-		typeErrorResult(throw)
-		return
-	}
-	// TODO This is not exacting to the specification
-	// TODO Shortcut?
-	property := self.getOwnProperty(name)
-	if property == nil {
-		self.defineProperty(name, value, 0111, throw)
-	} else {
-		property.value = value
-		self.defineOwnProperty(name, *property, throw)
-	}
-}
-
-// 8.12.6
-func objectHasProperty(self *_object, name string) bool {
-	return self.getProperty(name) != nil
-}
-
-func objectHasOwnProperty(self *_object, name string) bool {
-	return self.getOwnProperty(name) != nil
-}
-
-// 8.12.9
-func objectDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	property, exists := self._read(name)
-	{
-		if !exists {
-			if !self.extensible {
-				goto Reject
-			}
-			self._write(name, descriptor.value, descriptor.mode)
-			return true
-		}
-		if descriptor.isEmpty() {
-			return true
-		}
-
-		// TODO Per 8.12.9.6 - We should shortcut here (returning true) if
-		// the current and new (define) properties are the same
-
-		configurable := property.configurable()
-		if !configurable {
-			if descriptor.configurable() {
-				goto Reject
-			}
-			// Test that, if enumerable is set on the property descriptor, then it should
-			// be the same as the existing property
-			if descriptor.enumerateSet() && descriptor.enumerable() != property.enumerable() {
-				goto Reject
-			}
-		}
-		value, isDataDescriptor := property.value.(Value)
-		getSet, _ := property.value.(_propertyGetSet)
-		if descriptor.isGenericDescriptor() {
-			// GenericDescriptor
-		} else if isDataDescriptor != descriptor.isDataDescriptor() {
-			// FIXME This branch is non-functioning
-			panic("isDataDescriptor != descriptor.isDataDescriptor")
-			var interface_ interface{}
-			if isDataDescriptor {
-				property.writeOff()
-				property.value = interface_
-			} else {
-				property.writeOn()
-				property.value = interface_
-			}
-		} else if isDataDescriptor && descriptor.isDataDescriptor() {
-			if !configurable {
-				if !property.writable() && descriptor.writable() {
-					goto Reject
-				}
-				if !property.writable() {
-					if descriptor.value != nil && !sameValue(value, descriptor.value.(Value)) {
-						goto Reject
-					}
-				}
-			}
-		} else {
-			if !configurable {
-				defineGetSet, _ := descriptor.value.(_propertyGetSet)
-				if getSet[0] != defineGetSet[0] || getSet[1] != defineGetSet[1] {
-					goto Reject
-				}
-			}
-		}
-		{
-			// This section will preserve attributes of
-			// the original property, if necessary
-			value1 := descriptor.value
-			if value1 == nil {
-				value1 = property.value
-			}
-			mode1 := descriptor.mode
-			if mode1&0222 != 0 {
-				// TODO Factor this out into somewhere testable
-				// (Maybe put into switch ...)
-				mode0 := property.mode
-				if mode1&0200 != 0 {
-					mode1 |= (mode0 & 0100)
-				}
-				if mode1&020 != 0 {
-					mode1 |= (mode0 & 010)
-				}
-				if mode1&02 != 0 {
-					mode1 |= (mode0 & 01)
-				}
-				mode1 &= 0111
-			}
-			self._write(name, value1, mode1)
-		}
-		return true
-	}
-Reject:
-	if throw {
-		panic(newTypeError())
-	}
-	return false
-}
-
-func objectDelete(self *_object, name string, throw bool) bool {
-	property_ := self.getOwnProperty(name)
-	if property_ == nil {
-		return true
-	}
-	if property_.configurable() {
-		self._delete(name)
-		return true
-	}
-	return typeErrorResult(throw)
-}
-
-func objectClone(self0 *_object, self1 *_object, clone *_clone) *_object {
-	*self1 = *self0
-
-	self1.runtime = clone.runtime
-	if self1.prototype != nil {
-		self1.prototype = clone.object(self0.prototype)
-	}
-	self1.property = make(map[string]_property, len(self0.property))
-	self1.propertyOrder = make([]string, len(self0.propertyOrder))
-	copy(self1.propertyOrder, self0.propertyOrder)
-	for index, property := range self0.property {
-		self1.property[index] = clone.property(property)
-	}
-
-	switch value := self0.value.(type) {
-	case _functionObject:
-		self1.value = value.clone(clone)
-	case _argumentsObject:
-		self1.value = value.clone(clone)
-	}
-
-	return self1
-}
diff --git a/vendor/github.com/robertkrimen/otto/object_test.go b/vendor/github.com/robertkrimen/otto/object_test.go
deleted file mode 100644
index 0cd0bef14..000000000
--- a/vendor/github.com/robertkrimen/otto/object_test.go
+++ /dev/null
@@ -1,368 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestObject_(t *testing.T) {
-	Terst(t)
-
-	object := newObject(nil, "")
-	IsTrue(object != nil)
-
-	object.put("xyzzy", toValue("Nothing happens."), true)
-	Is(object.get("xyzzy"), "Nothing happens.")
-
-	test := runTest()
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(Object, "prototype");
-        [ [ typeof Object.prototype, abc.writable, abc.enumerable, abc.configurable ],
-        ];
-    `, "object,false,false,false")
-}
-
-func TestStringObject(t *testing.T) {
-	Terst(t)
-
-	object := New().runtime.newStringObject(toValue("xyzzy"))
-	Is(object.get("1"), "y")
-	Is(object.get("10"), "undefined")
-	Is(object.get("2"), "z")
-}
-
-func TestObject_getPrototypeOf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        abc = {};
-        def = Object.getPrototypeOf(abc);
-        ghi = Object.getPrototypeOf(def);
-        [abc,def,ghi,ghi+""];
-    `, "[object Object],[object Object],,null")
-
-	test(`
-        abc = Object.getOwnPropertyDescriptor(Object, "getPrototypeOf");
-        [ abc.value === Object.getPrototypeOf, abc.writable, abc.enumerable, abc.configurable ];
-    `, "true,true,false,true")
-}
-
-func TestObject_new(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        [ new Object("abc"), new Object(2+2) ];
-    `, "abc,4")
-}
-
-func TestObject_create(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: Object.create()`, "TypeError")
-	test(`
-        var abc = Object.create(null)
-        var def = Object.create({x: 10, y: 20})
-        var ghi = Object.create(Object.prototype)
-
-        var jkl = Object.create({x: 10, y: 20}, {
-            z: {
-                value: 30,
-                writable: true
-            },
-            // sum: {
-            //     get: function() {
-            //         return this.x + this.y + this.z
-            //     }
-            // }
-        });
-	      [ abc.prototype, def.x, def.y, ghi, jkl.x, jkl.y, jkl.z ]
-    `, ",10,20,[object Object],10,20,30")
-
-	test(`
-        var properties = {};
-        Object.defineProperty(properties, "abc", {
-            value: {},
-            enumerable: false
-        });
-        var mno = Object.create({}, properties);
-        mno.hasOwnProperty("abc");
-    `, "false")
-}
-
-func TestObject_toLocaleString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        ({}).toLocaleString();
-    `, "[object Object]")
-
-	test(`
-        object = {
-            toString: function() {
-                return "Nothing happens.";
-            }
-        };
-        object.toLocaleString();
-    `, "Nothing happens.")
-}
-
-func TestObject_isExtensible(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise:
-        Object.isExtensible();
-    `, "TypeError")
-	test(`raise:
-        Object.isExtensible({});
-    `, "true")
-
-	test(`Object.isExtensible.length`, "1")
-	test(`Object.isExtensible.prototype`, "undefined")
-}
-
-func TestObject_preventExtensions(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise:
-        Object.preventExtensions()
-    `, "TypeError")
-
-	test(`raise:
-        var abc = { def: true };
-        var ghi = Object.preventExtensions(abc);
-        [ ghi.def === true, Object.isExtensible(abc), Object.isExtensible(ghi) ];
-    `, "true,false,false")
-
-	test(`
-        var abc = new String();
-        var def = Object.isExtensible(abc);
-        Object.preventExtensions(abc);
-        var ghi = false;
-        try {
-            Object.defineProperty(abc, "0", { value: "~" });
-        } catch (err) {
-            ghi = err instanceof TypeError;
-        }
-        [ def, ghi, abc.hasOwnProperty("0"), typeof abc[0] ];
-    `, "true,true,false,undefined")
-
-	test(`Object.preventExtensions.length`, "1")
-	test(`Object.preventExtensions.prototype`, "undefined")
-}
-
-func TestObject_isSealed(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`Object.isSealed.length`, "1")
-	test(`Object.isSealed.prototype`, "undefined")
-}
-
-func TestObject_seal(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: Object.seal()`, "TypeError")
-	test(`
-        var abc = {a:1,b:1,c:3};
-        var sealed = Object.isSealed(abc);
-        Object.seal(abc);
-        [sealed, Object.isSealed(abc)];
-    `, "false,true")
-	test(`
-		var abc = {a:1,b:1,c:3};
-		var sealed = Object.isSealed(abc);
-		var caught = false;
-		Object.seal(abc);
-		abc.b = 5;
-        Object.defineProperty(abc, "a", {value:4});
-        try {
-            Object.defineProperty(abc, "a", {value:42,enumerable:false});
-        } catch (e) {
-            caught = e instanceof TypeError;
-        }
-        [sealed, Object.isSealed(abc), caught, abc.a, abc.b];
-	`, "false,true,true,4,5")
-
-	test(`Object.seal.length`, "1")
-	test(`Object.seal.prototype`, "undefined")
-}
-
-func TestObject_isFrozen(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: Object.isFrozen()`, "TypeError")
-	test(`Object.isFrozen(Object.preventExtensions({a:1}))`, "false")
-	test(`Object.isFrozen({})`, "false")
-
-	test(`
-        var abc = {};
-        Object.defineProperty(abc, "def", {
-            value: "def",
-            writable: true,
-            configurable: false
-        });
-        Object.preventExtensions(abc);
-        !Object.isFrozen(abc);
-    `, "true")
-
-	test(`Object.isFrozen.length`, "1")
-	test(`Object.isFrozen.prototype`, "undefined")
-}
-
-func TestObject_freeze(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise: Object.freeze()`, "TypeError")
-	test(`
-            var abc = {a:1,b:2,c:3};
-            var frozen = Object.isFrozen(abc);
-            Object.freeze(abc);
-            abc.b = 5;
-            [frozen, Object.isFrozen(abc), abc.b];
-        `, "false,true,2")
-
-	test(`
-            var abc = {a:1,b:2,c:3};
-            var frozen = Object.isFrozen(abc);
-            var caught = false;
-            Object.freeze(abc);
-            abc.b = 5;
-            try {
-                Object.defineProperty(abc, "a", {value:4});
-            } catch (e) {
-                caught = e instanceof TypeError;
-            }
-            [frozen, Object.isFrozen(abc), caught, abc.a, abc.b];
-        `, "false,true,true,1,2")
-
-	test(`Object.freeze.length`, "1")
-	test(`Object.freeze.prototype`, "undefined")
-}
-
-func TestObject_defineProperty(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        (function(abc, def, ghi){
-            Object.defineProperty(arguments, "0", {
-                enumerable: false
-            });
-            return true;
-        })(0, 1, 2);
-        `,
-		"true",
-	)
-
-	test(`
-        var abc = {};
-        abc.def = 3.14; // Default: writable: true, enumerable: true, configurable: true
-
-        Object.defineProperty(abc, "def", {
-            value: 42
-        });
-
-        var ghi = Object.getOwnPropertyDescriptor(abc, "def");
-        [ ghi.value, ghi.writable, ghi.enumerable, ghi.configurable ];
-    `, "42,true,true,true")
-
-	// Test that we handle the case of DefineOwnProperty
-	// where [[Writable]] is something but [[Value]] is not
-	test(`
-		var abc = [];
-        Object.defineProperty(abc, "0", { writable: false });
-        0 in abc;
-    `, "true")
-
-	// Test that we handle the case of DefineOwnProperty
-	// where [[Writable]] is something but [[Value]] is not
-	// (and the property originally had something for [[Value]]
-	test(`
-		abc = {
-            def: 42
-        };
-        Object.defineProperty(abc, "def", { writable: false });
-        abc.def;
-    `, "42")
-}
-
-func TestObject_keys(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`Object.keys({ abc:undefined, def:undefined })`, "abc,def")
-
-	test(`
-		function abc() {
-            this.abc = undefined;
-            this.def = undefined;
-        }
-		Object.keys(new abc())
-	`, "abc,def")
-
-	test(`
-		function def() {
-            this.ghi = undefined;
-        }
-		def.prototype = new abc();
-		Object.keys(new def());
-	`, "ghi")
-
-	test(`
-		var ghi = Object.create(
-            {
-                abc: undefined,
-                def: undefined
-            },
-            {
-                ghi: { value: undefined, enumerable: true },
-                jkl: { value: undefined, enumerable: false }
-		    }
-        );
-		Object.keys(ghi);
-	`, "ghi")
-
-	test(`
-        (function(abc, def, ghi){
-            return Object.keys(arguments)
-        })(undefined, undefined);
-    `, "0,1")
-
-	test(`
-        (function(abc, def, ghi){
-            return Object.keys(arguments)
-        })(undefined, undefined, undefined, undefined);
-    `, "0,1,2,3")
-}
-
-func TestObject_getOwnPropertyNames(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`Object.getOwnPropertyNames({ abc:undefined, def:undefined })`, "abc,def")
-
-	test(`
-		var ghi = Object.create(
-            {
-                abc: undefined,
-                def: undefined
-            },
-            {
-                ghi: { value: undefined, enumerable: true },
-                jkl: { value: undefined, enumerable: false }
-		    }
-        );
-        Object.getOwnPropertyNames(ghi)
-    `, "ghi,jkl")
-}
diff --git a/vendor/github.com/robertkrimen/otto/otto.go b/vendor/github.com/robertkrimen/otto/otto.go
deleted file mode 100644
index 36b8e40d4..000000000
--- a/vendor/github.com/robertkrimen/otto/otto.go
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
-Package otto is a JavaScript parser and interpreter written natively in Go.
-
-	// Create a new runtime
-	Otto := otto.New()
-
-	Otto.Run(`
-		abc = 2 + 2
-		console.log("The value of abc is " + abc)
-		// The value of abc is 4
-	`)
-
-	value, err := Otto.Get("abc")
-	{
-		// value is an int64 with a value of 4
-		value, _ := value.ToInteger()
-	}
-
-	Otto.Set("def", 11)
-	Otto.Run(`
-		console.log("The value of def is " + def)
-		// The value of def is 11
-	`)
-
-	Otto.Set("xyzzy", "Nothing happens.")
-	Otto.Run(`
-		console.log(xyzzy.length) // 16
-	`)
-
-	value, _ = Otto.Run("xyzzy.length")
-	{
-		// value is an int64 with a value of 16
-		value, _ := value.ToInteger()
-	}
-
-	value, err = Otto.Run("abcdefghijlmnopqrstuvwxyz.length")
-	if err != nil {
-		// err = ReferenceError: abcdefghijlmnopqrstuvwxyz is not defined
-		// If there is an error, then value.IsUndefined() is true
-		...
-	}
-
-Embedding a Go function in JavaScript:
-
-	Otto.Set("sayHello", func(call otto.FunctionCall) otto.Value {
-		fmt.Printf("Hello, %s.\n", call.Argument(0).String())
-		return otto.UndefinedValue()
-	})
-
-	Otto.Set("twoPlus", func(call otto.FunctionCall) otto.Value {
-		right, _ := call.Argument(0).ToInteger()
-		result, _ := Otto.ToValue(2 + right)
-		return result
-	})
-
-	result, _ = Otto.Run(`
-		// First, say a greeting
-		sayHello("Xyzzy") // Hello, Xyzzy.
-		sayHello() // Hello, undefined
-
-		result = twoPlus(2.0) // 4
-	`)
-
-You can run (Go) JavaScript from the commandline with: http://github.com/robertkrimen/otto/tree/master/otto
-
-	$ go get -v github.com/robertkrimen/otto/otto
-
-Run JavaScript by entering some source on stdin or by giving otto a filename:
-
-	$ otto example.js
-
-Optionally include the JavaScript utility-belt library, underscore, with this import:
-
-	import (
-		"github.com/robertkrimen/otto"
-		_ "github.com/robertkrimen/otto/underscore"
-	)
-
-	// Now every otto runtime will come loaded with underscore
-
-For more information: http://github.com/robertkrimen/otto/tree/master/underscore
-
-Caveat Emptor
-
-    * For now, otto is a hybrid ECMA3/ECMA5 interpreter. Parts of the specification are still works in progress.
-    * For example, "use strict" will parse, but does nothing.
-    * Error reporting needs to be improved.
-    * Does not support the (?!) or (?=) regular expression syntax (because Go does not)
-    * JavaScript considers a vertical tab (\000B <VT>) to be part of the whitespace class (\s), while RE2 does not.
-    * Really, error reporting could use some improvement.
-
-Regular Expression Syntax
-
-Go translates JavaScript-style regular expressions into something that is "regexp" package compatible.
-
-Unfortunately, JavaScript has positive lookahead, negative lookahead, and backreferencing,
-all of which are not supported by Go's RE2-like engine: https://code.google.com/p/re2/wiki/Syntax
-
-A brief discussion of these limitations: "Regexp (?!re)" https://groups.google.com/forum/?fromgroups=#!topic/golang-nuts/7qgSDWPIh_E
-
-More information about RE2: https://code.google.com/p/re2/
-
-JavaScript considers a vertical tab (\000B <VT>) to be part of the whitespace class (\s), while RE2 does not.
-
-*/
-package otto
-
-import (
-	"fmt"
-	"github.com/robertkrimen/otto/registry"
-	"strings"
-)
-
-// Otto is the representation of the JavaScript runtime. Each instance of Otto has a self-contained namespace.
-type Otto struct {
-	runtime *_runtime
-}
-
-// New will allocate a new JavaScript runtime
-func New() *Otto {
-	self := &Otto{
-		runtime: newContext(),
-	}
-	self.runtime.Otto = self
-	self.Set("console", self.runtime.newConsole())
-
-	registry.Apply(func(entry registry.Entry) {
-		self.Run(entry.Source())
-	})
-
-	return self
-}
-
-func (otto *Otto) clone() *Otto {
-	self := &Otto{
-		runtime: otto.runtime.clone(),
-	}
-	self.runtime.Otto = self
-	return self
-}
-
-// Run will allocate a new JavaScript runtime, run the given source
-// on the allocated runtime, and return the runtime, resulting value, and
-// error (if any).
-func Run(source string) (*Otto, Value, error) {
-	otto := New()
-	value, err := otto.Run(source)
-	return otto, value, err
-}
-
-// Run will run the given source (parsing it first), returning the resulting value and error (if any)
-//
-// If the runtime is unable to parse source, then this function will return undefined and the parse error (nothing
-// will be evaluated in this case).
-func (self Otto) Run(source string) (Value, error) {
-	return self.runtime.runSafe(source)
-}
-
-// Get the value of the top-level binding of the given name.
-//
-// If there is an error (like the binding does not exist), then the value
-// will be undefined.
-func (self Otto) Get(name string) (Value, error) {
-	value := UndefinedValue()
-	err := catchPanic(func() {
-		value = self.getValue(name)
-	})
-	return value, err
-}
-
-func (self Otto) getValue(name string) Value {
-	return self.runtime.GlobalEnvironment.GetValue(name, false)
-}
-
-// Set the top-level binding of the given name to the given value.
-//
-// Set will automatically apply ToValue to the given value in order
-// to convert it to a JavaScript value (type Value).
-//
-// If there is an error (like the binding is read-only, or the ToValue conversion
-// fails), then an error is returned.
-//
-// If the top-level binding does not exist, it will be created.
-func (self Otto) Set(name string, value interface{}) error {
-	{
-		value, err := self.ToValue(value)
-		if err != nil {
-			return err
-		}
-		err = catchPanic(func() {
-			self.setValue(name, value)
-		})
-		return err
-	}
-}
-
-func (self Otto) setValue(name string, value Value) {
-	self.runtime.GlobalEnvironment.SetValue(name, value, false)
-}
-
-// Call the given JavaScript with a given this and arguments.
-//
-// WARNING: 2013-05-19: This function is rough, and is in beta.
-//
-// If this is nil, then some special handling takes place to determine the proper
-// this value, falling back to a "standard" invocation if necessary (where this is
-// undefined).
-//
-// If source begins with "new " (A lowercase new followed by a space), then
-// Call will invoke the function constructor rather than performing a function call.
-// In this case, the this argument has no effect.
-//
-//      // value is a String object                                                       
-//      value, _ := Otto.Call("Object", nil, "Hello, World.")                             
-//                                                                                        
-//      // Likewise...                                                                    
-//      value, _ := Otto.Call("new Object", nil, "Hello, World.")                         
-//                                                                                        
-//      // This will perform a concat on the given array and return the result            
-//      // value is [ 1, 2, 3, undefined, 4, 5, 6, 7, "abc" ]                             
-//      value, _ := Otto.Call(`[ 1, 2, 3, undefined, 4 ].concat`, nil, 5, 6, 7, "abc")    
-//
-func (self Otto) Call(source string, this interface{}, argumentList ...interface{}) (Value, error) {
-
-	thisValue := UndefinedValue()
-
-	new_ := false
-	switch {
-	case strings.HasPrefix(source, "new "):
-		source = source[4:]
-		new_ = true
-	}
-
-	if !new_ && this == nil {
-		value := UndefinedValue()
-		fallback := false
-		err := catchPanic(func() {
-			programNode := mustParse(source + "()")
-			if callNode, valid := programNode.Body[0].(*_callNode); valid {
-				value = self.runtime.evaluateCall(callNode, argumentList)
-			} else {
-				fallback = true
-			}
-		})
-		if !fallback && err == nil {
-			return value, nil
-		}
-	} else {
-		value, err := self.ToValue(this)
-		if err != nil {
-			return UndefinedValue(), err
-		}
-		thisValue = value
-	}
-
-	fnValue, err := self.Run(source)
-	if err != nil {
-		return UndefinedValue(), err
-	}
-
-	value := UndefinedValue()
-	if new_ {
-		value, err = fnValue.constructSafe(thisValue, argumentList...)
-		if err != nil {
-			return UndefinedValue(), err
-		}
-	} else {
-		value, err = fnValue.Call(thisValue, argumentList...)
-		if err != nil {
-			return UndefinedValue(), err
-		}
-	}
-
-	return value, nil
-}
-
-// Object will run the given source and return the result as an object.
-//
-// For example, accessing an existing object:
-//
-//		object, _ := Otto.Object(`Number`)
-//
-// Or, creating a new object:
-//
-//		object, _ := Otto.Object(`({ xyzzy: "Nothing happens." })`)
-//
-// Or, creating and assigning an object:
-//
-//		object, _ := Otto.Object(`xyzzy = {}`)
-//		object.Set("volume", 11)
-//
-// If there is an error (like the source does not result in an object), then
-// nil and an error is returned.
-func (self Otto) Object(source string) (*Object, error) {
-	value, err := self.runtime.runSafe(source)
-	if err != nil {
-		return nil, err
-	}
-	if value.IsObject() {
-		return value.Object(), nil
-	}
-	return nil, fmt.Errorf("value is not an object")
-}
-
-// ToValue will convert an interface{} value to a value digestible by otto/JavaScript.
-func (self Otto) ToValue(value interface{}) (Value, error) {
-	return self.runtime.ToValue(value)
-}
-
-// Copy will create a copy/clone of the runtime.
-//
-// Copy is useful for saving some processing time when creating many similar
-// runtimes.
-//
-// This implementation is alpha-ish, and works by introspecting every part of the runtime
-// and reallocating and then relinking everything back together. Please report if you
-// notice any inadvertent sharing of data between copies.
-func (self *Otto) Copy() *Otto {
-	return &Otto{
-		runtime: self.runtime.clone(),
-	}
-}
-
-// Object{}
-
-// Object is the representation of a JavaScript object.
-type Object struct {
-	object *_object
-	value  Value
-}
-
-func _newObject(object *_object, value Value) *Object {
-	// value MUST contain object!
-	return &Object{
-		object: object,
-		value:  value,
-	}
-}
-
-// Call the method specified by the given name, using self as the this value.
-// It is essentially equivalent to:
-//
-//		var method, _ := self.Get(name)
-//		method.Call(self, argumentList...)
-//
-// An undefined value and an error will result if:
-//
-//		1. There is an error during conversion of the argument list
-//		2. The property is not actually a function
-//		3. An (uncaught) exception is thrown
-//
-func (self Object) Call(name string, argumentList ...interface{}) (Value, error) {
-	function, err := self.Get(name)
-	if err != nil {
-		return UndefinedValue(), err
-	}
-	return function.Call(self.Value(), argumentList...)
-}
-
-// Value will return self as a value.
-func (self Object) Value() Value {
-	return self.value
-}
-
-// Get the value of the property with the given name.
-func (self Object) Get(name string) (Value, error) {
-	value := UndefinedValue()
-	err := catchPanic(func() {
-		value = self.object.get(name)
-	})
-	return value, err
-}
-
-// Set the property of the given name to the given value.
-//
-// An error will result if the setting the property triggers an exception (i.e. read-only),
-// or there is an error during conversion of the given value.
-func (self Object) Set(name string, value interface{}) error {
-	{
-		value, err := self.object.runtime.ToValue(value)
-		if err != nil {
-			return err
-		}
-		err = catchPanic(func() {
-			self.object.put(name, value, true)
-		})
-		return err
-	}
-}
-
-// Class will return the class string of the object.
-//
-// The return value will (generally) be one of:
-//
-//		Object
-//		Function
-//		Array
-//		String
-//		Number
-//		Boolean
-//		Date
-//		RegExp
-//
-func (self Object) Class() string {
-	return self.object.class
-}
diff --git a/vendor/github.com/robertkrimen/otto/otto/Makefile b/vendor/github.com/robertkrimen/otto/otto/Makefile
deleted file mode 100644
index bac5cd4a5..000000000
--- a/vendor/github.com/robertkrimen/otto/otto/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-.PHONY: build
-
-build:
-	go build -a
-	-gxc build-darwin-386 -a
diff --git a/vendor/github.com/robertkrimen/otto/otto/main.go b/vendor/github.com/robertkrimen/otto/otto/main.go
deleted file mode 100644
index 5764d15b2..000000000
--- a/vendor/github.com/robertkrimen/otto/otto/main.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"github.com/robertkrimen/otto"
-	"github.com/robertkrimen/otto/underscore"
-	"io/ioutil"
-	"os"
-)
-
-var underscoreFlag *bool = flag.Bool("underscore", true, "Load underscore into the runtime environment")
-
-func main() {
-	flag.Parse()
-	var script []byte
-	var err error
-	filename := flag.Arg(0)
-	if filename == "" || filename == "-" {
-		script, err = ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			fmt.Printf("Can't read stdin: %v\n", err)
-			os.Exit(64)
-		}
-	} else {
-		script, err = ioutil.ReadFile(filename)
-		if err != nil {
-			fmt.Printf("Can't open file \"%v\": %v\n", filename, err)
-			os.Exit(64)
-		}
-	}
-	if !*underscoreFlag {
-		underscore.Disable()
-	}
-	Otto := otto.New()
-	_, err = Otto.Run(string(script))
-	if err != nil {
-		fmt.Println(err)
-		os.Exit(64)
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/otto_.go b/vendor/github.com/robertkrimen/otto/otto_.go
deleted file mode 100644
index 36b502145..000000000
--- a/vendor/github.com/robertkrimen/otto/otto_.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"regexp"
-	runtime_ "runtime"
-	"strconv"
-	"strings"
-)
-
-var isIdentifier_Regexp *regexp.Regexp = regexp.MustCompile(`^[a-zA-Z\$][a-zA-Z0-9\$]*$`)
-
-func isIdentifier(string_ string) bool {
-	return isIdentifier_Regexp.MatchString(string_)
-}
-
-func (self *_runtime) toValueArray(arguments ...interface{}) []Value {
-	length := len(arguments)
-	if length == 1 {
-		if valueArray, ok := arguments[0].([]Value); ok {
-			return valueArray
-		}
-		return []Value{toValue(arguments[0])}
-	}
-
-	valueArray := make([]Value, length)
-	for index, value := range arguments {
-		valueArray[index] = toValue(value)
-	}
-
-	return valueArray
-}
-
-func stringToArrayIndex(name string) int64 {
-	index, err := strconv.ParseInt(name, 10, 64)
-	if err != nil {
-		return -1
-	}
-	if index < 0 {
-		return -1
-	}
-	if index >= maxUint32 {
-		// The value 2^32 (or above) is not a valid index because
-		// you cannot store a uint32 length for an index of uint32
-		return -1
-	}
-	return index
-}
-
-func isUint32(value int64) bool {
-	return value >= 0 && value <= maxUint32
-}
-
-func arrayIndexToString(index int64) string {
-	return strconv.FormatInt(index, 10)
-}
-
-func valueOfArrayIndex(list []Value, index int) Value {
-	if index >= 0 && index < len(list) {
-		value := list[index]
-		if !value.isEmpty() {
-			return value
-		}
-	}
-	return UndefinedValue()
-}
-
-// A range index can be anything from 0 up to length. It is NOT safe to use as an index
-// to an array, but is useful for slicing and in some ECMA algorithms.
-func valueToRangeIndex(indexValue Value, length int64, negativeIsZero bool) int64 {
-	index := toInteger(indexValue).value
-	if negativeIsZero {
-		if index < 0 {
-			index = 0
-		}
-		// minimum(index, length)
-		if index >= length {
-			index = length
-		}
-		return index
-	}
-
-	if index < 0 {
-		index += length
-		if index < 0 {
-			index = 0
-		}
-	} else {
-		if index > length {
-			index = length
-		}
-	}
-	return index
-}
-
-func rangeStartEnd(array []Value, size int64, negativeIsZero bool) (start, end int64) {
-	start = valueToRangeIndex(valueOfArrayIndex(array, 0), size, negativeIsZero)
-	if len(array) == 1 {
-		// If there is only the start argument, then end = size
-		end = size
-		return
-	}
-
-	// Assuming the argument is undefined...
-	end = size
-	endValue := valueOfArrayIndex(array, 1)
-	if !endValue.IsUndefined() {
-		// Which it is not, so get the value as an array index
-		end = valueToRangeIndex(endValue, size, negativeIsZero)
-	}
-	return
-}
-
-func rangeStartLength(source []Value, size int64) (start, length int64) {
-	start = valueToRangeIndex(valueOfArrayIndex(source, 0), size, false)
-
-	// Assume the second argument is missing or undefined
-	length = int64(size)
-	if len(source) == 1 {
-		// If there is only the start argument, then length = size
-		return
-	}
-
-	lengthValue := valueOfArrayIndex(source, 1)
-	if !lengthValue.IsUndefined() {
-		// Which it is not, so get the value as an array index
-		length = toInteger(lengthValue).value
-	}
-	return
-}
-
-func boolFields(input string) (result map[string]bool) {
-	result = map[string]bool{}
-	for _, word := range strings.Fields(input) {
-		result[word] = true
-	}
-	return result
-}
-
-func hereBeDragons(arguments ...interface{}) string {
-	pc, _, _, _ := runtime_.Caller(1)
-	name := runtime_.FuncForPC(pc).Name()
-	message := fmt.Sprintf("Here be dragons -- %s", name)
-	if len(arguments) > 0 {
-		message += ": "
-		argument0 := fmt.Sprintf("%s", arguments[0])
-		if len(arguments) == 1 {
-			message += argument0
-		} else {
-			message += fmt.Sprintf(argument0, arguments[1:]...)
-		}
-	} else {
-		message += "."
-	}
-	return message
-}
-
-func throwHereBeDragons(arguments ...interface{}) {
-	panic(hereBeDragons(arguments...))
-}
-
-func eachPair(list []interface{}, fn func(_0, _1 interface{})) {
-	for len(list) > 0 {
-		var _0, _1 interface{}
-		_0 = list[0]
-		list = list[1:] // Pop off first
-		if len(list) > 0 {
-			_1 = list[0]
-			list = list[1:] // Pop off second
-		}
-		fn(_0, _1)
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/otto_error_test.go b/vendor/github.com/robertkrimen/otto/otto_error_test.go
deleted file mode 100644
index 6bf49e7b5..000000000
--- a/vendor/github.com/robertkrimen/otto/otto_error_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestOttoError(t *testing.T) {
-	Terst(t)
-
-	Otto := New()
-
-	_, err := Otto.Run(`throw "Xyzzy"`)
-	Is(err, "Xyzzy")
-
-	_, err = Otto.Run(`throw new TypeError()`)
-	Is(err, "TypeError")
-
-	_, err = Otto.Run(`throw new TypeError("Nothing happens.")`)
-	Is(err, "TypeError: Nothing happens.")
-
-	_, err = ToValue([]byte{})
-	Is(err, "TypeError: Invalid value (slice): Missing runtime: [] ([]uint8)")
-
-	_, err = Otto.Run(`
-		(function(){
-			return abcdef.length
-		})()
-	`)
-	Is(err, "ReferenceError: abcdef is not defined (line 3)")
-
-	_, err = Otto.Run(`
-	function start() {
-	}
-
-	start()
-
-		xyzzy()
-	`)
-	Is(err, "ReferenceError: xyzzy is not defined (line 7)")
-
-	_, err = Otto.Run(`
-		// Just a comment
-
-		xyzzy
-	`)
-	Is(err, "ReferenceError: xyzzy is not defined (line 4)")
-
-}
diff --git a/vendor/github.com/robertkrimen/otto/otto_test.go b/vendor/github.com/robertkrimen/otto/otto_test.go
deleted file mode 100644
index 416b40201..000000000
--- a/vendor/github.com/robertkrimen/otto/otto_test.go
+++ /dev/null
@@ -1,665 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"github.com/robertkrimen/otto/underscore"
-	"math"
-	"strings"
-	"testing"
-)
-
-var (
-	_newOttoClone = false
-	_newOtto      = map[string]*Otto{}
-
-	_runTestWithOtto = struct {
-		Otto *Otto
-		test func(string, ...interface{}) Value
-	}{}
-)
-
-func newOtto(kind string, setup func(otto *Otto)) *Otto {
-	if _newOttoClone {
-		otto := _newOtto[kind]
-		if otto == nil {
-			otto = New()
-			if setup != nil {
-				setup(otto)
-			}
-			_newOtto[kind] = otto
-		}
-		return otto.clone()
-	}
-	otto := New()
-	if setup != nil {
-		setup(otto)
-	}
-	return otto
-}
-
-func failSet(name string, value interface{}) {
-	err := _runTestWithOtto.Otto.Set(name, value)
-	Is(err, nil)
-	if err != nil {
-		Terst().TestingT.FailNow()
-	}
-}
-
-func runTestWithOtto() (*Otto, func(string, ...interface{}) Value) {
-	cache := &_runTestWithOtto
-	Otto := newOtto("", nil)
-	test := func(name string, expect ...interface{}) Value {
-		raise := false
-		defer func() {
-			if caught := recover(); caught != nil {
-				if raise {
-					if len(expect) > 0 {
-						Is(caught, expect[0])
-					}
-				} else {
-					dbg("Panic, caught:", caught)
-					panic(caught)
-				}
-			}
-		}()
-		var value Value
-		if isIdentifier(name) {
-			value = Otto.getValue(name)
-		} else {
-			source := name
-			index := strings.Index(source, "raise:")
-			if index == 0 {
-				raise = true
-				source = source[6:]
-				source = strings.TrimLeft(source, " ")
-			}
-			value = Otto.runtime.run(source)
-		}
-		value = Otto.runtime.GetValue(value)
-		if len(expect) > 0 {
-			Is(value, expect[0])
-		}
-		return value
-	}
-	cache.Otto = Otto
-	cache.test = test
-	return Otto, test
-}
-
-func runTest() func(string, ...interface{}) Value {
-	_, test := runTestWithOtto()
-	return test
-}
-
-func TestTransformRegExp(t *testing.T) {
-	Terst(t)
-
-	Is(transformRegExp(`\\|'|\r|\n|\t|\u2028|\u2029`), `\\|'|\r|\n|\t|\x{2028}|\x{2029}`)
-	Is(transformRegExp(`\x`), `x`)
-	Is(transformRegExp(`\u0z01\x\undefined`), `u0z01xundefined`)
-}
-
-func TestIsValidRegExp(t *testing.T) {
-	Terst(t)
-
-	IsTrue(isValidRegExp(""))
-	IsTrue(isValidRegExp("[0-9]"))
-	IsTrue(isValidRegExp("[(?=(?!]"))
-	IsTrue(isValidRegExp("\\(?="))
-	IsTrue(isValidRegExp("(\\?!"))
-	IsTrue(isValidRegExp("(?\\="))
-	IsFalse(isValidRegExp("(?="))
-	IsFalse(isValidRegExp("\\((?!"))
-	IsFalse(isValidRegExp("[0-9](?!"))
-}
-
-func TestOtto(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test("xyzzy = 2", "2")
-	test("xyzzy + 2", "4")
-	test("xyzzy += 16", "18")
-	test("xyzzy", "18")
-	test(`
-		(function(){
-			return 1
-		})()
-	`, "1")
-	test(`
-		(function(){
-			return 1
-		}).call(this)
-	`, "1")
-	test(`
-		(function(){
-			var result
-			(function(){
-				result = -1
-			})()
-			return result
-		})()
-	`, "-1")
-	test(`
-		var abc = 1
-		abc || (abc = -1)
-		abc
-	`, "1")
-	test(`
-		var abc = (function(){ 1 === 1 })();
-		abc;
-	`, "undefined")
-}
-
-func TestSpeed(t *testing.T) {
-	Terst(t)
-
-	return
-	test := underscoreTest()
-	test(`
-		size = 300000
-		if (false) {
-			array = new Array(size)
-			for (i = 0; i < array.length; i++) {
-				array[i] = i
-			}
-		}
-		else if (true) {
-			Math.max.apply(Math, _.range(1, size))
-		}
-		else if (true) {
-			_.max(_.range(1,size))
-		}
-		else {
-			_.range(1,size)
-		}
-	`)
-}
-
-func Test_typeof(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`typeof abc`, "undefined")
-	test(`typeof abc === 'undefined'`, "true")
-	test(`typeof {}`, "object")
-	test(`typeof null`, "object")
-}
-
-func Test_PrimitiveValueObjectValue(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	Number11 := test(`new Number(11)`)
-	Is(toFloat(Number11), "11")
-}
-
-func Test_eval(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = 1
-	`)
-
-	test(`
-		eval("abc += 1")
-	`, "2")
-
-	test(`
-		(function(){
-			var abc = 11
-			eval("abc += 1")
-			return abc
-		})()
-	`, "12")
-	test(`abc`, "2")
-
-	test(`
-		var ghi;
-		(function(){
-			try {
-				eval("var prop = \\u2029;");
-				return false;
-			} catch (abc) {
-				ghi = abc.toString()
-				return abc instanceof SyntaxError;
-			}
-		})()
-	`, "true")
-
-	// TODO Should be: ReferenceError: ghi is not defined
-	test(`ghi`, "SyntaxError: Unexpected token ILLEGAL ()")
-
-	test(`
-        function abc(){
-            this.THIS = eval("this");
-        }
-        var def = new abc();
-        def === def.THIS;
-    `, "true")
-}
-
-func Test_evalDirectIndirect(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = "global";
-        (function(){
-            try {
-                var _eval = eval;
-                var abc = "function";
-                if (
-                    _eval("\'global\' === abc") === true &&  // eval (Indirect)
-                    eval("\'function\' === abc") === true // eval (Direct)
-                ) {
-                    return true;
-                }
-                return false;
-            } finally {
-                delete this.abc;
-            }
-        })()
-    `, "true")
-}
-
-func TestError_URIError(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`new URIError() instanceof URIError`, "true")
-	test(`
-		var abc
-		try {
-			decodeURI("http://example.com/ _^#%")
-		}
-		catch (def) {
-			abc = def instanceof URIError
-		}
-		abc
-	`, "true")
-}
-
-func TestTo(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	{
-		value, _ := test(`"11"`).ToFloat()
-		Is(value, float64(11))
-	}
-
-	{
-		value, _ := test(`"11"`).ToInteger()
-		Is(value, int64(11))
-
-		value, _ = test(`1.1`).ToInteger()
-		Is(value, int64(1))
-	}
-}
-
-func TestShouldError(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`raise:
-		xyzzy
-			throw new TypeError("Nothing happens.")
-	`, "ReferenceError: xyzzy is not defined")
-}
-
-func TestAPI(t *testing.T) {
-	Terst(t)
-
-	Otto, test := runTestWithOtto()
-	test(`
-		String.prototype.xyzzy = function(){
-			return this.length + 11 + (arguments[0] || 0)
-		}
-		abc = new String("xyzzy")
-		def = "Nothing happens."
-		abc.xyzzy()
-	`, "16")
-	abc, _ := Otto.Get("abc")
-	def, _ := Otto.Get("def")
-	object := abc.Object()
-	result, _ := object.Call("xyzzy")
-	Is(result, "16")
-	result, _ = object.Call("xyzzy", 1)
-	Is(result, "17")
-	value, _ := object.Get("xyzzy")
-	result, _ = value.Call(def)
-	Is(result, "27")
-	result, _ = value.Call(def, 3)
-	Is(result, "30")
-	object = value.Object() // Object xyzzy
-	result, _ = object.Value().Call(def, 3)
-	Is(result, "30")
-}
-
-func TestUnicode(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`var abc = eval("\"a\uFFFFa\"");`)
-	test(`abc.length`, "3")
-	test(`abc != "aa"`, "true")
-	test("abc[1] === \"\uFFFF\"", "true")
-}
-
-func TestDotMember(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = {
-			ghi: 11,
-		}
-		abc.def = "Xyzzy"
-		abc.null = "Nothing happens."
-	`)
-	test(`abc.def`, "Xyzzy")
-	test(`abc.null`, "Nothing happens.")
-	test(`abc.ghi`, "11")
-
-	test(`
-		abc = {
-			null: 11,
-		}
-	`)
-	test(`abc.def`, "undefined")
-	test(`abc.null`, "11")
-	test(`abc.ghi`, "undefined")
-}
-
-func Test_stringToFloat(t *testing.T) {
-	Terst(t)
-
-	Is(stringToFloat("10e10000"), math.Inf(1))
-	Is(stringToFloat("10e10_."), "NaN")
-}
-
-func Test_delete(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		delete 42;
-	`, "true")
-
-	test(`
-		abc = delete $_undefined_$;
-		abc = abc && delete ($_undefined_$);
-        abc;
-	`, "true")
-}
-
-func TestObject_defineOwnProperty(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        var object = {};
-
-        var descriptor = new Boolean(false);
-        descriptor.configurable = true;
-
-        Object.defineProperties(object, {
-            property: descriptor
-        });
-
-        var abc = object.hasOwnProperty("property");
-        delete object.property;
-        var def = object.hasOwnProperty("property");
-
-		[ abc, def ];
-	`, "true,false")
-}
-
-func Test_assignmentEvaluationOrder(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	//test(`
-	//    var abc = 0;
-	//    ((abc = 1) & abc);
-	//`, "1")
-
-	test(`
-        var abc = 0;
-        (abc & (abc = 1));
-    `, "0")
-}
-
-func TestOttoCall(t *testing.T) {
-	Terst(t)
-
-	otto, _ := runTestWithOtto()
-	_, err := otto.Run(`
-        var abc = {
-            ghi: 1,
-            def: function(def){
-                var ghi = 0;
-                if (this.ghi) {
-                    ghi = this.ghi;
-                }
-                return "def: " + (def + 3.14159 + ghi);
-            }
-        };
-    `)
-	Is(err, nil)
-
-	value, err := otto.Call(`abc.def`, nil, 2)
-	Is(err, nil)
-	Is(value, "def: 6.14159")
-
-	value, err = otto.Call(`abc.def`, "", 2)
-	Is(err, nil)
-	Is(value, "def: 5.14159")
-
-	// Do not attempt to do a ToValue on a this of nil
-	value, err = otto.Call(`jkl.def`, nil, 1, 2, 3)
-	IsNot(err, nil)
-	Is(value, "undefined")
-
-	value, err = otto.Call(`[ 1, 2, 3, undefined, 4 ].concat`, nil, 5, 6, 7, "abc")
-	Is(err, nil)
-	Is(value, "1,2,3,,4,5,6,7,abc")
-}
-
-func TestOttoCall_new(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	failSet("abc", func(call FunctionCall) Value {
-		value, err := call.Otto.Call(`new Object`, nil, "Nothing happens.")
-		Is(err, nil)
-		return value
-	})
-	test(`
-        def = abc();
-        [ def, def instanceof String ];
-    `, "Nothing happens.,true")
-}
-
-func TestOttoCall_throw(t *testing.T) {
-	Terst(t)
-
-	return
-
-	_, test := runTestWithOtto()
-
-	failSet("abc", func(call FunctionCall) Value {
-		if false {
-			call.Otto.Call(`throw eval`, nil, "({ def: 3.14159 })")
-		}
-		call.Otto.Call(`throw Error`, nil, "abcdef")
-		return UndefinedValue()
-	})
-	// TODO try { abc(); } catch (err) { error = err }
-	// Possible unrelated error case:
-	// If error is not declared beforehand, is later referencing it a ReferenceError?
-	// Should the catch { } declare error in the outer scope?
-	test(`
-        var error;
-        try {
-            abc();
-        }
-        catch (err) {
-            error = err;
-        }
-        [ error instanceof Error, error.message, error.def ];
-    `, "true,abcdef,")
-
-	failSet("def", func(call FunctionCall) Value {
-		call.Otto.Call(`throw new Object`, nil, 3.14159)
-		return UndefinedValue()
-	})
-	test(`
-        try {
-            def();
-        }
-        catch (err) {
-            error = err;
-        }
-        [ error instanceof Error, error.message, error.def, typeof error, error, error instanceof Number ];
-    `, "false,,,object,3.14159,true")
-}
-
-func TestOttoCall_clone(t *testing.T) {
-	Terst(t)
-
-	otto := New().clone()
-
-	{
-		Is(otto.runtime.Global.Array.prototype, otto.runtime.Global.FunctionPrototype)
-		IsNot(otto.runtime.Global.ArrayPrototype, nil)
-		Is(otto.runtime.Global.Array.runtime, otto.runtime)
-		Is(otto.runtime.Global.Array.prototype.runtime, otto.runtime)
-		Is(otto.runtime.Global.Array.get("prototype")._object().runtime, otto.runtime)
-	}
-
-	{
-		value, err := otto.Run(`[ 1, 2, 3 ].toString()`)
-		Is(err, nil)
-		Is(value, "1,2,3")
-	}
-
-	{
-		value, err := otto.Run(`[ 1, 2, 3 ]`)
-		Is(err, nil)
-		Is(value, "1,2,3")
-		object := value._object()
-		IsNot(object, nil)
-		Is(object.prototype, otto.runtime.Global.ArrayPrototype)
-
-		value, err = otto.Run(`Array.prototype`)
-		Is(err, nil)
-		object = value._object()
-		Is(object.runtime, otto.runtime)
-		IsNot(object, nil)
-		Is(object, otto.runtime.Global.ArrayPrototype)
-	}
-
-	{
-		otto1 := New()
-		_, err := otto1.Run(`
-            var abc = 1;
-            var def = 2;
-        `)
-		Is(err, nil)
-
-		otto2 := otto1.clone()
-		value, err := otto2.Run(`abc += 1; abc;`)
-		Is(err, nil)
-		Is(value, "2")
-
-		value, err = otto1.Run(`abc += 4; abc;`)
-		Is(err, nil)
-		Is(value, "5")
-	}
-
-	{
-		otto1 := New()
-		_, err := otto1.Run(`
-            var abc = 1;
-            var def = function(value) {
-                abc += value;
-                return abc;
-            }
-        `)
-		Is(err, nil)
-
-		otto2 := otto1.clone()
-		value, err := otto2.Run(`def(1)`)
-		Is(err, nil)
-		Is(value, "2")
-
-		value, err = otto1.Run(`def(4)`)
-		Is(err, nil)
-		Is(value, "5")
-	}
-
-	{
-		otto1 := New()
-		_, err := otto1.Run(`
-            var abc = {
-                ghi: 1,
-                jkl: function(value) {
-                    this.ghi += value;
-                    return this.ghi;
-                }
-            };
-            var def = {
-                abc: abc
-            };
-        `)
-		Is(err, nil)
-
-		otto2 := otto1.clone()
-		value, err := otto2.Run(`def.abc.jkl(1)`)
-		Is(err, nil)
-		Is(value, "2")
-
-		value, err = otto1.Run(`def.abc.jkl(4)`)
-		Is(err, nil)
-		Is(value, "5")
-	}
-}
-
-func BenchmarkNew(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		New()
-	}
-}
-
-func BenchmarkClone(b *testing.B) {
-	otto := New()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		otto.clone()
-	}
-}
-
-func BenchmarkNew_(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		otto := New()
-		otto.Run(underscore.Source())
-	}
-}
-
-func BenchmarkClone_(b *testing.B) {
-	otto := New()
-	otto.Run(underscore.Source())
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		otto.clone()
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/panic_test.go b/vendor/github.com/robertkrimen/otto/panic_test.go
deleted file mode 100644
index b1e749c36..000000000
--- a/vendor/github.com/robertkrimen/otto/panic_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func Test_panic(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	// Test that property.value is set to something if writable is set
-	// to something
-	// TODO Not panicking anymore?
-	test(`
-		var abc = [];
-        Object.defineProperty(abc, "0", { writable: false });
-        Object.defineProperty(abc, "0", { writable: false });
-		"0" in abc;
-	`, "true")
-	// `, "false") // TODO Should be true, but we're really testing for a panic
-
-	// Test that a regular expression can contain \c0410 (CYRILLIC CAPITAL LETTER A)
-	// without panic
-	test(`
-		var abc = 0x0410;
-		var def = String.fromCharCode(abc);
-		new RegExp("\\c" + def).exec(def);
-	`, "null")
-
-	// Test transforming a transformable regular expression without a panic
-	test(`
-		new RegExp("\\u0000");
-		new RegExp("\\undefined").test("undefined");
-	`, "true")
-}
diff --git a/vendor/github.com/robertkrimen/otto/parse_expression.go b/vendor/github.com/robertkrimen/otto/parse_expression.go
deleted file mode 100644
index 87384e9b8..000000000
--- a/vendor/github.com/robertkrimen/otto/parse_expression.go
+++ /dev/null
@@ -1,474 +0,0 @@
-package otto
-
-import (
-	"regexp"
-)
-
-func (self *_parser) ParsePrimaryExpression() _node {
-	token := self.Peek()
-	switch token.Kind {
-	case "identifier":
-		return self.ConsumeIdentifier()
-	case "string":
-		return self.ConsumeString()
-	case "boolean":
-		return self.ConsumeBoolean()
-	case "number":
-		return self.ConsumeNumber()
-	case "null":
-		return self.ConsumeNull()
-	case "function":
-		return self.ParseFunction(false)
-	case "this":
-		self.Next()
-		node := newThisNode()
-		self.markNode(node)
-		return node
-	case "{":
-		return self.ParseObjectLiteral()
-	case "[":
-		return self.ParseArrayLiteral()
-	case "(":
-		self.Expect("(")
-		result := self.ParseExpression()
-		self.Expect(")")
-		return result
-	case "/", "/=": // Here, "/" & "/=" actually indicate
-		// the beginning of a regular expression
-		return self.ParseRegExpLiteral(token)
-	}
-
-	panic(self.Unexpected(token))
-}
-
-func (self *_parser) ParseObjectPropertyKey() string {
-	if self.Match("identifier") {
-		return self.ConsumeIdentifier().Value
-	} else if self.Match("number") {
-		return toString(self.ConsumeNumber().Value)
-	} else if self.Match("string") {
-		return toString(self.ConsumeString().Value)
-	}
-	token := self.Next()
-	if !isIdentifierName(token) {
-		panic(self.Unexpected(token))
-	}
-	return token.Text
-}
-
-func (self *_parser) ParseObjectProperty() *_objectPropertyNode {
-
-	key := self.ParseObjectPropertyKey()
-	self.Expect(":")
-	value := self.ParseAssignmentExpression()
-
-	node := newObjectPropertyNode(key, value)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ParseRegExpLiteral(token _token) *_regExpNode {
-
-	pattern := self.ScanRegularExpression().Text
-
-	flags := ""
-	if self.Match("identifier") { // gim
-		flags = self.Consume()
-	}
-
-	{
-		// Test during parsing that this is a valid regular expression
-		// Sorry, (?=) and (?!) are invalid (for now)
-		pattern := transformRegExp(pattern)
-		_, err := regexp.Compile(pattern)
-		if err != nil {
-			panic(token.newSyntaxError("Invalid regular expression: %s", err.Error()[22:])) // Skip redundant "parse regexp error"
-		}
-	}
-
-	node := newRegExpNode(pattern, flags)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ParseObjectLiteral() *_objectNode {
-
-	node := newObjectNode()
-	self.markNode(node)
-
-	self.Expect("{")
-	for !self.Match("}") {
-		property := self.ParseObjectProperty()
-		node.AddProperty(property)
-
-		if self.Accept(",") {
-			continue
-		}
-	}
-	self.Expect("}")
-
-	return node
-}
-
-func (self *_parser) ParseArrayValue() _node {
-	return self.ParseAssignmentExpression()
-}
-
-func (self *_parser) ParseArrayLiteral() *_arrayNode {
-
-	self.Expect("[")
-	nodeList := []_node{}
-	for !self.Match("]") {
-		if self.Accept(",") {
-			nodeList = append(nodeList, newEmptyNode())
-			continue
-		}
-		nodeList = append(nodeList, self.ParseArrayValue())
-		if self.Accept(",") {
-			continue
-		}
-	}
-	self.Expect("]")
-
-	node := newArrayNode(nodeList)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ParseArgumentList() (argumentList []_node) {
-	self.Expect("(")
-	if !self.Match(")") {
-		argumentList = make([]_node, 0)
-		for {
-			argumentList = append(argumentList, self.ParseAssignmentExpression())
-			if !self.Accept(",") {
-				break
-			}
-		}
-	}
-	self.Expect(")")
-	return argumentList
-}
-
-func (self *_parser) ParseCallExpression(left _node) _node {
-	left = newCallNode(left)
-	self.markNode(left)
-	left.(*_callNode).ArgumentList = self.ParseArgumentList()
-	return left
-}
-
-func (self *_parser) ParseDotMember(left _node) _node {
-	self.Expect(".")
-	token := self.Next()
-	member := token.Text
-	if !isIdentifierName(token) {
-		panic(token.newSyntaxError("Unexpected token %s", token.Kind))
-	}
-	node := newDotMemberNode(left, member)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ParseBracketMember(left _node) _node {
-	self.Expect("[")
-	member := self.ParseExpression()
-	self.Expect("]")
-	node := newBracketMemberNode(left, member)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ParseNewExpression() _node {
-	self.Expect("new")
-	node := newnewNode(self.ParseLeftHandSideExpression())
-	self.markNode(node)
-	if self.Match("(") {
-		node.ArgumentList = self.ParseArgumentList()
-	}
-	return node
-}
-
-func (self *_parser) ParseLeftHandSideExpression() _node {
-
-	var left _node
-	if self.Match("new") {
-		left = self.ParseNewExpression()
-	} else {
-		left = self.ParsePrimaryExpression()
-	}
-
-	for {
-		if self.Match(".") {
-			left = self.ParseDotMember(left)
-		} else if self.Match("[") {
-			left = self.ParseBracketMember(left)
-		} else {
-			break
-		}
-	}
-
-	return left
-}
-
-func (self *_parser) ParseLeftHandSideExpressionAllowCall() _node {
-
-	var left _node
-	if self.Match("new") {
-		left = self.ParseNewExpression()
-	} else {
-		left = self.ParsePrimaryExpression()
-	}
-
-	for {
-		if self.Match(".") {
-			left = self.ParseDotMember(left)
-		} else if self.Match("[") {
-			left = self.ParseBracketMember(left)
-		} else if self.Match("(") {
-			left = self.ParseCallExpression(left)
-		} else {
-			break
-		}
-	}
-
-	return left
-}
-
-func (self *_parser) ParsePostfixExpression() _node {
-	left := self.ParseLeftHandSideExpressionAllowCall()
-
-	// TODO Need better syntax checking here
-	// Strictness checking, etc.
-
-	switch token := self.Peek(); token.Kind {
-	case "++", "--": // Postfix, either =++ or =--
-		if self.Match("\n") { // TODO Why?
-			break
-		}
-		switch left.Type() {
-		case nodeIdentifier, nodeDotMember, nodeBracketMember:
-		default:
-			panic(self.History(-1).newSyntaxError("Invalid left-hand side in assignment"))
-		}
-		node := newUnaryOperationNode("="+self.Consume(), left)
-		self.markNode(node)
-		return node
-	}
-
-	return left
-}
-
-func (self *_parser) ParseUnaryExpression() _node {
-
-	// TODO Need better syntax checking here
-	// Strictness checking, basically (trying to delete a non-reference, etc.)
-
-	switch token := self.Peek(); token.Kind {
-	case "+", "-", "!", "~":
-		node := newUnaryOperationNode(self.Consume(), self.ParseUnaryExpression())
-		self.markNode(node)
-		return node
-	case "++", "--": // Prefix, either ++= or --=
-		operation := self.Consume()
-		left := self.ParseUnaryExpression()
-		switch left.Type() {
-		case nodeIdentifier, nodeDotMember, nodeBracketMember:
-		default:
-			panic(self.History(-1).newSyntaxError("Invalid left-hand side in assignment"))
-		}
-		node := newUnaryOperationNode(operation+"=", left)
-		self.markNode(node)
-		return node
-	case "delete", "void", "typeof":
-		node := newUnaryOperationNode(self.Consume(), self.ParseUnaryExpression())
-		self.markNode(node)
-		return node
-	}
-
-	return self.ParsePostfixExpression()
-}
-
-func (self *_parser) ParseMultiplicativeExpression() _node {
-	left := self.ParseUnaryExpression()
-
-REPEAT:
-	switch self.Peek().Kind {
-	case "*", "/", "%":
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseUnaryExpression())
-		self.markNode(left)
-		goto REPEAT
-	}
-
-	return left
-}
-
-func (self *_parser) ParseAdditiveExpression() _node {
-	left := self.ParseMultiplicativeExpression()
-
-REPEAT:
-	switch self.Peek().Kind {
-	case "+", "-":
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseMultiplicativeExpression())
-		self.markNode(left)
-		goto REPEAT
-	}
-
-	return left
-}
-
-func (self *_parser) ParseShiftExpression() _node {
-	left := self.ParseAdditiveExpression()
-
-REPEAT:
-	switch self.Peek().Kind {
-	case "<<", ">>", ">>>":
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseAdditiveExpression())
-		self.markNode(left)
-		goto REPEAT
-	}
-	return left
-}
-
-func (self *_parser) ParseRelationalExpression() _node {
-	previousAllowIn := self.Scope().AllowIn
-	self.Scope().AllowIn = true
-	left := self.ParseShiftExpression()
-	self.Scope().AllowIn = previousAllowIn // TODO This should be deferred
-
-	switch self.Peek().Kind {
-	case "<", ">", "<=", ">=":
-		node := newComparisonNode(self.Consume(), left, self.ParseRelationalExpression())
-		self.markNode(node)
-		return node
-	case "instanceof":
-		node := newBinaryOperationNode(self.Consume(), left, self.ParseRelationalExpression())
-		self.markNode(node)
-		return node
-	case "in":
-		if !self.Scope().AllowIn {
-			return left
-		}
-		node := newBinaryOperationNode(self.Consume(), left, self.ParseRelationalExpression())
-		self.markNode(node)
-		return node
-
-	}
-
-	return left
-}
-
-func (self *_parser) ParseEqualityExpression() _node {
-	left := self.ParseRelationalExpression()
-
-REPEAT:
-	switch self.Peek().Kind {
-	case "==", "!=", "===", "!==":
-		left = newComparisonNode(self.Consume(), left, self.ParseRelationalExpression())
-		self.markNode(left)
-		goto REPEAT
-	}
-
-	return left
-}
-
-func (self *_parser) ParseBitwiseANDExpression() _node {
-	left := self.ParseEqualityExpression()
-
-	for self.Match("&") {
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseEqualityExpression())
-		self.markNode(left)
-	}
-
-	return left
-}
-
-func (self *_parser) ParseBitwiseXORExpression() _node {
-	left := self.ParseBitwiseANDExpression()
-
-	for self.Match("^") {
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseBitwiseANDExpression())
-		self.markNode(left)
-	}
-
-	return left
-}
-
-func (self *_parser) ParseBitwiseORExpression() _node {
-	left := self.ParseBitwiseXORExpression()
-
-	for self.Match("|") {
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseBitwiseXORExpression())
-		self.markNode(left)
-	}
-
-	return left
-}
-
-func (self *_parser) ParseLogicalANDExpression() _node {
-	left := self.ParseBitwiseORExpression()
-
-	for self.Match("&&") {
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseBitwiseORExpression())
-		self.markNode(left)
-	}
-
-	return left
-}
-
-func (self *_parser) ParseLogicalORExpression() _node {
-	left := self.ParseLogicalANDExpression()
-
-	for self.Match("||") {
-		left = newBinaryOperationNode(self.Consume(), left, self.ParseLogicalANDExpression())
-		self.markNode(left)
-	}
-
-	return left
-}
-
-func (self *_parser) ParseConditionlExpression() _node {
-	left := self.ParseLogicalORExpression()
-
-	if self.Accept("?") {
-		consequent := self.ParseAssignmentExpression()
-		self.Expect(":")
-		node := newConditionalNode(left, consequent, self.ParseAssignmentExpression())
-		self.markNode(node)
-		return node
-	}
-
-	return left
-}
-
-func (self *_parser) ParseAssignmentExpression() _node {
-	left := self.ParseConditionlExpression()
-	if self.matchAssignment() {
-		switch left.Type() {
-		case nodeIdentifier, nodeDotMember, nodeBracketMember:
-		default:
-			panic(newReferenceError("Invalid left-hand side in assignment"))
-		}
-		left = newAssignmentNode(self.Consume(), left, self.ParseAssignmentExpression())
-		self.markNode(left)
-	}
-	return left
-}
-
-func (self *_parser) ParseExpression() _node {
-	left := self.ParseAssignmentExpression()
-
-	if self.Match(",") {
-		nodeList := []_node{left}
-		for {
-			if !self.Accept(",") {
-				break
-			}
-			nodeList = append(nodeList, self.ParseAssignmentExpression())
-		}
-		node := newCommaNode(nodeList)
-		self.markNode(node)
-		return node
-	}
-
-	return left
-}
diff --git a/vendor/github.com/robertkrimen/otto/parse_statement.go b/vendor/github.com/robertkrimen/otto/parse_statement.go
deleted file mode 100644
index ce956ccd8..000000000
--- a/vendor/github.com/robertkrimen/otto/parse_statement.go
+++ /dev/null
@@ -1,557 +0,0 @@
-package otto
-
-import ()
-
-func (self *_parser) ParseStatement() _node {
-
-	switch self.Peek().Kind {
-	case ";":
-		self.Next()
-		node := newEmptyNode()
-		self.markNode(node)
-		return node
-	case "if":
-		return self.ParseIf()
-	case "do":
-		return self.ParseDoWhile()
-	case "while":
-		return self.ParseWhile()
-	case "for":
-		return self.ParseForOrForIn()
-	case "continue":
-		return self.ParseContinue()
-	case "with":
-		return self.ParseWith()
-	case "break":
-		return self.ParseBreak()
-	case "{":
-		return self.ParseBlock()
-	case "var":
-		return self.ParseVariableStatement()
-	case "function":
-		self.ParseFunctionDeclaration()
-		// TODO Should be FunctionDeclarationStatement
-		node := newEmptyNode()
-		self.markNode(node)
-		return node
-	case "switch":
-		return self.ParseSwitch()
-	case "return":
-		return self.ParseReturnStatement()
-	case "throw":
-		return self.ParseThrow()
-	case "try":
-		return self.ParseTryCatch()
-	}
-
-	expression := self.ParseExpression()
-
-	if identifier, yes := expression.(*_identifierNode); yes && self.Accept(":") {
-		labelSet := self.Scope().labelSet
-		label := identifier.Value
-		if labelSet[label] {
-			panic(self.History(-2).newSyntaxError("Label '%s' has already been declared", label))
-		}
-		labelSet[label] = true
-		statement := self.ParseStatement()
-		delete(labelSet, label)
-		{
-			labelSet = nil
-			switch node := statement.(type) {
-			case *_blockNode:
-				labelSet = node.labelSet
-			case *_doWhileNode:
-				labelSet = node.labelSet
-			case *_whileNode:
-				labelSet = node.labelSet
-			case *_switchNode:
-				labelSet = node.labelSet
-			case *_forNode:
-				labelSet = node.labelSet
-			case *_forInNode:
-				labelSet = node.labelSet
-			}
-			if labelSet != nil {
-				labelSet[label] = true
-			}
-		}
-		return statement
-	}
-
-	self.ConsumeSemicolon()
-
-	return expression
-}
-
-//func (self *_parser) parseSource() []_node {
-//    nodeList := self.parseStatementUntil(func() bool {
-//        return self.Match("EOF")
-//    });
-//    return self.ParseStatement()
-//}
-
-func (self *_parser) parseSourceElement() _node {
-	return self.ParseStatement()
-}
-
-func (self *_parser) ParseTryCatch() _node {
-	self.Expect("try")
-
-	node := newTryCatchNode(self.ParseBlock())
-
-	found := false
-	if self.Accept("catch") {
-		self.Expect("(")
-		identifier := self.ConsumeIdentifier().Value
-		self.Expect(")")
-		node.Catch = newCatchNode(identifier, self.ParseBlock())
-		found = true
-	}
-
-	if self.Accept("finally") {
-		node.Finally = self.ParseBlock()
-		found = true
-	}
-
-	if !found {
-		panic(self.Peek().newSyntaxError("Missing catch or finally after try"))
-	}
-
-	return node
-}
-
-func (self *_parser) ParseWith() _node {
-	self.Expect("with")
-
-	return newWithNode(self.ParseExpression(), self.ParseStatement())
-}
-
-func (self *_parser) ParseContinue() _node {
-	result := self.ParseContinueBreak("continue", func(kind string) _node { return newContinueNode(kind) })
-	if self.Scope().InIteration {
-		return result
-	}
-	panic(self.Peek().newSyntaxError("Illegal continue statement"))
-}
-
-func (self *_parser) ParseBreak() _node {
-	result := self.ParseContinueBreak("break", func(kind string) _node { return newBreakNode(kind) })
-	scope := self.Scope()
-	if scope.InIteration || scope.InSwitch {
-		return result
-	}
-	panic(self.Peek().newSyntaxError("Illegal break statement"))
-}
-
-func (self *_parser) ParseContinueBreak(kind string, _newNode func(string) _node) _node {
-	self.Expect(kind)
-
-	if self.Accept(";") || self.Accept("\n") {
-		return _newNode("")
-	}
-
-	label := ""
-	if self.Match("identifier") {
-		identifier := self.ConsumeIdentifier()
-		label = identifier.Value
-		if !self.Scope().HasLabel(label) {
-			panic(self.History(-1).newSyntaxError("Undefined label '%s'", label))
-		}
-	}
-
-	self.ConsumeSemicolon()
-
-	return _newNode(label)
-}
-
-func (self *_parser) parseInFunction(parse func() _node) _node {
-	in := self.Scope().InFunction
-	self.Scope().InFunction = true
-	defer func() {
-		self.Scope().InFunction = in
-	}()
-	return parse()
-}
-
-func (self *_parser) parseInSwitch(parse func() _node) _node {
-	in := self.Scope().InSwitch
-	self.Scope().InSwitch = true
-	defer func() {
-		self.Scope().InSwitch = in
-	}()
-	return parse()
-}
-
-func (self *_parser) parseInIteration(parse func() _node) []_node {
-	in := self.Scope().InIteration
-	self.Scope().InIteration = true
-	defer func() {
-		self.Scope().InIteration = in
-	}()
-	switch node := parse().(type) {
-	case *_blockNode:
-		return node.Body
-	default:
-		return []_node{node}
-	}
-	panic("")
-}
-
-func (self *_parser) ParseDoWhile() _node {
-	self.Expect("do")
-	body := self.parseInIteration(func() _node {
-		return self.ParseStatement()
-	})
-	self.Expect("while")
-	self.Expect("(")
-	test := self.ParseExpression()
-	self.Expect(")")
-
-	node := newDoWhileNode(test, body)
-	node.labelSet[""] = true
-	return node
-}
-
-func (self *_parser) ParseWhile() _node {
-	self.Expect("while")
-	self.Expect("(")
-	test := self.ParseExpression()
-	self.Expect(")")
-	body := self.parseInIteration(func() _node {
-		return self.ParseStatement()
-	})
-
-	node := newWhileNode(test, body)
-	node.labelSet[""] = true
-	return node
-}
-
-func (self *_parser) ParseIf() _node {
-	self.Expect("if")
-	self.Expect("(")
-	node := newIfNode(self.ParseExpression(), nil)
-	self.Expect(")")
-	node.Consequent = self.ParseStatement()
-	if self.Accept("else") {
-		node.Alternate = self.ParseStatement()
-	}
-
-	return node
-}
-
-func (self *_parser) parseStatementUntil(stop func() bool) []_node {
-	list := []_node{}
-	for {
-		if stop() {
-			break
-		}
-		list = append(list, self.ParseStatement())
-	}
-	return list
-}
-
-func (self *_parser) ParseBlock() *_blockNode {
-	node := newBlockNode()
-	self.markNode(node)
-
-	self.Expect("{")
-	node.Body = self.parseStatementUntil(func() bool {
-		return self.Accept("}")
-	})
-
-	return node
-}
-
-func (self *_parser) ParseReturnStatement() _node {
-	self.Expect("return")
-
-	if !self.Scope().InFunction {
-		panic(self.History(-1).newSyntaxError("Illegal return statement"))
-	}
-
-	node := newReturnNode()
-	self.markNode(node)
-
-	if self.Match("\n") {
-		return node
-	}
-
-	if !self.Match(";") {
-		if !self.Match("}") && !self.Match("EOF") {
-			node.Argument = self.ParseExpression()
-		}
-	}
-
-	self.ConsumeSemicolon()
-
-	return node
-}
-
-func (self *_parser) ParseThrow() _node {
-	self.Expect("throw")
-
-	if self.Match("\n") {
-		// TODO Better error message
-		panic(self.Peek().newSyntaxError("Illegal newline after throw"))
-	}
-
-	node := newThrowNode(self.ParseExpression())
-	self.markNode(node)
-
-	self.ConsumeSemicolon()
-
-	return node
-}
-
-func (self *_parser) ParseSwitch() _node {
-	self.Expect("switch")
-
-	self.Expect("(")
-	discriminant := self.ParseExpression()
-	self.Expect(")")
-
-	switchNode := newSwitchNode(discriminant)
-	self.markNode(switchNode)
-
-	self.Expect("{")
-
-	self.parseInSwitch(func() _node {
-		for i := 0; true; i++ {
-			if self.Accept("}") {
-				break
-			}
-
-			result := self.ParseCase()
-			if result.Test == nil {
-				if switchNode.Default != -1 {
-					panic(hereBeDragons("Already saw a default:"))
-				}
-				switchNode.Default = i
-			}
-			switchNode.AddCase(result)
-		}
-		return nil
-	})
-
-	switchNode.labelSet[""] = true
-	return switchNode
-}
-
-func (self *_parser) ParseCase() *_caseNode {
-
-	var node *_caseNode
-	if self.Accept("default") {
-		node = newDefaultCaseNode()
-		self.markNode(node)
-	} else {
-		self.Expect("case")
-		node = newCaseNode(self.ParseExpression())
-		self.markNode(node)
-	}
-	self.Expect(":")
-
-	node.Body = self.parseStatementUntil(func() bool {
-		return false ||
-			self.Match("EOF") ||
-			self.Match("}") ||
-			self.Match("default") ||
-			self.Match("case")
-	})
-
-	return node
-}
-
-func (self *_parser) ParseVariable() *_variableDeclarationNode {
-	node := newVariableDeclarationNode(self.ConsumeIdentifier().Value)
-	self.markNode(node)
-
-	for _, value := range []string{"=", ":="} {
-		if self.Accept(value) {
-			node.Operator = value
-			node.Initializer = self.ParseAssignmentExpression()
-			break
-		}
-	}
-
-	return node
-}
-
-func (self *_parser) ParseVariableDeclaration() *_variableDeclarationListNode {
-	self.Expect("var")
-
-	node := newVariableDeclarationListNode()
-	self.markNode(node)
-
-	for {
-		variable := self.ParseVariable()
-		node.VariableList = append(node.VariableList, variable)
-		self.Scope().AddVariable(variable.Identifier)
-
-		if !self.Accept(",") {
-			break
-		}
-	}
-
-	return node
-}
-
-func (self *_parser) ParseVariableStatement() *_variableDeclarationListNode {
-
-	node := self.ParseVariableDeclaration()
-
-	self.ConsumeSemicolon()
-
-	return node
-}
-
-func (self *_parser) ParseFunction(declare bool) _node {
-
-	self.Expect("function")
-
-	functionNode := newFunctionNode()
-	self.markNode(functionNode)
-
-	identifier := ""
-	if self.Match("identifier") {
-		identifier = self.ConsumeIdentifier().Value
-		if declare {
-			self.Scope().AddFunction(identifier, functionNode)
-		}
-	} else if declare {
-		// Trigger a panic, because we really should see
-		// an identifier here
-		self.Expect("identifier")
-	}
-
-	token := self.Peek()
-	if token.Kind != "(" {
-		panic(self.Unexpected(token))
-	}
-
-	self.Expect("(")
-	for !self.Accept(")") {
-		identifier := self.ConsumeIdentifier().Value
-		functionNode.AddParameter(identifier)
-		if identifier == "arguments" {
-			functionNode.ArgumentsIsParameter = true
-		}
-		if !self.Match(")") {
-			self.Expect(",")
-		}
-	}
-
-	{
-		self.EnterScope()
-		if !declare && identifier != "" {
-			self.Scope().AddFunction(identifier, functionNode)
-		}
-		defer self.LeaveScope()
-		self.parseInFunction(func() _node {
-			functionNode.Body = self.ParseBlock().Body
-			return nil
-		})
-		functionNode.VariableList = self.Scope().VariableList
-		functionNode.FunctionList = self.Scope().FunctionList
-	}
-
-	return functionNode
-}
-
-/*func (self *_parser) ParseFunctionParameterList() []string {*/
-/*    parameterList := []string{}*/
-
-/*    for !self.Match("EOF") {*/
-/*        identifier := self.ConsumeIdentifier().Value*/
-/*        parameterList = append(parameterList, identifier)*/
-/*    }*/
-
-/*    return parameterList*/
-/*}*/
-
-func (self *_parser) ParseFunctionDeclaration() {
-	self.ParseFunction(true)
-}
-
-func (self *_parser) parseForIn(into _node) *_forInNode {
-
-	// Already have consumed "<into> in"
-
-	source := self.ParseExpression()
-	self.Expect(")")
-
-	body := self.parseInIteration(func() _node {
-		return self.ParseStatement()
-	})
-
-	node := newForInNode(into, source, body)
-	self.markNode(node)
-	node.labelSet[""] = true
-	return node
-}
-
-func (self *_parser) parseFor(initial _node) *_forNode {
-
-	// Already have consumed "<initial> ;"
-
-	var test, update _node
-
-	if !self.Match(";") {
-		test = self.ParseExpression()
-	}
-	self.Expect(";")
-
-	if !self.Match(")") {
-		update = self.ParseExpression()
-	}
-	self.Expect(")")
-
-	body := self.parseInIteration(func() _node {
-		return self.ParseStatement()
-	})
-
-	node := newForNode(initial, test, update, body)
-	self.markNode(node)
-	node.labelSet[""] = true
-	return node
-}
-
-func (self *_parser) ParseForOrForIn() _node {
-	self.Expect("for")
-	self.Expect("(")
-
-	var left _node
-
-	isIn := false
-	if !self.Match(";") {
-		previousAllowIn := self.Scope().AllowIn
-		self.Scope().AllowIn = false
-		if self.Match("var") {
-			declarationList := self.ParseVariableDeclaration()
-			if len(declarationList.VariableList) == 1 && self.Accept("in") {
-				isIn = true
-				// We only want (there should be only) one _declaration
-				// (12.2 Variable Statement)
-				left = declarationList.VariableList[0]
-			} else {
-				left = declarationList
-			}
-		} else {
-			left = self.ParseExpression()
-			isIn = self.Accept("in")
-		}
-		self.Scope().AllowIn = previousAllowIn
-	}
-
-	if !isIn {
-		self.Expect(";")
-		return self.parseFor(left)
-	} else {
-		switch left.Type() {
-		case nodeIdentifier, nodeDotMember, nodeBracketMember, nodeVariableDeclaration:
-		default:
-			panic(self.History(-1).newSyntaxError("Invalid left-hand side in for-in"))
-		}
-	}
-
-	return self.parseForIn(left)
-}
diff --git a/vendor/github.com/robertkrimen/otto/parser.go b/vendor/github.com/robertkrimen/otto/parser.go
deleted file mode 100644
index 726ebe3c1..000000000
--- a/vendor/github.com/robertkrimen/otto/parser.go
+++ /dev/null
@@ -1,313 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"strings"
-)
-
-const ottoDebug = false
-
-const endOfFile = -1
-const startOfFile = -2
-
-func mustParse(source string) *_programNode {
-	parser := newParser()
-	parser.lexer.Source = source
-	return parser.Parse()
-}
-
-func parse(source string) (result *_programNode, err interface{}) {
-	defer func() {
-		if caught := recover(); caught != nil {
-			switch caught := caught.(type) {
-			case *_syntaxError, _error:
-				err = caught
-				return
-			}
-			panic(caught)
-		}
-	}()
-	parser := newParser()
-	parser.lexer.Source = source
-	return parser.Parse(), nil
-}
-
-func init() {
-
-	// 2-character
-	// <= >= == != ++ -- << >> && ||
-	// += -= *= %= &= |= ^= /=
-	for _, value := range "<>=!+-*%&|^/" {
-		punctuatorTable[string(value)+"="] = true
-	}
-
-	for _, value := range "+-<>&|" {
-		punctuatorTable[string(value)+string(value)] = true
-	}
-
-	// 1-character
-	for _, value := range "[]<>+-*%&|^!~?:=/;{},()" {
-		punctuatorTable[string(value)] = true
-	}
-}
-
-type _parser struct {
-	lexer   _lexer
-	Stack   [](*_sourceScope)
-	history []_token
-}
-
-func newParser() *_parser {
-	self := &_parser{
-		history: make([]_token, 0, 4),
-	}
-	self.lexer.readIn = make([]rune, 0)
-	return self
-}
-
-func (self *_parser) Consume() string {
-	return self.Next().Text
-}
-
-type _sourceScope struct {
-	VariableList []_declaration
-	FunctionList []_declaration
-	labelSet     _labelSet
-	AllowIn      bool
-	InFunction   bool
-	InSwitch     bool
-	InIteration  bool
-}
-
-func (self *_sourceScope) AddVariable(name string) {
-	self.VariableList = append(self.VariableList, _declaration{name, nil})
-}
-
-func (self *_sourceScope) AddFunction(name string, definition _node) {
-	self.FunctionList = append(self.FunctionList, _declaration{name, definition})
-}
-
-func newSourceScope() *_sourceScope {
-	self := &_sourceScope{
-		labelSet: _labelSet{},
-		AllowIn:  true,
-	}
-	return self
-}
-
-func (self *_sourceScope) HasLabel(name string) bool {
-	_, exists := self.labelSet[name]
-	return exists
-}
-
-func (self *_parser) EnterScope() {
-	scope := newSourceScope()
-	self.Stack = append(self.Stack, scope)
-}
-
-func (self *_parser) LeaveScope() {
-	self.Stack = self.Stack[:len(self.Stack)-1]
-}
-
-func (self *_parser) Scope() *_sourceScope {
-	return self.Stack[len(self.Stack)-1]
-}
-
-func (self *_parser) Accept(kind string) bool {
-	if kind == "\n" {
-		// This is a PeekLineSkip, except we
-		// retain the adjusted lexer if we really
-		// skipped a line
-		lexerCopy := self.lexer.Copy()
-		didSkip := lexerCopy.ScanLineSkip()
-		if didSkip {
-			self.lexer = *lexerCopy
-		}
-		return didSkip
-	}
-	if self.Match(kind) {
-		self.Next()
-		return true
-	}
-	return false
-}
-
-func (self *_parser) Match(kind string) bool {
-	if kind == "\n" {
-		return self.PeekLineSkip()
-	}
-	return self.Peek().Kind == kind
-}
-
-func (self *_parser) Expect(kind string) {
-	token := self.Next()
-	if token.Kind != kind {
-		panic(self.Unexpected(token))
-		//panic(fmt.Sprintf("Expect %s but got %s (%s)", kind, token.Kind, token.Text))
-	}
-}
-
-var assignmentTable map[string]string = map[string]string{}
-
-func init() {
-	for _, value := range strings.Fields("= *= /= %= += -= <<= >>= >>>= &= ^= |=") {
-		operator := value[:len(value)-1]
-		assignmentTable[value] = operator
-	}
-}
-
-func (self *_parser) matchAssignment() bool {
-	if _, exists := assignmentTable[self.Peek().Kind]; exists {
-		return true
-	}
-	return false
-}
-
-func (self *_parser) ConsumeNull() *_valueNode {
-	node := newNullNode(self.Next().Text)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) throwUnexpectedError(token _token) {
-	if futureKeywordTable[token.Kind] {
-		panic(token.newSyntaxError("Unexpected reserved word"))
-	}
-	panic(token.newSyntaxError("Unexpected token %s", token.Kind))
-}
-
-func (self *_parser) ConsumeIdentifier() *_identifierNode {
-	token := self.Next()
-	if token.Kind != "identifier" {
-		self.throwUnexpectedError(token) // panic
-	}
-	node := newIdentifierNode(token.Text)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ConsumeString() *_valueNode {
-	node := newStringNode(self.Next().Text)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ConsumeBoolean() *_valueNode {
-	node := newBooleanNode(self.Next().Text)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ConsumeNumber() *_valueNode {
-	node := newNumberNode(self.Next().Text)
-	self.markNode(node)
-	return node
-}
-
-func (self *_parser) ConsumeSemicolon() {
-
-	if self.Accept(";") {
-		return
-	}
-
-	if self.Accept("\n") {
-		return
-	}
-
-	if self.Accept(";") {
-		return
-	}
-
-	if !self.Match("EOF") && !self.Match("}") {
-		panic(self.Unexpected(self.Peek()))
-	}
-
-	return
-}
-
-func (self *_parser) ScanRegularExpression() _token {
-	token := self.lexer.ScanRegularExpression()
-	self.history = append(self.history, token)
-	if len(self.history) > 4 {
-		self.history = self.history[len(self.history)-4:]
-	}
-	return token
-}
-
-func (self *_parser) Next() _token {
-	token := self.lexer.Scan()
-	self.history = append(self.history, token)
-	if len(self.history) > 4 {
-		self.history = self.history[len(self.history)-4:]
-	}
-	return token
-}
-
-func (self *_parser) History(index int) _token {
-	if 0 > index {
-		index = len(self.history) + index
-	}
-	if index >= len(self.history) {
-		panic(fmt.Errorf("Index %d is out of range for history (%d)", index, len(self.history)))
-	}
-	return self.history[index]
-}
-
-func (self *_parser) PeekLineSkip() bool {
-	return self.lexer.Copy().ScanLineSkip()
-}
-
-func (self *_parser) Peek() _token {
-	return self.lexer.Copy().Scan()
-}
-
-func (self *_parser) Parse() *_programNode {
-	self.EnterScope()
-	defer self.LeaveScope()
-
-	node := newProgramNode()
-	node.Body = self.parseStatementUntil(func() bool {
-		return self.Match("EOF")
-	})
-	node.VariableList = self.Scope().VariableList
-	node.FunctionList = self.Scope().FunctionList
-
-	return node
-}
-
-func (self *_parser) ParseAsFunction() *_programNode {
-	self.EnterScope()
-	defer self.LeaveScope()
-	self.Scope().InFunction = true
-
-	node := newProgramNode()
-	node.Body = self.parseStatementUntil(func() bool {
-		return self.Match("EOF")
-	})
-	node.VariableList = self.Scope().VariableList
-	node.FunctionList = self.Scope().FunctionList
-
-	return node
-}
-
-func (self *_parser) Unexpected(token _token) *_syntaxError {
-	switch token.Kind {
-	case "EOF":
-		return self.History(-1).newSyntaxError("Unexpected end of input")
-	case "illegal":
-		return token.newSyntaxError("Unexpected token ILLEGAL (%s)", token.Text)
-	}
-	return token.newSyntaxError("Unexpected token %s", token.Text)
-}
-
-func (self *_parser) markNode(node _node) {
-	node.setPosition(self.lexer.lineCount)
-}
-
-func isIdentifierName(token _token) bool {
-	switch token.Kind {
-	case "identifier", "boolean":
-		return true
-	}
-	return keywordTable[token.Kind]
-}
diff --git a/vendor/github.com/robertkrimen/otto/parser_test.go b/vendor/github.com/robertkrimen/otto/parser_test.go
deleted file mode 100644
index d54fbc2e8..000000000
--- a/vendor/github.com/robertkrimen/otto/parser_test.go
+++ /dev/null
@@ -1,1468 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"fmt"
-	"regexp"
-	"strings"
-	"testing"
-)
-
-var beforeAfterSeparator_Regexp = regexp.MustCompile(`(?m)^[ \t]*---$`)
-
-func parserTestNormalizeWant(want string) string {
-	index := beforeAfterSeparator_Regexp.FindAllStringIndex(want, -1)
-	if index != nil && len(index) > 0 {
-		lastIndex := index[len(index)-1]
-		want = want[lastIndex[1]+1:]
-	}
-	want = strings.TrimSpace(want)
-	normal := ""
-	aSpace := false
-	inQuote := false
-	ignoreNext := false
-	for _, rune := range want {
-		if inQuote {
-			if !ignoreNext {
-				switch rune {
-				case '"':
-					inQuote = false
-				case '\\':
-					ignoreNext = true
-				case '\n':
-					inQuote = false
-					aSpace = true
-					continue
-				}
-			} else {
-				ignoreNext = false
-			}
-		} else {
-			switch rune {
-			case ' ', '\t', '\n':
-				aSpace = true
-				continue
-			case '"':
-				inQuote = true
-			}
-		}
-		if aSpace {
-			normal += " "
-			aSpace = false
-		}
-		normal += string(rune)
-	}
-	return normal
-}
-
-var errorOptionalLine_Regexp = regexp.MustCompile(` (-):[\d-]+:[\d-]+$`)
-var errorOptionalColumn_Regexp = regexp.MustCompile(` [\d-]+:(-):[\d-]+$`)
-var errorOptionalIndex_Regexp = regexp.MustCompile(` [\d-]+:[\d-]+:(-)$`)
-
-func parserTest(sourceWant ...string) {
-	source, want := "", ""
-	if len(sourceWant) == 1 {
-		sourceWant := sourceWant[0]
-		index := beforeAfterSeparator_Regexp.FindAllStringIndex(sourceWant, -1)
-		if index != nil && len(index) > 0 {
-			lastIndex := index[len(index)-1]
-			source = sourceWant[:lastIndex[0]]
-			source = source[:len(source)-1]
-			want = sourceWant[lastIndex[1]+1:]
-		}
-	} else {
-		source, want = sourceWant[0], sourceWant[1]
-	}
-
-	want = parserTestNormalizeWant(want)
-	have, err := parse(source)
-	if err == nil {
-		Is(have, want)
-	} else {
-		want := []byte(want)
-		switch err := err.(type) {
-		case *_syntaxError:
-			if match := errorOptionalLine_Regexp.FindSubmatchIndex(want); match != nil {
-				want = append(want[:match[2]], append([]byte(fmt.Sprintf("%d", err.Line)), want[match[3]:]...)...)
-			}
-			if match := errorOptionalColumn_Regexp.FindSubmatchIndex(want); match != nil {
-				want = append(want[:match[2]], append([]byte(fmt.Sprintf("%d", err.Column)), want[match[3]:]...)...)
-			}
-			if match := errorOptionalIndex_Regexp.FindSubmatchIndex(want); match != nil {
-				want = append(want[:match[2]], append([]byte(fmt.Sprintf("%d", err.Character)), want[match[3]:]...)...)
-			}
-			Is(fmt.Sprintf("%s %d:%d:%d", err.Message, err.Line, err.Column, err.Character), string(want))
-			// Line:Column:Character
-		default:
-			Is(fmt.Sprintf("%v", err), string(want))
-		}
-	}
-}
-
-func TestParseSuccess(t *testing.T) {
-	Terst(t)
-
-	test := parserTest
-
-	test(`
-	xyzzy
-	---
-	{ @ xyzzy }
-	`)
-
-	test(`
-	"Nothing ha    ppens."
-	---
-	{ @ "Nothing ha    ppens." }
-	`)
-
-	node := mustParse("xyzzy")
-	Is(node, "{ @ xyzzy }")
-	Is(node.Body[0].(*_identifierNode).Value, "xyzzy")
-
-	node = mustParse("1")
-	Is(node, "{ @ 1 }")
-	Is(node.Body[0].(*_valueNode).Value, "1")
-
-	node = mustParse("\"Xyzzy\"")
-	Is(node, "{ @ \"Xyzzy\" }")
-	Is(node.Body[0].(*_valueNode).Value, "Xyzzy")
-
-	test(`
-	xyzzy = 1
-	---
-	{ @ { = xyzzy 1 } }
-	`)
-
-	test(`
-	xyzzy = 1 + 2 * 3
-	---
-	{ @ { = xyzzy { + 1 { * 2 3 } } } }
-	`)
-
-	test(`
-	xyzzy = 1 + 2 * 3 + 4
-	---
-	{ @ { = xyzzy { + { + 1 { * 2 3 } } 4 } } }
-	`)
-
-	test(`
-	xyzzy = 1 + 2 * 3 + 4; 1 + 1
-	---
-	{ @ { = xyzzy { + { + 1 { * 2 3 } } 4 } } { + 1 1 } }
-	`)
-
-	test(`
-	xyzzy = test
-	---
-	{ @ { = xyzzy test } }
-	`)
-
-	test(`
-	xyzzy = test(1 + 2)
-	---
-	{ @ { = xyzzy { <call> test { + 1 2 } } } }
-	`)
-
-	test(`
-	xyzzy = test(1 + 2, 3 * 4)
-	---
-	{ @ { = xyzzy { <call> test { + 1 2 } { * 3 4 } } } }
-	`)
-
-	test(`
-	xyzzy = function() {}
-	---
-	{ @ { = xyzzy { <function> _ } } }
-	`)
-
-	test(`
-	xyzzy = function() { 1 + 1 }
-	---
-	{ @ { = xyzzy { <function> { + 1 1 } } } }
-	`)
-
-	test(`
-	xyzzy = function() { return 1 + 1 }
-	---
-	{ @ { = xyzzy { <function> { <return> { + 1 1 } } } } }
-	`)
-
-	test(`
-	xyzzy = function() { return 1 }
-	---
-	{ @ { = xyzzy { <function> { <return> 1 } } } }
-	`)
-
-	test(`
-	xyzzy = function() { return apple + 1 }
-	---
-	{ @ { = xyzzy { <function> { <return> { + apple 1 } } } } }
-	`)
-
-	test(`
-	if (1) apple
-	else banana
-	---
-	{ @ { <if> 1 apple banana } }
-	`)
-
-	test(`
-	if (1) { apple } else banana
-	---
-	{ @ { <if> 1 { apple } banana } }
-	`)
-
-	test(`
-	if (1) { apple } else { banana }
-	---
-	{ @
-		{ <if> 1
-			{ apple }
-			{ banana }
-		}
-	}
-	`)
-
-	test(`
-	do apple
-	while (1 + 1)
-	---
-	{ @ { <do-while> { + 1 1 } { apple } } }
-	`)
-
-	test(`
-	while (1 + 1) apple
-	---
-	{ @ { <while> { + 1 1 } { apple } } }
-	`)
-
-	test(`
-	do apple; while (1 + 1)
-	banana
-	---
-	{ @ { <do-while> { + 1 1 } { apple } } banana }
-	`)
-
-	test(`
-	do while (1 + 1) banana; while (1 - 1)
-	---
-	{ @ { <do-while> { - 1 1 } { { <while> { + 1 1 } { banana } } } } }
-	`)
-
-	test(`
-	{}
-	---
-	{ @ {} }
-	`)
-
-	test(`
-	if (1 + 1) {}
-	---
-	{ @ { <if> { + 1 1 } {} } }
-	`)
-
-	test(`
-	var result64
-	=
-	64
-	, result10 =
-	10
-	---
-	{ @ { <var> = result64 64 } { <var> = result10 10 } }
-	`)
-
-	test(`
-	l0:
-	while (1 + 1) {
-		banana
-	}
-	---
-	{ @ { <while:l0> { + 1 1 } { banana } } }
-	`)
-
-	test(`
-	l0:
-	result = 0
-	l1:
-	l0:
-	while (1 + 1) {
-		banana
-	}
-	---
-	{ @ { = result 0 } { <while:l0:l1> { + 1 1 } { banana } } }
-	`)
-
-	test(`
-	l0:
-	do {
-		banana
-	} while (1 + 1)
-	---
-	{ @ { <do-while:l0> { + 1 1 } { banana } } }
-	`)
-
-	test(`
-	apple = 0
-	banana = 1
-	while (apple) {
-		apple = 2
-		if (0) {
-		}
-		banana = 3
-	}
-	---
-	{ @ { = apple 0 } { = banana 1 } { <while> apple { { = apple 2 } { <if> 0 {} } { = banana 3 } } } }
-	`)
-
-	test(`
-	with 1 + 1 {
-		apple
-	}
-	---
-	{ @ { <with> { + 1 1 } { apple } } }
-	`)
-
-	test(`
-	with 1 + 1
-	apple
-	---
-	{ @ { <with> { + 1 1 } apple } }
-	`)
-
-	test(`
-	if (1) {
-		result = 1
-	}
-	else {
-		result = 0
-	}
-	---
-	{ @ { <if> 1 { { = result 1 } } { { = result 0 } } } }
-	`)
-
-	test(`
-	with 1 + 1;
-	---
-	{ @ { <with> { + 1 1 } ; } }
-	`)
-
-	test(`
-	if (1)
-	;
-	else { }
-	---
-	{ @ { <if> 1 ; {} } }
-	`)
-
-	test(`
-	while (true) {
-		continue
-		xyzzy
-	}
-	---
-	{ @ { <while> true { <continue:> xyzzy } } }
-	`)
-
-	test(`
-	try {
-		result = 1
-	}
-	finally {
-		result = 2
-	}
-	---
-	{ @ { <try> { { = result 1 } } <finally> { { = result 2 } } </try> } }
-	`)
-
-	test(`
-	try {
-		result = 1
-	}
-	catch (xyzzy) {
-	}
-	finally {
-		result = 2
-	}
-	---
-	{ @ { <try> { { = result 1 } } <catch> xyzzy {} <finally> { { = result 2 } } </try> } }
-	`)
-
-	test(`
-		try {
-			result = 1
-		}
-		catch (xyzzy) {
-		}
-	---
-	{ @ { <try> { { = result 1 } } <catch> xyzzy {} </try> } }
-	`)
-
-	test(`
-	switch (0 + 0) {
-	}
-	---
-	{ @ { <switch> { + 0 0 } _ } }
-	`)
-
-	test(`
-	switch (0 + 0) {
-	case 1:
-	default:
-	}
-	---
-	{ @ { <switch> { + 0 0 } { <case> 1 _ } { <default> _ } } }
-	`)
-
-	test(`
-	for (;;) {
-	}
-	---
-	{ @ { <for> ; ; ; {} } }
-	`)
-
-	test(`
-	result = apple[0]
-	---
-	{ @ { = result { [ apple 0 } } }
-	`)
-
-	test(`
-	result = apple.banana
-	---
-	{ @ { = result { . apple banana } } }
-	`)
-
-	test(`
-	result = { apple: banana }
-	---
-	{ @ { = result {[ { apple: banana } ]} } }
-	`)
-
-	test(`
-	result = { apple: banana, 0: 1 }
-	---
-	{ @ { = result {[ { apple: banana } { 0: 1 } ]} } }
-	`)
-
-	test(`
-	result = { apple: banana, 0: 1, cherry: {} }
-	---
-	{ @ { = result {[ { apple: banana } { 0: 1 } { cherry: {[]} } ]} } }
-	`)
-
-	test(`
-	result = []
-	---
-	{ @ { = result [] } }
-	`)
-
-	test(`
-	result = [ apple, banana, 0, 1 ]
-	---
-	{ @ { = result [ apple banana 0 1 ] } }
-	`)
-
-	test(`
-	result = 0
-	++result
-	---
-	{ @ { = result 0 } { ++= result } }
-	`)
-
-	test(`
-	result = 0
-	result++
-	---
-	{ @ { = result 0 } { =++ result } }
-	`)
-
-	test(`
-	result = 0
-	result++
-	result
-	++result
-	---
-	{ @ { = result 0 } { =++ result } result { ++= result } }
-	`)
-
-	test(`
-	result = abc && def || ghi && jkl
-	---
-	{ @ { = result { || { && abc def } { && ghi jkl } } } }
-	`)
-
-	test(`
-	result = abc & def - 1 | ghi ^ jkl & mno ^ pqr + 1
-	---
-	{ @ { = result { | { & abc { - def 1 } } { ^ { ^ ghi { & jkl mno } } { + pqr 1 } } } } }
-	`)
-
-	test(`
-	result = 0 << 1 >> 2 >>> 3
-	---
-	{ @ { = result { >>> { >> { << 0 1 } 2 } 3 } } }
-	`)
-
-	test(`
-	result = 0 instanceof 1
-	---
-	{ @ { = result { instanceof 0 1 } } }
-	`)
-
-	test(`
-	result = 0 in 1
-	---
-	{ @ { = result { in 0 1 } } }
-	`)
-
-	test(`
-	for (abc in def) {
-	}
-	---
-	{ @ { <for-in> abc in def {} } }
-	`)
-
-	test(`
-	abc = new String
-	def = new Object(0 + 1, 2, 3)
-	ghi = new Function()
-	---
-	{ @ { = abc { <new> String _ } } { = def { <new> Object { + 0 1 } 2 3 } } { = ghi { <new> Function _ } } }
-	`)
-
-	test(`
-	abc = true ? 1 : 0
-	---
-	{ @ { = abc { ?: true 1 0 } } }
-	`)
-
-	test(`
-	abc = [].toString()
-	---
-	{ @ { = abc { <call> { . [] toString } _ } } }
-	`)
-
-	test(`
-	Array.prototype.join = function() {}
-	---
-	{ @ { = { . { . Array prototype } join } { <function> _ } } }
-	`)
-
-	test(`
-	/abc/ig
-	---
-	{ @ { /abc/ig } }
-	`)
-
-	test(`
-	""+/abc/g
-	---
-	{ @ { + "" { /abc/g } } }
-	`)
-
-	test(`
-	(function(){})()
-	---
-	{ @ { <call> { <function> _ } _ } }
-	`)
-
-	test(`
-	var abc = 1
-	var def = 2
-	var ghi = def = abc
-	---
-	{ @ { <var> = abc 1 } { <var> = def 2 } { <var> = ghi { = def abc } } }
-	`)
-
-	test(`
-	for (var abc = 1, def = 2; ghi < 3; jkl++) {
-	}
-	---
-	{ @ { <for> { <var> = abc 1 } { <var> = def 2 } { < ghi 3 } { =++ jkl } {} } }
-	`)
-
-	test(`
-    if (!abc && abc.jkl(def) && abc[0] === +abc[0] && abc.length < ghi) {
-	}
-	---
-	{ @ { <if> { && { && { && { ! abc } { <call> { . abc jkl } def } } { === { [ abc 0 } { + { [ abc 0 } } } } { < { . abc length } ghi } } {} } }
-	`)
-
-	test(`
-	abc = {
-		'"': "'",
-		"'": '"',
-	}
-	---
-	{ @ { = abc {[ { ": "'" } { ': """ } ]} } }
-	`)
-
-	test(`
-	for (var abc in def) {
-	}
-	---
-	{ @ { <for-in> { <var> abc } in def {} } }
-	`)
-
-	test(`
-	({ abc: 'def' })
-	---
-	{ @ {[ { abc: "def" } ]} }
-	`)
-
-	test(`
-	// This is not an object, this is a string literal with a label!
-	{ abc: 'def' }
-	---
-	{ @ { "def" } }
-	`)
-
-	test(`abc = function() { 'use strict' }
-	---
-	{ @ { = abc { <function> "use strict" } } }
-	`)
-
-	test(`
-	"use strict"
-	---
-	{ @ "use strict" }
-	`)
-
-	test(`
-	"use strict"
-	abc = 1 + 2 + 11
-	---
-	{ @ "use strict" { = abc { + { + 1 2 } 11 } } }
-	`)
-
-	// When run, this will call a type error to be thrown
-	// This is essentially the same as:
-	//
-	// var abc = 1(function(){})()
-	//
-	test(`
-	var abc = 1
-	(function(){
-	})()
-	---
-	{ @ { <var> = abc { <call> { <call> 1 { <function> _ } } _ } } }
-	`)
-
-	test(`
-			xyzzy
-
-	throw new TypeError("Nothing happens.")
-	---
-	{ @ xyzzy { <throw> { <new> TypeError "Nothing happens." } } }
-	`)
-
-	test(`
-	/abc/.source
-	---
-	{ @ { . { /abc/ } source } }
-	`)
-
-	//test(`
-	///abc/.source
-	//--
-	//`)
-
-	test(`
-	[,]
-	---
-	{ @ [ ; ] }
-	`)
-
-	test(`
-	[,,]
-	---
-	{ @ [ ; ; ] }
-	`)
-
-	test(`
-    ((x & (x = 1)) !== 0)
-    ---
-    { @ { !== { & x { = x 1 } } 0 } }
-    `)
-}
-
-func TestParseFailure(t *testing.T) {
-	Terst(t)
-
-	test := parserTest
-
-	test(`{
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`}
----
-Unexpected token }
-1:-:-
-	`)
-
-	test(`3ea
----
-Unexpected token ILLEGAL (3e)
-1:-:-
-	`)
-
-	test(`3in []
----
-Unexpected token ILLEGAL (3i)
-1:-:-
-	`)
-
-	test(`3e
----
-Unexpected token ILLEGAL (3e)
-1:-:-
-	`)
-
-	test(`3e+
----
-Unexpected token ILLEGAL (3e+)
-1:-:-
-	`)
-
-	test(`3e-
----
-Unexpected token ILLEGAL (3e-)
-1:-:-
-	`)
-
-	test(`3x
----
-Unexpected token ILLEGAL (3x)
-1:-:-
-	`)
-
-	test(`3x0
----
-Unexpected token ILLEGAL (3x)
-1:-:-
-	`)
-
-	test(`0x
----
-Unexpected token ILLEGAL (0x)
-1:-:-
-	`)
-
-	test(`09
----
-Unexpected token ILLEGAL (09)
-1:-:-
-	`)
-
-	test(`018
----
-Unexpected token ILLEGAL (018)
-1:-:-
-	`)
-
-	test(`01a
----
-Unexpected token ILLEGAL (01a)
-1:-:-
-	`)
-
-	test(`3in[]
----
-Unexpected token ILLEGAL (3i)
-1:-:-
-	`)
-
-	test(`0x3in[]
----
-Unexpected token ILLEGAL (0x3i)
-1:-:-
-	`)
-
-	test(`"Hello
-World"
----
-Unexpected token ILLEGAL ("Hello)
-1:-:-
-	`)
-
-	// TODO Make these run again
-	if false {
-		test(`x\
----
-Unexpected token ILLEGAL (x)
-1:-:-
-	`)
-
-		test(`x\u005c
----
-Unexpected token ILLEGAL (x)
-1:-:-
-	`)
-
-		test(`x\u002a
----
-Unexpected token ILLEGAL (x)
-1:-:-
-	`)
-	}
-
-	test("var x = /(s/g", "---\nInvalid regular expression: missing closing ): `(s`\n1:-:-\n")
-
-	test(`/
----
-Invalid regular expression
-1:-:-
-	`)
-
-	test(`3 = 4
----
-ReferenceError: Invalid left-hand side in assignment
-	`)
-
-	test(`func() = 4
----
-ReferenceError: Invalid left-hand side in assignment
-	`)
-
-	test(`(1 + 1) = 10
----
-ReferenceError: Invalid left-hand side in assignment
-	`)
-
-	test(`1++
----
-Invalid left-hand side in assignment
-1:-:-
-	`)
-
-	test(`1--
----
-Invalid left-hand side in assignment
-1:-:-
-	`)
-
-	test(`--1
----
-Invalid left-hand side in assignment
-1:-:-
-	`)
-
-	test(`for((1 + 1) in list) process(x);
----
-Invalid left-hand side in for-in
-1:-:-
-	`)
-
-	test(`[
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`[,
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`1 + {
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`1 + { t:t
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`1 + { t:t,
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test("var x = /\n/", `
----
-Invalid regular expression
-1:-:-
-	`)
-
-	test("var x = \"\n", `
----
-Unexpected token ILLEGAL (")
-1:-:-
-	`)
-
-	test(`var if = 42
----
-Unexpected token if
-1:-:-
-	`)
-
-	test(`i + 2 = 42
----
-ReferenceError: Invalid left-hand side in assignment
-	`)
-
-	test(`+i = 42
----
-ReferenceError: Invalid left-hand side in assignment
-	`)
-
-	test(`1 + (
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test("\n\n\n{", `
----
-Unexpected end of input
-4:-:-
-	`)
-
-	test("\n/* Some multiline\ncomment */\n)", `
----
-Unexpected token )
-4:-:-
-	`)
-
-	// TODO
-	//{ set 1 }
-	//{ get 2 }
-	//({ set: s(if) { } })
-	//({ set s(.) { } })
-	//({ set: s() { } })
-	//({ set: s(a, b) { } })
-	//({ get: g(d) { } })
-	//({ get i() { }, i: 42 })
-	//({ i: 42, get i() { } })
-	//({ set i(x) { }, i: 42 })
-	//({ i: 42, set i(x) { } })
-	//({ get i() { }, get i() { } })
-	//({ set i(x) { }, set i(x) { } })
-
-	test(`function t(if) { }
----
-Unexpected token if
-1:-:-
-	`)
-
-	// TODO This should be "token true"
-	test(`function t(true) { }
----
-Unexpected token boolean
-1:-:-
-	`)
-
-	// TODO This should be "token false"
-	test(`function t(false) { }
----
-Unexpected token boolean
-1:-:-
-	`)
-
-	test(`function t(null) { }
----
-Unexpected token null
-1:-:-
-	`)
-
-	test(`function null() { }
----
-Unexpected token null
-1:-:-
-	`)
-
-	test(`function true() { }
----
-Unexpected token true
-1:-:-
-	`)
-
-	test(`function false() { }
----
-Unexpected token false
-1:-:-
-	`)
-
-	test(`function if() { }
----
-Unexpected token if
-1:-:-
-	`)
-
-	// TODO Should be Unexpected identifier
-	test(`a b;
----
-Unexpected token b
-1:-:-
-	`)
-
-	test(`if.a;
----
-Unexpected token .
-1:-:-
-	`)
-
-	test(`a if;
----
-Unexpected token if
-1:-:-
-	`)
-
-	// TODO Should be Unexpected reserved word
-	test(`a class;
----
-Unexpected token class
-1:-:-
-	`)
-
-	test("break\n", `
----
-Illegal break statement
-2:-:-
-	`)
-
-	// TODO Should be Unexpected number
-	test(`break 1;
----
-Unexpected token 1
-1:-:-
-	`)
-
-	test("continue\n", `
----
-Illegal continue statement
-2:-:-
-	`)
-
-	// TODO Should be Unexpected number
-	test(`continue 2;
----
-Unexpected token 2
-1:-:-
-	`)
-
-	test(`throw
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`throw;
----
-Unexpected token ;
-1:-:-
-	`)
-
-	test("throw\n", `
----
-Illegal newline after throw
-2:-:-
-	`)
-
-	test(`for (var i, i2 in {});
----
-Unexpected token in
-1:-:-
-	`)
-
-	test(`for ((i in {}));
----
-Unexpected token )
-1:-:-
-	`)
-
-	test(`for (+i in {});
----
-Invalid left-hand side in for-in
-1:-:-
-	`)
-
-	test(`if(false)
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`if(false) doThis(); else
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`do
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`while(false)
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`for(;;)
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`with(x)
----
-Unexpected end of input
-1:-:-
-	`)
-
-	test(`try { }
----
-Missing catch or finally after try
-1:-:-
-	`)
-
-	test("\u203f = 10", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	// TODO
-	// const x = 12, y;
-	// const x, y = 12;
-	// const x;
-	// if(true) let a = 1;
-	// if(true) const  a = 1;
-
-	// TODO "Unexpected string"
-	test(`new X()."S"
----
-Unexpected token string
-1:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test(`/*
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test(`/*
-
-
-
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test(`/**
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test("/*\n\n*", `
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test(`/*hello
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	// TODO Incorrect cursor position
-	test(`/*hello  *
----
-Unexpected token ILLEGAL
-0:-:-
-	`)
-
-	test("\n]", `
----
-Unexpected token ]
-2:-:-
-	`)
-
-	test("\r]", `
----
-Unexpected token ]
-2:-:-
-	`)
-
-	test("\r\n]", `
----
-Unexpected token ]
-2:-:-
-	`)
-
-	test("\n\r]", `
----
-Unexpected token ]
-3:-:-
-	`)
-
-	test("//\r\n]", `
----
-Unexpected token ]
-2:-:-
-	`)
-
-	test("//\n\r]", `
----
-Unexpected token ]
-3:-:-
-	`)
-
-	test("/a\\\n/", `
----
-Invalid regular expression
-1:-:-
-	`)
-
-	test("//\r \n]", `
----
-Unexpected token ]
-3:-:-
-	`)
-
-	test("/*\r\n*/]", `
----
-Unexpected token ]
-2:-:-
-	`)
-
-	test("/*\r \n*/]", `
----
-Unexpected token ]
-3:-:-
-	`)
-
-	test("\\\\", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\\u005c", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\\x", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\\u0000", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\\u200c = []", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\\u200D = []", `
----
-Unexpected token ILLEGAL ()
-1:-:-
-	`)
-
-	test("\"\\", `
----
-Unexpected token ILLEGAL (")
-1:-:-
-	`)
-
-	test("\"\\u", `
----
-Unexpected token ILLEGAL ("\)
-1:-:-
-	`)
-
-	test("return", `
----
-Illegal return statement
-1:-:-
-	`)
-
-	test("break", `
----
-Illegal break statement
-1:-:-
-	`)
-
-	test("continue", `
----
-Illegal continue statement
-1:-:-
-	`)
-
-	test(`switch (x) { default: continue; }
----
-Illegal continue statement
-1:-:-
-	`)
-
-	test(`do { x } *
----
-Unexpected token *
-1:-:-
-	`)
-
-	test(`while (true) { break x; }
----
-Undefined label 'x'
-1:-:-
-	`)
-
-	test(`while (true) { continue x; }
----
-Undefined label 'x'
-1:-:-
-	`)
-
-	test(`x: while (true) { (function () { break x; }); }
----
-Undefined label 'x'
-1:-:-
-	`)
-
-	test(`x: while (true) { (function () { continue x; }); }
----
-Undefined label 'x'
-1:-:-
-	`)
-
-	test(`x: while (true) { (function () { break; }); }
----
-Illegal break statement
-1:-:-
-	`)
-
-	test(`x: while (true) { (function () { continue; }); }
----
-Illegal continue statement
-1:-:-
-	`)
-
-	test(`x: while (true) { x: while (true) {} }
----
-Label 'x' has already been declared
-1:-:-
-	`)
-
-	// TODO When strict mode is implemented
-	if false {
-		test(`(function () { 'use strict'; delete i; }())
-	---
-	Delete of an unqualified identifier in strict mode.
-	0:-:-
-		`)
-	}
-
-	// ----
-	// ----
-	// ----
-
-	test(`_: _: while (true) {}
----
-Label '_' has already been declared
-1:-:-
-	`)
-
-	test(`
-_:
-_:
-while (1 + 1) {
-	banana
-}
----
-Label '_' has already been declared
-3:-:-
-	`)
-
-	test(`
-_:
-    _:
-while (apple) {
-}
----
-Label '_' has already been declared
-3:-:-
-	`)
-
-	test("/Xyzzy(?!Nothing happens)/", "---\nInvalid regular expression: invalid or unsupported Perl syntax: `(?!`\n1:-:-")
-
-	test(`
-	function(){}
-	---
-	Unexpected token ( 2:-:-
-	`)
-
-	test(`
-	/*/
-	---
-	Unexpected token ILLEGAL
-	0:0:0
-	`)
-
-	test(`
-	/*/.source
-	---
-	Unexpected token ILLEGAL
-	0:0:0
-	`)
-
-	test("/\\1/.source", "---\nInvalid regular expression: invalid escape sequence: `\\1`\n-:-:-")
-
-	test(`var class
----
-Unexpected reserved word
-1:10:10
-	`)
-
-}
-
-func TestParseComment(t *testing.T) {
-	Terst(t)
-
-	test := parserTest
-
-	test(`
-	xyzzy // Ignore it
-	// Ignore this
-	// And this
-	/* And all..
-
-
-
-	... of this!
-	*/
-	"Nothing happens."
-	// And finally this
-	---
-	{ @ xyzzy "Nothing happens." }
-	`)
-}
diff --git a/vendor/github.com/robertkrimen/otto/property.go b/vendor/github.com/robertkrimen/otto/property.go
deleted file mode 100644
index deb6d947a..000000000
--- a/vendor/github.com/robertkrimen/otto/property.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package otto
-
-// property
-
-type _propertyMode int
-
-const (
-	modeWriteMask     _propertyMode = 0700
-	modeEnumerateMask               = 0070
-	modeConfigureMask               = 0007
-	modeOnMask                      = 0111
-	modeOffMask                     = 0000
-	modeSetMask                     = 0222 // If value is 2, then mode is neither "On" nor "Off"
-)
-
-type _propertyGetSet [2]*_object
-
-type _property struct {
-	value interface{}
-	mode  _propertyMode
-}
-
-func (self _property) writable() bool {
-	return self.mode&modeWriteMask == modeWriteMask&modeOnMask
-}
-
-func (self *_property) writeOn() {
-	self.mode = (self.mode & ^modeWriteMask) | (modeWriteMask & modeOnMask)
-}
-
-func (self *_property) writeOff() {
-	self.mode &= ^modeWriteMask
-}
-
-func (self _property) writeSet() bool {
-	return 0 == self.mode&modeWriteMask&modeSetMask
-}
-
-func (self _property) enumerable() bool {
-	return self.mode&modeEnumerateMask == modeEnumerateMask&modeOnMask
-}
-
-func (self *_property) enumerateOn() {
-	self.mode = (self.mode & ^modeEnumerateMask) | (modeEnumerateMask & modeOnMask)
-}
-
-func (self *_property) enumerateOff() {
-	self.mode &= ^modeEnumerateMask
-}
-
-func (self _property) enumerateSet() bool {
-	return 0 == self.mode&modeEnumerateMask&modeSetMask
-}
-
-func (self _property) configurable() bool {
-	return self.mode&modeConfigureMask == modeConfigureMask&modeOnMask
-}
-
-func (self *_property) configureOn() {
-	self.mode = (self.mode & ^modeConfigureMask) | (modeConfigureMask & modeOnMask)
-}
-
-func (self *_property) configureOff() {
-	self.mode &= ^modeConfigureMask
-}
-
-func (self _property) configureSet() bool {
-	return 0 == self.mode&modeConfigureMask&modeSetMask
-}
-
-func (self _property) copy() *_property {
-	property := self
-	return &property
-}
-
-func (self _property) isAccessorDescriptor() bool {
-	setGet, test := self.value.(_propertyGetSet)
-	return test && setGet[0] != nil || setGet[1] != nil
-}
-
-func (self _property) isDataDescriptor() bool {
-	if self.writeSet() { // Either "On" or "Off"
-		return true
-	}
-	value, valid := self.value.(Value)
-	return valid && !value.isEmpty()
-}
-
-func (self _property) isGenericDescriptor() bool {
-	return !(self.isDataDescriptor() || self.isAccessorDescriptor())
-}
-
-func (self _property) isEmpty() bool {
-	return self.mode == 0222 && self.isGenericDescriptor()
-}
-
-// _enumerableValue, _enumerableTrue, _enumerableFalse?
-// .enumerableValue() .enumerableExists()
-
-func toPropertyDescriptor(value Value) (descriptor _property) {
-	objectDescriptor := value._object()
-	if objectDescriptor == nil {
-		panic(newTypeError())
-	}
-
-	{
-		descriptor.mode = modeSetMask // Initially nothing is set
-		if objectDescriptor.hasProperty("enumerable") {
-			if objectDescriptor.get("enumerable").toBoolean() {
-				descriptor.enumerateOn()
-			} else {
-				descriptor.enumerateOff()
-			}
-		}
-
-		if objectDescriptor.hasProperty("configurable") {
-			if objectDescriptor.get("configurable").toBoolean() {
-				descriptor.configureOn()
-			} else {
-				descriptor.configureOff()
-			}
-		}
-
-		if objectDescriptor.hasProperty("writable") {
-			if objectDescriptor.get("writable").toBoolean() {
-				descriptor.writeOn()
-			} else {
-				descriptor.writeOff()
-			}
-		}
-	}
-
-	var getter, setter *_object
-	getterSetter := false
-
-	if objectDescriptor.hasProperty("get") {
-		value := objectDescriptor.get("get")
-		if value.IsDefined() {
-			if !value.isCallable() {
-				panic(newTypeError())
-			}
-			getter = value._object()
-			getterSetter = getterSetter || getter != nil
-		}
-	}
-
-	if objectDescriptor.hasProperty("set") {
-		value := objectDescriptor.get("set")
-		if value.IsDefined() {
-			if !value.isCallable() {
-				panic(newTypeError())
-			}
-			setter = value._object()
-			getterSetter = getterSetter || setter != nil
-		}
-	}
-
-	if getterSetter {
-		if descriptor.writeSet() {
-			panic(newTypeError())
-		}
-		descriptor.value = _propertyGetSet{getter, setter}
-	}
-
-	if objectDescriptor.hasProperty("value") {
-		if getterSetter {
-			panic(newTypeError())
-		}
-		descriptor.value = objectDescriptor.get("value")
-	}
-
-	return
-}
-
-func (self *_runtime) fromPropertyDescriptor(descriptor _property) *_object {
-	object := self.newObject()
-	if descriptor.isDataDescriptor() {
-		object.defineProperty("value", descriptor.value.(Value), 0111, false)
-		object.defineProperty("writable", toValue_bool(descriptor.writable()), 0111, false)
-	} else if descriptor.isAccessorDescriptor() {
-		getSet := descriptor.value.(_propertyGetSet)
-		object.defineProperty("get", toValue_object(getSet[0]), 0111, false)
-		object.defineProperty("set", toValue_object(getSet[1]), 0111, false)
-	}
-	object.defineProperty("enumerable", toValue_bool(descriptor.enumerable()), 0111, false)
-	object.defineProperty("configurable", toValue_bool(descriptor.configurable()), 0111, false)
-	return object
-}
diff --git a/vendor/github.com/robertkrimen/otto/reflect_test.go b/vendor/github.com/robertkrimen/otto/reflect_test.go
deleted file mode 100644
index 040986648..000000000
--- a/vendor/github.com/robertkrimen/otto/reflect_test.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"math"
-	"reflect"
-	"testing"
-)
-
-type testStruct struct {
-	Abc bool
-	Def int
-	Ghi string
-	Jkl interface{}
-}
-
-func TestReflect(t *testing.T) {
-	Terst(t)
-
-	if false {
-		// Testing dbgf
-		// These should panic
-		toValue("Xyzzy").toReflectValue(reflect.Ptr)
-		stringToReflectValue("Xyzzy", reflect.Ptr)
-	}
-}
-
-func Test_reflectStruct(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	// testStruct
-	{
-		abc := &testStruct{}
-		failSet("abc", abc)
-
-		test(`
-            [ abc.Abc, abc.Ghi ];
-        `, "false,")
-
-		abc.Abc = true
-		abc.Ghi = "Nothing happens."
-
-		test(`
-            [ abc.Abc, abc.Ghi ];
-        `, "true,Nothing happens.")
-
-		*abc = testStruct{}
-
-		test(`
-            [ abc.Abc, abc.Ghi ];
-        `, "false,")
-
-		abc.Abc = true
-		abc.Ghi = "Xyzzy"
-		failSet("abc", abc)
-
-		test(`
-            [ abc.Abc, abc.Ghi ];
-        `, "true,Xyzzy")
-
-		Is(abc.Abc, true)
-		test(`
-            abc.Abc = false;
-            abc.Def = 451;
-            abc.Ghi = "Nothing happens.";
-            abc.abc = "Something happens.";
-            [ abc.Def, abc.abc ];
-        `, "451,Something happens.")
-		Is(abc.Abc, false)
-		Is(abc.Def, 451)
-		Is(abc.Ghi, "Nothing happens.")
-
-		test(`
-            delete abc.Def;
-            delete abc.abc;
-            [ abc.Def, abc.abc ];
-        `, "451,")
-		Is(abc.Def, 451)
-	}
-}
-
-func Test_reflectMap(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	// map[string]string
-	{
-		abc := map[string]string{
-			"Xyzzy": "Nothing happens.",
-			"def":   "1",
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc.xyz = "pqr";
-            [ abc.Xyzzy, abc.def, abc.ghi ];
-        `, "Nothing happens.,1,")
-
-		Is(abc["xyz"], "pqr")
-	}
-
-	// map[string]float64
-	{
-		abc := map[string]float64{
-			"Xyzzy": math.Pi,
-			"def":   1,
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc.xyz = "pqr";
-            abc.jkl = 10;
-            [ abc.Xyzzy, abc.def, abc.ghi ];
-        `, "3.141592653589793,1,")
-
-		Is(abc["xyz"], "NaN")
-		Is(abc["jkl"], float64(10))
-	}
-
-	// map[string]int32
-	{
-		abc := map[string]int32{
-			"Xyzzy": 3,
-			"def":   1,
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc.xyz = "pqr";
-            abc.jkl = 10;
-            [ abc.Xyzzy, abc.def, abc.ghi ];
-        `, "3,1,")
-
-		Is(abc["xyz"], 0)
-		Is(abc["jkl"], int32(10))
-
-		test(`
-            delete abc["Xyzzy"];
-        `)
-
-		_, exists := abc["Xyzzy"]
-		IsFalse(exists)
-		Is(abc["Xyzzy"], 0)
-	}
-
-	// map[int32]string
-	{
-		abc := map[int32]string{
-			0: "abc",
-			1: "def",
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc[2] = "pqr";
-            //abc.jkl = 10;
-            abc[3] = 10;
-            [ abc[0], abc[1], abc[2], abc[3] ]
-        `, "abc,def,pqr,10")
-
-		Is(abc[2], "pqr")
-		Is(abc[3], "10")
-
-		test(`
-            delete abc[2];
-        `)
-
-		_, exists := abc[2]
-		IsFalse(exists)
-	}
-
-}
-
-func Test_reflectSlice(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	// []bool
-	{
-		abc := []bool{
-			false,
-			true,
-			true,
-			false,
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc;
-        `, "false,true,true,false")
-
-		test(`
-            abc[0] = true;
-            abc[abc.length-1] = true;
-            delete abc[2];
-            abc;
-        `, "true,true,false,true")
-
-		Is(abc, []bool{true, true, false, true})
-		Is(abc[len(abc)-1], true)
-	}
-
-	// []int32
-	{
-		abc := make([]int32, 4)
-		failSet("abc", abc)
-
-		test(`
-            abc;
-        `, "0,0,0,0")
-
-		test(`
-            abc[0] = 4.2;
-            abc[1] = "42";
-            abc[2] = 3.14;
-            abc;
-        `, "4,42,3,0")
-
-		Is(abc, []int32{4, 42, 3, 0})
-
-		test(`
-            delete abc[1];
-            delete abc[2];
-        `)
-		Is(abc[1], 0)
-		Is(abc[2], 0)
-	}
-}
-
-func Test_reflectArray(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	// []bool
-	if false {
-		abc := [4]bool{
-			false,
-			true,
-			true,
-			false,
-		}
-		failSet("abc", abc)
-
-		test(`
-            abc;
-        `, "false,true,true,false")
-		// Unaddressable array
-
-		test(`
-            abc[0] = true;
-            abc[abc.length-1] = true;
-            abc;
-        `, "false,true,true,false")
-		// Again, unaddressable array
-
-		Is(abc, [4]bool{false, true, true, false})
-		Is(abc[len(abc)-1], false)
-		// ...
-	}
-
-	// []int32
-	if false {
-		abc := make([]int32, 4)
-		failSet("abc", abc)
-
-		test(`
-            abc;
-        `, "0,0,0,0")
-
-		test(`
-            abc[0] = 4.2;
-            abc[1] = "42";
-            abc[2] = 3.14;
-            abc;
-        `, "4,42,3,0")
-
-		Is(abc, []int32{4, 42, 3, 0})
-	}
-
-	// []bool
-	{
-		abc := [4]bool{
-			false,
-			true,
-			true,
-			false,
-		}
-		failSet("abc", &abc)
-
-		test(`
-            abc;
-        `, "false,true,true,false")
-
-		test(`
-            abc[0] = true;
-            abc[abc.length-1] = true;
-            delete abc[2];
-            abc;
-        `, "true,true,false,true")
-
-		Is(abc, [4]bool{true, true, false, true})
-		Is(abc[len(abc)-1], true)
-	}
-
-}
-
-func Test_reflectArray_concat(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-	failSet("ghi", []string{"jkl", "mno"})
-	failSet("pqr", []interface{}{"jkl", 42, 3.14159, true})
-	test(`
-        var def = {
-            "abc": ["abc"],
-            "xyz": ["xyz"]
-        };
-        xyz = pqr.concat(ghi, def.abc, def, def.xyz);
-        [ xyz, xyz.length ];
-    `, "jkl,42,3.14159,true,jkl,mno,abc,[object Object],xyz,9")
-}
-
-func Test_reflectMapInterface(t *testing.T) {
-	Terst(t)
-
-	_, test := runTestWithOtto()
-
-	{
-		abc := map[string]interface{}{
-			"Xyzzy": "Nothing happens.",
-			"def":   "1",
-			"jkl":   "jkl",
-		}
-		failSet("abc", abc)
-		failSet("mno", &testStruct{})
-
-		test(`
-            abc.xyz = "pqr";
-            abc.ghi = {};
-            abc.jkl = 3.14159;
-            abc.mno = mno;
-            mno.Abc = true;
-            mno.Ghi = "Something happens.";
-            [ abc.Xyzzy, abc.def, abc.ghi, abc.mno ];
-        `, "Nothing happens.,1,[object Object],[object Object]")
-
-		Is(abc["xyz"], "pqr")
-		Is(abc["ghi"], "[object Object]")
-		Equal(abc["jkl"], float64(3.14159))
-		mno, valid := abc["mno"].(*testStruct)
-		Is(valid, true)
-		Is(mno.Abc, true)
-		Is(mno.Ghi, "Something happens.")
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/regexp_test.go b/vendor/github.com/robertkrimen/otto/regexp_test.go
deleted file mode 100644
index c11b0b739..000000000
--- a/vendor/github.com/robertkrimen/otto/regexp_test.go
+++ /dev/null
@@ -1,270 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"fmt"
-	"testing"
-)
-
-func TestRegExp(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		abc = new RegExp("abc").exec("123abc456")
-		def = new RegExp("xyzzy").exec("123abc456")
-		ghi = new RegExp("1(\\d+)").exec("123abc456")
-		jkl = new RegExp("xyzzy").test("123abc456")
-		mno = new RegExp("1(\\d+)").test("123abc456")
-	`)
-	test(`new RegExp("abc").exec("123abc456")`, "abc")
-	test("def", "null")
-	test("ghi", "123,23")
-	test("jkl", "false")
-	test("mno", "true")
-
-	test(`new RegExp("abc").toString()`, "/abc/")
-	test(`new RegExp("abc", "g").toString()`, "/abc/g")
-	test(`new RegExp("abc", "mig").toString()`, "/abc/gim")
-
-	test(`/abc/.toString()`, "/abc/")
-	test(`/abc/gim.toString()`, "/abc/gim")
-	test(`""+/abc/gi`, "/abc/gi")
-
-	result := test(`/(a)?/.exec('b')`, ",")
-	Is(result._object().get("0"), "")
-	Is(result._object().get("1"), "undefined")
-	Is(result._object().get("length"), "2")
-
-	result = test(`/(a)?(b)?/.exec('b')`, "b,,b")
-	Is(result._object().get("0"), "b")
-	Is(result._object().get("1"), "undefined")
-	Is(result._object().get("2"), "b")
-	Is(result._object().get("length"), "3")
-
-	test(`/\u0041/.source`, "\\u0041")
-	test(`/\a/.source`, "\\a")
-	test(`/\;/.source`, "\\;")
-
-	test(`/a\a/.source`, "a\\a")
-	test(`/,\;/.source`, ",\\;")
-	test(`/ \ /.source`, " \\ ")
-
-	// Start sanity check...
-	test("eval(\"/abc/\").source", "abc")
-	test("eval(\"/\u0023/\").source", "#")
-	test("eval(\"/\u0058/\").source", "X")
-	test("eval(\"/\\\u0023/\").source == \"\\\u0023\"", "true")
-	test("'0x' + '0058'", "0x0058")
-	test("'\\\\' + '0x' + '0058'", "\\0x0058")
-	// ...stop sanity check
-
-	test(`abc = '\\' + String.fromCharCode('0x' + '0058'); eval('/' + abc + '/').source`, "\\X")
-	test(`abc = '\\' + String.fromCharCode('0x0058'); eval('/' + abc + '/').source == "\\\u0058"`, "true")
-	test(`abc = '\\' + String.fromCharCode('0x0023'); eval('/' + abc + '/').source == "\\\u0023"`, "true")
-	test(`abc = '\\' + String.fromCharCode('0x0078'); eval('/' + abc + '/').source == "\\\u0078"`, "true")
-
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(RegExp, "prototype");
-        [   [ typeof RegExp.prototype ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "object,false,false,false")
-}
-
-func TestRegExp_global(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = /(?:ab|cd)\d?/g;
-        var found = [];
-        do {
-            match = abc.exec("ab  cd2  ab34  cd");
-            if (match !== null) {
-                found.push(match[0]);
-            } else {
-                break;
-            }
-        } while (true);
-        found;
-    `, "ab,cd2,ab3,cd")
-}
-
-func TestRegExp_exec(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		abc = /./g;
-		def = '123456';
-		ghi = 0;
-		while (ghi < 100 && abc.exec(def) !== null) {
-			ghi += 1;
-		}
-		[ ghi, def.length, ghi == def.length ];
-	`, "6,6,true")
-
-	test(`
-		abc = /[abc](\d)?/g;
-		def = 'a0 b c1 d3';
-		ghi = 0;
-		lastIndex = 0;
-		while (ghi < 100 && abc.exec(def) !== null) {
-			lastIndex = abc.lastIndex;
-			ghi += 1;
-
-		}
-		[ ghi, lastIndex ];
-	`, "3,7")
-
-	test(`
-		var abc = /[abc](\d)?/.exec("a0 b c1 d3");
-        [ abc.length, abc.input, abc.index, abc ];
-    `, "2,a0 b c1 d3,0,a0,0")
-
-	test(`raise:
-		var exec = RegExp.prototype.exec;
-		exec("Xyzzy");
-	`, "TypeError: Calling RegExp.exec on a non-RegExp object")
-
-	test(`
-        var abc = /\w{3}\d?/.exec("CE\uFFFFL\uFFDDbox127");
-        [ abc.input.length, abc.length, abc.input, abc.index, abc ];
-    `, "11,1,CE\uFFFFL\uFFDDbox127,5,box1")
-
-	test(`RegExp.prototype.exec.length`, "1")
-	test(`RegExp.prototype.exec.prototype`, "undefined")
-}
-
-func TestRegExp_test(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`RegExp.prototype.test.length`, "1")
-	test(`RegExp.prototype.test.prototype`, "undefined")
-}
-
-func TestRegExp_toString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`RegExp.prototype.toString.length`, "0")
-	test(`RegExp.prototype.toString.prototype`, "undefined")
-}
-
-func TestRegExp_zaacbbbcac(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	if false {
-		// TODO /(z)((a+)?(b+)?(c))*/.exec("zaacbbbcac")
-		test(`
-            var abc = /(z)((a+)?(b+)?(c))*/.exec("zaacbbbcac");
-            [ abc.length, abc.index, abc ];
-        `, "6,0,zaacbbbcac,z,ac,a,,c")
-	}
-}
-
-func TestRegExpCopying(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        abc = /xyzzy/i;
-        def = RegExp(abc);
-        abc.indicator = 1;
-        [ abc.indicator, def.indicator ];
-    `, "1,1")
-
-	test(`raise:
-        RegExp(new RegExp("\d"), "1");
-    `, "TypeError: Cannot supply flags when constructing one RegExp from another")
-}
-
-func TestRegExp_multiline(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = /s$/m.exec("pairs\nmakes\tdouble");
-        [ abc.length, abc.index, abc ];
-    `, "1,4,s")
-}
-
-func TestRegExp_source(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        [ /xyzzy/i.source, /./i.source ];
-    `, "xyzzy,.")
-
-	test(`
-        var abc = /./i;
-        var def = new RegExp(abc);
-        [ abc.source, def.source, abc.source === def.source ];
-    `, ".,.,true")
-
-	test(`
-        var abc = /./i;
-        var def = abc.hasOwnProperty("source");
-        var ghi = abc.source;
-        abc.source = "xyzzy";
-        [ def, abc.source ];
-    `, "true,.")
-}
-
-func TestRegExp_newRegExp(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        Math.toString();
-        var abc = new RegExp(Math,eval("\"g\""));
-        [ abc, abc.global ];
-    `, "/[object Math]/g,true")
-}
-
-func TestRegExp_flags(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = /./i;
-        var def = new RegExp(abc);
-        [ abc.multiline == def.multiline, abc.global == def.global, abc.ignoreCase == def.ignoreCase ];
-    `, "true,true,true")
-}
-
-func TestRegExp_controlCharacter(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	for code := 0x41; code < 0x5a; code++ {
-		string_ := string(code - 64)
-		test(fmt.Sprintf(`
-            var code = 0x%x;
-            var string = String.fromCharCode(code %% 32);
-            var result = (new RegExp("\\c" + String.fromCharCode(code))).exec(string);
-            [ code, string, result ];
-        `, code), fmt.Sprintf("%d,%s,%s", code, string_, string_))
-	}
-}
-
-func TestRegExp_notNotEmptyCharacterClass(t *testing.T) {
-	Terst(t)
-	test := runTest()
-	test(`
-        var abc = /[\s\S]a/m.exec("a\naba");
-        [ abc.length, abc.input, abc ];
-    `, "1,a\naba,\na")
-}
-
-func TestRegExp_compile(t *testing.T) {
-	Terst(t)
-	test := runTest()
-	test(`
-        var abc = /[\s\S]a/;
-        abc.compile('^\w+');
-    `, "undefined")
-}
diff --git a/vendor/github.com/robertkrimen/otto/registry/README.markdown b/vendor/github.com/robertkrimen/otto/registry/README.markdown
deleted file mode 100644
index ba2d38909..000000000
--- a/vendor/github.com/robertkrimen/otto/registry/README.markdown
+++ /dev/null
@@ -1,51 +0,0 @@
-# registry
---
-    import "github.com/robertkrimen/otto/registry"
-
-Package registry is an expirmental package to facillitate altering the otto
-runtime via import.
-
-This interface can change at any time.
-
-## Usage
-
-#### func  Apply
-
-```go
-func Apply(callback func(Entry))
-```
-
-#### type Entry
-
-```go
-type Entry struct {
-}
-```
-
-
-#### func  Register
-
-```go
-func Register(source func() string) *Entry
-```
-
-#### func (*Entry) Disable
-
-```go
-func (self *Entry) Disable()
-```
-
-#### func (*Entry) Enable
-
-```go
-func (self *Entry) Enable()
-```
-
-#### func (Entry) Source
-
-```go
-func (self Entry) Source() string
-```
-
---
-**godocdown** http://github.com/robertkrimen/godocdown
diff --git a/vendor/github.com/robertkrimen/otto/registry/registry.go b/vendor/github.com/robertkrimen/otto/registry/registry.go
deleted file mode 100644
index 966638ac4..000000000
--- a/vendor/github.com/robertkrimen/otto/registry/registry.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Package registry is an expirmental package to facillitate altering the otto runtime via import.
-
-This interface can change at any time.
-*/
-package registry
-
-var registry []*Entry = make([]*Entry, 0)
-
-type Entry struct {
-	active bool
-	source func() string
-}
-
-func newEntry(source func() string) *Entry {
-	return &Entry{
-		active: true,
-		source: source,
-	}
-}
-
-func (self *Entry) Enable() {
-	self.active = true
-}
-
-func (self *Entry) Disable() {
-	self.active = false
-}
-
-func (self Entry) Source() string {
-	return self.source()
-}
-
-func Apply(callback func(Entry)) {
-	for _, entry := range registry {
-		if !entry.active {
-			continue
-		}
-		callback(*entry)
-	}
-}
-
-func Register(source func() string) *Entry {
-	entry := newEntry(source)
-	registry = append(registry, entry)
-	return entry
-}
diff --git a/vendor/github.com/robertkrimen/otto/result.go b/vendor/github.com/robertkrimen/otto/result.go
deleted file mode 100644
index cf42c423a..000000000
--- a/vendor/github.com/robertkrimen/otto/result.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package otto
-
-import ()
-
-type _resultKind int
-
-const (
-	resultNormal _resultKind = iota
-	resultReturn
-	resultBreak
-	resultContinue
-)
-
-type _result struct {
-	kind   _resultKind
-	value  Value
-	target string
-}
-
-func newReturnResult(value Value) _result {
-	return _result{resultReturn, value, ""}
-}
-
-func newContinueResult(target string) _result {
-	return _result{resultContinue, emptyValue(), target}
-}
-
-func newBreakResult(target string) _result {
-	return _result{resultBreak, emptyValue(), target}
-}
diff --git a/vendor/github.com/robertkrimen/otto/runtime.go b/vendor/github.com/robertkrimen/otto/runtime.go
deleted file mode 100644
index 8f8dea466..000000000
--- a/vendor/github.com/robertkrimen/otto/runtime.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package otto
-
-import (
-	"reflect"
-	"strconv"
-)
-
-type _global struct {
-	Object         *_object // Object( ... ), new Object( ... ) - 1 (length)
-	Function       *_object // Function( ... ), new Function( ... ) - 1
-	Array          *_object // Array( ... ), new Array( ... ) - 1
-	String         *_object // String( ... ), new String( ... ) - 1
-	Boolean        *_object // Boolean( ... ), new Boolean( ... ) - 1
-	Number         *_object // Number( ... ), new Number( ... ) - 1
-	Math           *_object
-	Date           *_object // Date( ... ), new Date( ... ) - 7
-	RegExp         *_object // RegExp( ... ), new RegExp( ... ) - 2
-	Error          *_object // Error( ... ), new Error( ... ) - 1
-	EvalError      *_object
-	TypeError      *_object
-	RangeError     *_object
-	ReferenceError *_object
-	SyntaxError    *_object
-	URIError       *_object
-
-	ObjectPrototype         *_object // Object.prototype
-	FunctionPrototype       *_object // Function.prototype
-	ArrayPrototype          *_object // Array.prototype
-	StringPrototype         *_object // String.prototype
-	BooleanPrototype        *_object // Boolean.prototype
-	NumberPrototype         *_object // Number.prototype
-	DatePrototype           *_object // Date.prototype
-	RegExpPrototype         *_object // RegExp.prototype
-	ErrorPrototype          *_object // Error.prototype
-	EvalErrorPrototype      *_object
-	TypeErrorPrototype      *_object
-	RangeErrorPrototype     *_object
-	ReferenceErrorPrototype *_object
-	SyntaxErrorPrototype    *_object
-	URIErrorPrototype       *_object
-}
-
-type _runtime struct {
-	Stack [](*_executionContext)
-
-	GlobalObject      *_object
-	GlobalEnvironment *_objectEnvironment
-
-	Global _global
-
-	eval *_object // The builtin eval, for determine indirect versus direct invocation
-
-	Otto *Otto
-}
-
-func (self *_runtime) EnterGlobalExecutionContext() {
-	self.EnterExecutionContext(newExecutionContext(self.GlobalEnvironment, self.GlobalEnvironment, self.GlobalObject))
-}
-
-func (self *_runtime) EnterExecutionContext(scope *_executionContext) {
-	self.Stack = append(self.Stack, scope)
-}
-
-func (self *_runtime) LeaveExecutionContext() {
-	self.Stack = self.Stack[:len(self.Stack)-1]
-}
-
-func (self *_runtime) _executionContext(depth int) *_executionContext {
-	if depth == 0 {
-		return self.Stack[len(self.Stack)-1]
-	}
-	if len(self.Stack)-1+depth >= 0 {
-		return self.Stack[len(self.Stack)-1+depth]
-	}
-	return nil
-}
-
-func (self *_runtime) EnterFunctionExecutionContext(function *_object, this Value) *_functionEnvironment {
-	scopeEnvironment := function.functionValue().call.ScopeEnvironment()
-	if scopeEnvironment == nil {
-		scopeEnvironment = self.GlobalEnvironment
-	}
-	environment := self.newFunctionEnvironment(scopeEnvironment)
-	var thisObject *_object
-	switch this._valueType {
-	case valueUndefined, valueNull:
-		thisObject = self.GlobalObject
-	default:
-		thisObject = self.toObject(this)
-	}
-	self.EnterExecutionContext(newExecutionContext(environment, environment, thisObject))
-	return environment
-}
-
-func (self *_runtime) EnterEvalExecutionContext(call FunctionCall) {
-	// Skip the current function lexical/variable environment, which is of the function execution context call
-	// to eval (the global execution context). Instead, execute in the context of where the eval was called,
-	// which is essentially dynamic scoping
-	parent := self._executionContext(-1)
-	new := newExecutionContext(parent.LexicalEnvironment, parent.VariableEnvironment, parent.this)
-	// FIXME Make passing through of self.GlobalObject more general? Whenever newExecutionContext is passed a nil object?
-	new.eval = true
-	self.EnterExecutionContext(new)
-}
-
-func (self *_runtime) GetValue(value Value) Value {
-	if value.isReference() {
-		return value.reference().GetValue()
-	}
-	return value
-}
-
-func (self *_runtime) PutValue(reference _reference, value Value) {
-	if !reference.PutValue(value) {
-		// Why? -- If reference.Base == nil
-		strict := false
-		self.GlobalObject.defineProperty(reference.GetName(), value, 0111, strict)
-	}
-}
-
-func (self *_runtime) _callNode(function *_object, environment *_functionEnvironment, node *_functionNode, this Value, argumentList []Value) Value {
-
-	indexOfParameterName := make([]string, len(argumentList))
-	// function(abc, def, ghi)
-	// indexOfParameterName[0] = "abc"
-	// indexOfParameterName[1] = "def"
-	// indexOfParameterName[2] = "ghi"
-	// ...
-
-	for index, name := range node.ParameterList {
-		value := UndefinedValue()
-		if index < len(argumentList) {
-			value = argumentList[index]
-			indexOfParameterName[index] = name
-		}
-		self.localSet(name, value)
-	}
-
-	if !node.ArgumentsIsParameter {
-		arguments := self.newArgumentsObject(indexOfParameterName, environment, len(argumentList))
-		arguments.defineProperty("callee", toValue_object(function), 0101, false)
-		environment.arguments = arguments
-		self.localSet("arguments", toValue_object(arguments))
-		for index, _ := range argumentList {
-			if index < len(node.ParameterList) {
-				continue
-			}
-			indexAsString := strconv.FormatInt(int64(index), 10)
-			arguments.defineProperty(indexAsString, argumentList[index], 0111, false)
-		}
-	}
-
-	self.declare("function", node.FunctionList)
-	self.declare("variable", node.VariableList)
-
-	result := self.evaluateBody(node.Body)
-	if result.isResult() {
-		return result
-	}
-
-	return UndefinedValue()
-}
-
-func (self *_runtime) Call(function *_object, this Value, argumentList []Value, evalHint bool) Value {
-	// Pass eval boolean through to EnterFunctionExecutionContext for further testing
-	_functionEnvironment := self.EnterFunctionExecutionContext(function, this)
-	defer func() {
-		self.LeaveExecutionContext()
-	}()
-
-	if evalHint {
-		evalHint = function == self.eval // If evalHint is true, then it IS a direct eval
-	}
-	callValue := function.functionValue().call.Dispatch(function, _functionEnvironment, self, this, argumentList, evalHint)
-	if value, valid := callValue.value.(_result); valid {
-		return value.value
-	}
-	return callValue
-}
-
-func (self *_runtime) tryCatchEvaluate(inner func() Value) (tryValue Value, exception bool) {
-	// resultValue = The value of the block (e.g. the last statement)
-	// throw = Something was thrown
-	// throwValue = The value of what was thrown
-	// other = Something that changes flow (return, break, continue) that is not a throw
-	// Otherwise, some sort of unknown panic happened, we'll just propagate it
-	defer func() {
-		if caught := recover(); caught != nil {
-			switch caught := caught.(type) {
-			case _error:
-				exception = true
-				tryValue = toValue_object(self.newError(caught.Name, caught.MessageValue()))
-			case *_syntaxError:
-				exception = true
-				tryValue = toValue_object(self.newError("SyntaxError", toValue_string(caught.Message)))
-			case Value:
-				exception = true
-				tryValue = caught
-			default:
-				panic(caught)
-			}
-		}
-	}()
-
-	tryValue = inner()
-	return
-}
-
-func (self *_runtime) declare(kind string, declarationList []_declaration) {
-	executionContext := self._executionContext(0)
-	eval := executionContext.eval
-	environment := executionContext.VariableEnvironment
-
-	for _, _declaration := range declarationList {
-		name := _declaration.Name
-		if kind == "function" {
-			value := self.evaluate(_declaration.Definition)
-			if !environment.HasBinding(name) {
-				environment.CreateMutableBinding(name, eval == true)
-			}
-			// TODO 10.5.5.e
-			environment.SetMutableBinding(name, value, false) // TODO strict
-		} else {
-			if !environment.HasBinding(name) {
-				environment.CreateMutableBinding(name, eval == true)
-				environment.SetMutableBinding(name, UndefinedValue(), false) // TODO strict
-			}
-		}
-	}
-}
-
-// _executionContext Proxy
-
-func (self *_runtime) localGet(name string) Value {
-	return self._executionContext(0).getValue(name)
-}
-
-func (self *_runtime) localSet(name string, value Value) {
-	self._executionContext(0).setValue(name, value, false)
-}
-
-func (self *_runtime) VariableEnvironment() _environment {
-	return self._executionContext(0).VariableEnvironment
-}
-
-func (self *_runtime) LexicalEnvironment() _environment {
-	return self._executionContext(0).LexicalEnvironment
-}
-
-// toObject
-
-func (self *_runtime) toObject(value Value) *_object {
-	switch value._valueType {
-	case valueEmpty, valueUndefined, valueNull:
-		panic(newTypeError())
-	case valueBoolean:
-		return self.newBoolean(value)
-	case valueString:
-		return self.newString(value)
-	case valueNumber:
-		return self.newNumber(value)
-	case valueObject:
-		return value._object()
-	}
-	panic(newTypeError())
-}
-
-func checkObjectCoercible(value Value) {
-	isObject, mustCoerce := testObjectCoercible(value)
-	if !isObject && !mustCoerce {
-		panic(newTypeError())
-	}
-}
-
-// testObjectCoercible
-
-func testObjectCoercible(value Value) (isObject bool, mustCoerce bool) {
-	switch value._valueType {
-	case valueReference, valueEmpty, valueNull, valueUndefined:
-		return false, false
-	case valueNumber, valueString, valueBoolean:
-		isObject = false
-		mustCoerce = true
-	case valueObject:
-		isObject = true
-		mustCoerce = false
-	}
-	return
-}
-
-func (self *_runtime) ToValue(value interface{}) (Value, error) {
-	result := UndefinedValue()
-	err := catchPanic(func() {
-		result = self.toValue(value)
-	})
-	return result, err
-}
-
-func (self *_runtime) toValue(value interface{}) Value {
-	switch value := value.(type) {
-	case Value:
-		return value
-	case func(FunctionCall) Value:
-		return toValue_object(self.newNativeFunction(value))
-	case _nativeFunction:
-		return toValue_object(self.newNativeFunction(value))
-	case Object, *Object, _object, *_object:
-		// Nothing happens.
-	default:
-		{
-			value := reflect.ValueOf(value)
-			switch value.Kind() {
-			case reflect.Ptr:
-				switch reflect.Indirect(value).Kind() {
-				case reflect.Struct:
-					return toValue_object(self.newGoStructObject(value))
-				case reflect.Array:
-					return toValue_object(self.newGoArray(value))
-				}
-			case reflect.Struct:
-				return toValue_object(self.newGoStructObject(value))
-			case reflect.Map:
-				return toValue_object(self.newGoMapObject(value))
-			case reflect.Slice:
-				return toValue_object(self.newGoSlice(value))
-			case reflect.Array:
-				return toValue_object(self.newGoArray(value))
-			}
-		}
-	}
-	return toValue(value)
-}
-
-func (runtime *_runtime) newGoSlice(value reflect.Value) *_object {
-	self := runtime.newGoSliceObject(value)
-	self.prototype = runtime.Global.ArrayPrototype
-	return self
-}
-
-func (runtime *_runtime) newGoArray(value reflect.Value) *_object {
-	self := runtime.newGoArrayObject(value)
-	self.prototype = runtime.Global.ArrayPrototype
-	return self
-}
-
-func (self *_runtime) run(source string) Value {
-	return self.evaluate(mustParse(source))
-}
-
-func (self *_runtime) runSafe(source string) (Value, error) {
-	result := UndefinedValue()
-	err := catchPanic(func() {
-		result = self.run(source)
-	})
-	switch result._valueType {
-	case valueReference:
-		result = self.GetValue(result)
-	}
-	return result, err
-}
diff --git a/vendor/github.com/robertkrimen/otto/runtime_test.go b/vendor/github.com/robertkrimen/otto/runtime_test.go
deleted file mode 100644
index 07f1b68e0..000000000
--- a/vendor/github.com/robertkrimen/otto/runtime_test.go
+++ /dev/null
@@ -1,1260 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"math"
-	"testing"
-)
-
-func TestOperator(t *testing.T) {
-	Terst(t)
-
-	Otto, test := runTestWithOtto()
-
-	test("xyzzy = 1")
-	test("xyzzy", "1")
-
-	if true {
-		Otto.Set("twoPlusTwo", func(FunctionCall) Value {
-			return toValue(5)
-		})
-		test("twoPlusTwo( 1 )", "5")
-
-		test("1 + twoPlusTwo( 1 )", "6")
-
-		test("-1 + twoPlusTwo( 1 )", "4")
-	}
-
-	test("result = 4")
-	test("result", "4")
-
-	test("result += 1")
-	test("result", "5")
-
-	test("result *= 2")
-	test("result", "10")
-
-	test("result /= 2")
-	test("result", "5")
-
-	test("result = 112.51 % 3.1")
-	test("result", "0.9100000000000019")
-
-	test("result = 'Xyzzy'")
-	test("result", "Xyzzy")
-
-	test("result = 'Xyz' + 'zy'")
-	test("result", "Xyzzy")
-
-	test("result = \"Xyzzy\"")
-	test("result", "Xyzzy")
-
-	test("result = 1; result = result")
-	test("result", "1")
-
-	test(`
-		var result64
-		=
-		64
-		, result10 =
-		10
-	`)
-	test("result64", "64")
-	test("result10", "10")
-
-	test(`
-		result = 1;
-		result += 1;
-	`)
-	test("result", "2")
-}
-
-func TestFunction_(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		result = 2
-		xyzzy = function() {
-			result += 1
-		}
-		xyzzy()
-	`)
-	test("result", "3")
-
-	test(`
-		xyzzy = function() {
-			return 1
-		}
-		result = xyzzy()
-	`)
-	test("result", "1")
-
-	test(`
-		xyzzy = function() {}
-		result = xyzzy()
-	`)
-	test("result", "undefined")
-
-	test(`
-		xyzzy = function() {
-			return 64
-			return 1
-		}
-		result = xyzzy()
-	`)
-	test("result", "64")
-
-	test(`
-		result = 4
-		xyzzy = function() {
-			result = 2
-		}
-		xyzzy()
-	`)
-	test("result", "2")
-
-	test(`
-		result = 4
-		xyzzy = function() {
-			var result
-			result = 2
-		}
-		xyzzy()
-	`)
-	test("result", "4")
-
-	test(`
-		xyzzy = function() {
-			var result = 4
-			return result
-		}
-		result = xyzzy()
-	`)
-	test("result", "4")
-
-	test(`
-		xyzzy = function() {
-			function test() {
-				var result = 1
-				return result
-			}
-			return test() + 1
-		}
-		result = xyzzy() + 1
-	`)
-	test("result", "3")
-
-	test(`
-		xyzzy = function() {
-			function test() {
-				var result = 1
-				return result
-			}
-			_xyzzy = 2
-			var result = _xyzzy + test() + 1
-			return result
-		}
-		result = xyzzy() + 1
-	`)
-	test("result", "5")
-	test("_xyzzy", "2")
-
-	test(`
-		xyzzy = function(apple) {
-			return 1
-		}
-		result = xyzzy(1)
-	`)
-	test("result", "1")
-
-	test(`
-		xyzzy = function(apple) {
-			return apple + 1
-		}
-		result = xyzzy(2)
-	`)
-	test("result", "3")
-
-	test(`
-		{
-			result = 1
-			result += 1;
-		}
-	`)
-	test("result", "2")
-
-	test(`
-		var global = 1
-		outer = function() {
-			var global = 2
-			var inner = function(){
-				return global
-			}
-			return inner()
-		}
-		result = outer()
-	`)
-	test("result", "2")
-
-	test(`
-		var apple = 1
-		var banana = function() {
-			return apple
-		}
-		var cherry = function() {
-			var apple = 2
-			return banana()
-		}
-		result = cherry()
-	`)
-	test("result", "1")
-
-	test(`
-        function xyz() {
-        };
-        delete xyz;
-    `, "false")
-
-	test(`
-        var abc = function __factorial(def){
-            if (def === 1) {
-                return def;
-            } else {
-                return __factorial(def-1)*def;
-            }
-        };
-        abc(3);
-    `, "6")
-}
-
-func TestIf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		if (1) {
-			result = 1
-		}
-		else {
-			result = 0
-		}
-	`)
-	test("result", "1")
-
-	test(`
-		if (0) {
-			result = 1
-		}
-		else {
-			result = 0
-		}
-	`)
-	test("result", "0")
-
-	test(`
-		result = 0
-		if (0) {
-			result = 1
-		}
-	`)
-	test("result", "0")
-
-	test(`
-		result = 0
-		if (result) {
-			result = 1
-		}
-	`)
-	test("result", "0")
-}
-
-func TestDoWhile(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		limit = 4;
-		result = 0;
-		do { 
-			result = result + 1;
-			limit = limit - 1;
-		} while (limit);
-        result;
-	`, "4")
-
-	test(`
-        result = eval("do {abc=1; break; abc=2;} while (0);");
-        [ result, abc ];
-    `, "1,1")
-}
-
-func TestWhile(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		limit = 4
-		result = 0
-		while (limit) {
-			result = result + 1
-			limit = limit - 1
-		}
-	`)
-	test("result", "4")
-}
-
-func TestContinueBreak(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		limit = 4
-		result = 0
-		while (limit) {
-			limit = limit - 1
-			if (limit) {
-			}
-			else {
-				break
-			}
-			result = result + 1
-		}
-	`)
-	test("result", "3")
-	test("limit", "0")
-
-	test(`
-		limit = 4
-		result = 0
-		while (limit) {
-			limit = limit - 1
-			if (limit) {
-				continue
-			}
-			else {
-				break
-			}
-			result = result + 1
-		}
-	`)
-	test("result", "0")
-
-	test(`
-		limit = 4
-		result = 0
-		do {
-			limit = limit - 1
-			if (limit) {
-				continue
-			}
-			else {
-				break
-			}
-			result = result + 1
-		} while (limit)
-	`)
-	test("result", "0")
-}
-
-func TestSwitchBreak(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		var abc = true;
-		var ghi = "Xyzzy";
-		while (abc) {
-			switch ('def') {
-			case 'def':
-				break;
-			}
-			ghi = "Nothing happens."
-			abc = false
-		}
-		ghi
-	`, "Nothing happens.")
-
-	test(`
-		var abc = true;
-		var ghi = "Xyzzy";
-		WHILE:
-		while (abc) {
-			switch ('def') {
-			case 'def':
-				break WHILE;
-			}
-			ghi = "Nothing happens."
-			abc = false
-		}
-		ghi
-	`, "Xyzzy")
-
-	test(`
-		var ghi = "Xyzzy";
-		FOR:
-		for (;;) {
-			switch ('def') {
-			case 'def':
-				break FOR;
-				ghi = ""
-			}
-			ghi = "Nothing happens."
-		}
-		ghi
-	`, "Xyzzy")
-
-	test(`
-		var ghi = "Xyzzy";
-		FOR:
-		for (var jkl in {}) {
-			switch ('def') {
-			case 'def':
-				break FOR;
-				ghi = "Something happens."
-			}
-			ghi = "Nothing happens."
-		}
-		ghi
-	`, "Xyzzy")
-
-	test(`
-		var ghi = "Xyzzy";
-		function jkl() {
-			switch ('def') {
-			case 'def':
-				break;
-				ghi = ""
-			}
-			ghi = "Nothing happens."
-		}
-		while (abc) {
-			jkl()
-			abc = false
-			ghi = "Something happens."
-		}
-		ghi
-	`, "Something happens.")
-}
-
-func TestTryFinally(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		try {
-			result = 1
-		}
-		finally {
-			result = 2
-		}
-	`)
-	test("result", "2")
-
-	test(`
-		var abc = false, def = 0;
-		do {
-			def += 1;
-			if (def > 100) {
-				break;
-			}
-			try {
-				continue;
-			}
-			finally {
-				abc = true;
-			}
-		}
-		while(!abc && def < 10)
-		def;
-	`, "1")
-
-	test(`
-		var abc = false, def = 0, ghi = 0;
-		do {
-			def += 1;
-			if (def > 100) {
-				break;
-			}
-			try {
-				throw 0;
-			}
-			catch (jkl) {
-				continue;
-			}
-			finally {
-				abc = true;
-				ghi = 11;
-			}
-			ghi -= 1;
-		}
-		while(!abc && def < 10)
-		ghi;
-	`, "11")
-
-	test(`
-        var abc = 0, def = 0;
-        do {
-            try {
-                abc += 1;
-                throw "ghi";
-            }
-            finally {
-                def = 1;
-                continue;
-            }   
-            def -= 1;
-        }
-        while (abc < 2)
-        [ abc, def ];
-    `, "2,1")
-}
-
-func TestTryCatch(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		result = 1
-		try {
-			throw 4
-			result = -1
-		}
-		catch (xyzzy) {
-			result += xyzzy + 1
-		}
-	`)
-	test("result", "6")
-
-	test(`
-		result = 1
-		try {
-			try {
-				throw 4
-				result = -1
-			}
-			catch (xyzzy) {
-				result += xyzzy + 1
-				throw 64
-			}
-		}
-		catch (xyzzy) {
-			resultXyzzy = xyzzy
-			result = -2
-		}
-	`)
-	test("resultXyzzy", "64")
-	test("result", "-2")
-}
-
-func TestTryCatchError(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		var abc
-		try {
-			1()
-		}
-		catch (def) {
-			abc = def
-		}
-		abc
-	`, "TypeError: 1 is not a function")
-
-}
-
-func TestPositiveNegativeZero(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`1/0`, "Infinity")
-	test(`1/-0`, "-Infinity")
-	test(`
-		abc = -0
-		1/abc
-	`,
-		"-Infinity",
-	)
-}
-
-func TestComparison(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test("undefined = 1")
-	test("undefined", "undefined")
-
-	test("result = undefined == undefined")
-	test("result", "true")
-
-	test("result = undefined != undefined")
-	test("result", "false")
-
-	test("result = null == null")
-	test("result", "true")
-
-	test("result = null != null")
-	test("result", "false")
-
-	test("result = 0 == 1")
-	test("result", "false")
-
-	Is(negativeZero(), "-0")
-	Is(positiveZero(), "0")
-	IsTrue(math.Signbit(negativeZero()))
-	IsTrue(positiveZero() == negativeZero())
-
-	test("result = 1 == 1")
-	test("result", "true")
-
-	test("result = 'Hello, World.' == 'Goodbye, World.'")
-	test("result", "false")
-
-	test("result = 'Hello, World.' == true")
-	test("result", "false")
-
-	test("result = 'Hello, World.' == false")
-	test("result", "false")
-
-	test("result = 'Hello, World.' == 1")
-	test("result", "false")
-
-	test("result = 1 == 'Hello, World.'")
-	test("result", "false")
-
-	Is(stringToFloat("-1"), -1)
-
-	test("result = 0+Object")
-	test("result", "0[function]")
-}
-
-func TestComparisonRelational(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test("result = 0 < 0")
-	test("result", "false")
-
-	test("result = 0 > 0")
-	test("result", "false")
-
-	test("result = 0 <= 0")
-	test("result", "true")
-
-	test("result = 0 >= 0")
-	test("result", "true")
-
-	test("result = '   0' >= 0")
-	test("result", "true")
-
-	test("result = '_   0' >= 0")
-	test("result", "false")
-}
-
-func TestSwitch(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		result = 0
-		switch (0) {
-		default:
-			result += 1 
-		case 1:
-			result += 2
-		case 2:
-			result += 4
-		case 3:
-			result += 8 
-		}
-	`)
-	test("result", "15")
-
-	test(`
-		result = 0
-		switch (3) {
-		default:
-			result += 1 
-		case 1:
-			result += 2
-		case 2:
-			result += 4
-		case 3:
-			result += 8 
-		}
-	`)
-	test("result", "8")
-
-	test(`
-		result = 0
-		switch (60) {
-		case 1:
-			result += 2
-		case 2:
-			result += 4
-		case 3:
-			result += 8 
-		}
-	`)
-	test("result", "0")
-}
-
-func TestFor(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-    xyzzy: for (var abc = 0; abc <= 0; abc++) {
-    for (var def = 0; def <= 1; def++) {
-        if (def === 0) {
-            continue xyzzy;
-            } else {
-            }
-        }  
-    }
-    `)
-
-	test(`
-		result = 7
-		for (i = 0; i < 3; i += 1) {
-			result += 1
-		}
-	`)
-	test("result", "10")
-
-	test(`
-		result = 7
-		for (i = 0; i < 3; i += 1) {
-			result += 1
-			if (i == 1) {
-				break
-			}
-		}
-	`)
-	test("result", "9")
-
-	test(`
-		result = 7
-		for (i = 0; i < 3; i += 1) {
-			if (i == 2) {
-				continue
-			}
-			result += 1
-		}
-	`)
-	test("result", "9")
-
-	test(`
-		abc = 0
-		for (;;) {
-			abc += 1
-			if (abc == 3)
-				break
-		}
-		abc
-	`, "3")
-
-	test(`
-		for (abc = 0; ;) {
-			abc += 1
-			if (abc == 3)
-				break
-		}
-		abc
-	`, "3")
-
-	test(`
-		for (abc = 0; ; abc+=1) {
-			abc += 1
-			if (abc == 3)
-				break
-		}
-		abc
-	`, "3")
-}
-
-func TestArguments(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		xyzzy = function() {
-			return arguments[0]
-		}
-		result = xyzzy("xyzzy")
-	`)
-	test("result", "xyzzy")
-
-	test(`
-		xyzzy = function() {
-			arguments[0] = "abcdef"
-			return arguments[0]
-		}
-		result = xyzzy("xyzzy")
-	`)
-	test("result", "abcdef")
-
-	test(`
-		xyzzy = function(apple) {
-			apple = "abcdef"
-			return arguments[0]
-		}
-		result = xyzzy("xyzzy")
-	`)
-	test("result", "abcdef")
-
-	test(`
-		(function(){
-			return arguments
-		})()
-	`, "[object Arguments]")
-
-	test(`
-		(function(){
-			return arguments.length
-		})()
-	`, "0")
-
-	test(`
-		(function(){
-			return arguments.length
-		})(1, 2, 4, 8, 10)
-	`, "5")
-}
-
-func TestObjectLiteral(t *testing.T) {
-	Terst(t)
-
-	Otto := New()
-	Otto.Run(`
-		result = {}
-	`)
-	IsTrue(Otto.getValue("result").IsObject())
-
-	Otto.Run(`
-		result = { xyzzy: "Nothing happens.", 0: 1 }
-	`)
-	Is(Otto.getValue("result")._object().get("xyzzy"), "Nothing happens.")
-}
-
-func TestArrayLiteral(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		result = []
-	`)
-	IsTrue(test("result").IsObject())
-
-	test(`
-		result = [ "Nothing happens.", 0, 1 ]
-	`)
-	Is(test("result")._object().get("0"), "Nothing happens.")
-
-	test(`
-		xyzzy = [ "Nothing happens.", 0, 1 ]
-		result = xyzzy[1]
-	`)
-	test("result", "0")
-
-	test(`
-		xyzzy = [ "Nothing happens.", 0, 1 ]
-		xyzzy[10] = 2
-		_6 = xyzzy[6]
-		result = xyzzy[10]
-	`)
-	test("result", "2")
-	test("_6", "undefined")
-}
-
-func TestUnaryPrefix(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		var result = 0;
-		[++result, result];
-	`, "1,1")
-
-	test(`
-		result = 0;
-		[--result, result];
-	`, "-1,-1")
-
-	test(`
-        var object = { valueOf: function() { return 1; } };
-        result = ++object;
-        [ result, typeof result ];
-    `, "2,number")
-
-	test(`
-        var object = { valueOf: function() { return 1; } };
-        result = --object;
-        [ result, typeof result ];
-    `, "0,number")
-}
-
-func TestUnaryPostfix(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		var result = 0;
-		result++;
-		[ result++, result ];
-	`, "1,2")
-
-	test(`
-		result = 0;
-		result--;
-		[ result--, result ];
-	`, "-1,-2")
-
-	test(`
-        var object = { valueOf: function() { return 1; } };
-        result = object++;
-        [ result, typeof result ];
-    `, "1,number")
-
-	test(`
-        var object = { valueOf: function() { return 1; } };
-        result = object--
-        [ result, typeof result ];
-    `, "1,number")
-}
-
-func TestBinaryLogicalOperation(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = true
-		def = false
-		ghi = false
-		jkl = false
-		result = abc && def || ghi && jkl
-	`)
-	test("result", "false")
-
-	test(`
-		abc = true
-		def = true
-		ghi = false
-		jkl = false
-		result = abc && def || ghi && jkl
-	`)
-	test("result", "true")
-
-}
-
-func TestBinaryBitwiseOperation(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = 1 & 2
-		def = 1 & 3
-		ghi = 1 | 3
-		jkl = 1 ^ 2
-		mno = 1 ^ 3
-
-	`)
-	test("abc", "0")
-	test("def", "1")
-	test("ghi", "3")
-	test("jkl", "3")
-	test("mno", "2")
-}
-
-func TestBinaryShiftOperation(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		high = (1 << 30) - 1 + (1 << 30)
-		low = -high - 1
-		abc = 23 << 1
-		def = -105 >> 1
-		ghi = 23 << 2
-		jkl = 1 >>> 31
-		mno = 1 << 64
-		pqr = 1 >> 2
-		stu = -2 >> 4
-		vwx = low >> 1
-		yz = low >>> 1
-	`)
-	test("abc", "46")
-	test("def", "-53")
-	test("ghi", "92")
-	test("jkl", "0")
-	test("mno", "1")
-	test("pqr", "0")
-	test("stu", "-1")
-	test("vwx", "-1073741824")
-	test("yz", "1073741824")
-
-}
-
-func TestParenthesizing(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = 1 + 2 * 3
-		def = (1 + 2) * 3
-		ghi = !(false || true)
-		jkl = !false || true
-	`)
-	test("abc", "7")
-	test("def", "9")
-	test("ghi", "false")
-	test("jkl", "true")
-}
-
-func Test_instanceof(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = {} instanceof Object;
-	`)
-	test("abc", "true")
-
-	test(`
-		abc = "abc" instanceof Object;
-	`)
-	test("abc", "false")
-
-	test(`raise:
-		abc = {} instanceof "abc";
-    `, "TypeError: Expecting a function in instanceof check, but got: abc")
-
-	test(`raise:
-        "xyzzy" instanceof Math;
-    `, "TypeError")
-}
-
-func TestIn(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = "prototype" in Object
-		def = "xyzzy" in Object
-	`)
-	test("abc", "true")
-	test("def", "false")
-}
-
-func TestForIn(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        var abc;
-		for (property in { a: 1 }) {
-			abc = property;
-		}
-        abc;
-	`, "a")
-
-	test(`
-        var ghi;
-		for (property in new String("xyzzy")) {
-			ghi = property;
-		}
-        ghi;
-	`, "4")
-}
-
-func TestAssignment(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = 1
-		def = abc
-	`)
-	test("abc", "1")
-	test("def", "1")
-}
-
-func Testnew(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = new Boolean
-		def = new Boolean(1)
-	`)
-	test("abc", "false")
-	test("def", "true")
-}
-
-func TestConditional(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = true ? 1 : 0
-		def = 0 ? 2 : 3
-	`)
-	test("abc", "1")
-	test("def", "3")
-}
-
-func TestNewFunction(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		new Function("return 11")()
-	`, "11")
-
-	test(`
-		abc = 10
-		new Function("abc += 1")()
-		abc
-	`, "11")
-
-	test(`
-		new Function("a", "b", "c", "return b + 2")(10, 11, 12)
-	`, "13")
-
-	test(`raise:
-		new 1
-	`, "TypeError: 1 is not a function")
-
-	// TODO Better error reporting: new this
-	test(`raise:
-		new this
-	`, "TypeError: [object environment] is not a function")
-
-	test(`raise:
-		new {}
-	`, "TypeError: [object Object] is not a function")
-}
-
-func TestNewPrototype(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = { 'xyzzy': 'Nothing happens.' }
-		function Xyzzy(){}
-		Xyzzy.prototype = abc;
-		(new Xyzzy()).xyzzy
-	`, "Nothing happens.")
-}
-
-func TestBlock(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-        var abc=0;
-        var ghi;
-        def: {
-            do {
-                abc++;
-                if (!(abc < 10)) {
-                    break def;
-                    ghi = "ghi";
-                }
-            } while (true);
-        }
-        [ abc,ghi ];
-    `, "10,")
-}
-
-func TestWith(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		var def
-		with({ abc: 9 }) {
-			def = abc
-		}
-		def
-	`, "9")
-
-	test(`
-		var def
-		with({ abc: function(){
-			return 11
-		} }) {
-			def = abc()
-		}
-		def
-	`, "11")
-}
-
-func Test_toString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        [undefined+""]
-    `, "undefined")
-}
-
-func TestEvaluationOrder(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-        var abc = 0;
-        abc < (abc = 1) === true;
-    `, "true")
-}
-
-func TestClone(t *testing.T) {
-	Terst(t)
-
-	otto1 := New()
-	otto1.Run(`
-        var abc = 1;
-    `)
-
-	otto2 := otto1.clone()
-	otto1.Run(`
-        abc += 2;
-    `)
-	otto2.Run(`
-        abc += 4;
-    `)
-
-	Is(otto1.getValue("abc"), "3")
-	Is(otto2.getValue("abc"), "5")
-}
diff --git a/vendor/github.com/robertkrimen/otto/string_test.go b/vendor/github.com/robertkrimen/otto/string_test.go
deleted file mode 100644
index 0e3e9c7fd..000000000
--- a/vendor/github.com/robertkrimen/otto/string_test.go
+++ /dev/null
@@ -1,314 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-func TestString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`
-		abc = (new String("xyzzy")).length;
-		def = new String().length;
-		ghi = new String("Nothing happens.").length;
-	`)
-	test("abc", "5")
-	test("def", "0")
-	test("ghi", "16")
-	test(`"".length`, "0")
-	test(`"a\uFFFFbc".length`, "4")
-	test(`String(+0)`, "0")
-	test(`String(-0)`, "0")
-	test(`""+-0`, "0")
-	test(`
-        var abc = Object.getOwnPropertyDescriptor(String, "prototype");
-        [   [ typeof String.prototype ],
-            [ abc.writable, abc.enumerable, abc.configurable ] ];
-    `, "object,false,false,false")
-}
-
-func TestString_charAt(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		abc = "xyzzy".charAt(0)
-		def = "xyzzy".charAt(11)
-	`)
-	test("abc", "x")
-	test("def", "")
-}
-
-func TestString_charCodeAt(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`
-		abc = "xyzzy".charCodeAt(0)
-		def = "xyzzy".charCodeAt(11)
-	`)
-	test("abc", "120")
-	test("def", "NaN")
-}
-
-func TestString_fromCharCode(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`String.fromCharCode()`, "")
-	test(`String.fromCharCode(88, 121, 122, 122, 121)`, "Xyzzy")
-	test(`String.fromCharCode("88", 121, 122, 122.05, 121)`, "Xyzzy")
-	test(`String.fromCharCode("88", 121, 122, NaN, 121)`, "Xyz\x00y")
-	test(`String.fromCharCode("0x21")`, "!")
-	test(`String.fromCharCode(-1).charCodeAt(0)`, "65535")
-	test(`String.fromCharCode(65535).charCodeAt(0)`, "65535")
-	test(`String.fromCharCode(65534).charCodeAt(0)`, "65534")
-	test(`String.fromCharCode(4294967295).charCodeAt(0)`, "65535")
-	test(`String.fromCharCode(4294967294).charCodeAt(0)`, "65534")
-	test(`String.fromCharCode(0x0024) === "$"`, "true")
-}
-
-func TestString_concat(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"".concat()`, "")
-	test(`"".concat("abc", "def")`, "abcdef")
-	test(`"".concat("abc", undefined, "def")`, "abcundefineddef")
-}
-
-func TestString_indexOf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"".indexOf("")`, "0")
-	test(`"".indexOf("", 11)`, "0")
-	test(`"abc".indexOf("")`, "0")
-	test(`"abc".indexOf("", 11)`, "3")
-	test(`"abc".indexOf("a")`, "0")
-	test(`"abc".indexOf("bc")`, "1")
-	test(`"abc".indexOf("bc", 11)`, "-1")
-	test(`"$$abcdabcd".indexOf("ab", function(){return -Infinity;}())`, "2")
-	test(`"$$abcdabcd".indexOf("ab", function(){return NaN;}())`, "2")
-}
-
-func TestString_lastIndexOf(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"".lastIndexOf("")`, "0")
-	test(`"".lastIndexOf("", 11)`, "0")
-	test(`"abc".lastIndexOf("")`, "3")
-	test(`"abc".lastIndexOf("", 11)`, "3")
-	test(`"abc".lastIndexOf("a")`, "0")
-	test(`"abc".lastIndexOf("bc")`, "1")
-	test(`"abc".lastIndexOf("bc", 11)`, "1")
-	test(`"abc".lastIndexOf("bc", 0)`, "-1")
-}
-
-func TestString_match(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc____abc_abc___".match(/__abc/)`, "__abc")
-	test(`"abc___abc_abc__abc__abc".match(/abc/g)`, "abc,abc,abc,abc,abc")
-	test(`"abc____abc_abc___".match(/__abc/g)`, "__abc")
-	test(`
-		abc = /abc/g
-		"abc___abc_abc__abc__abc".match(abc)
-	`, "abc,abc,abc,abc,abc")
-	test(`abc.lastIndex`, "23")
-}
-
-func TestString_replace(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc_abc".replace(/abc/, "$&123")`, "abc123_abc")
-	test(`"abc_abc".replace(/abc/g, "$&123")`, "abc123_abc123")
-	test(`"abc_abc_".replace(/abc/g, "$&123")`, "abc123_abc123_")
-	test(`"_abc_abc_".replace(/abc/g, "$&123")`, "_abc123_abc123_")
-	test(`"abc".replace(/abc/, "$&123")`, "abc123")
-	test(`"abc_".replace(/abc/, "$&123")`, "abc123_")
-	test("\"^abc$\".replace(/abc/, \"$`def\")", "^^def$")
-	test("\"^abc$\".replace(/abc/, \"def$`\")", "^def^$")
-	test(`"_abc_abd_".replace(/ab(c|d)/g, "$1")`, "_c_d_")
-	test(`
-		"_abc_abd_".replace(/ab(c|d)/g, function(){
-		})
-	`, "_undefined_undefined_")
-
-	test(`"b".replace(/(a)?(b)?/, "_$1_")`, "__")
-	test(`
-		"b".replace(/(a)?(b)?/, function(a, b, c, d, e, f){
-			return [a, b, c, d, e, f]
-		})
-	`, "b,,b,0,b,")
-}
-
-func TestString_search(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".search(/abc/)`, "0")
-	test(`"abc".search(/def/)`, "-1")
-	test(`"abc".search(/c$/)`, "2")
-	test(`"abc".search(/$/)`, "3")
-}
-
-func TestString_split(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".split("", 1)`, "a")
-	test(`"abc".split("", 2)`, "a,b")
-	test(`"abc".split("", 3)`, "a,b,c")
-	test(`"abc".split("", 4)`, "a,b,c")
-	test(`"abc".split("", 11)`, "a,b,c")
-	test(`"abc".split("", 0)`, "")
-	test(`"abc".split("")`, "a,b,c")
-
-	test(`"abc".split(undefined)`, "abc")
-
-	test(`"__1__3_1__2__".split("_")`, ",,1,,3,1,,2,,")
-
-	test(`"__1__3_1__2__".split(/_/)`, ",,1,,3,1,,2,,")
-
-	test(`"ab".split(/a*/)`, ",b")
-
-	test(`_ = "A<B>bold</B>and<CODE>coded</CODE>".split(/<(\/)?([^<>]+)>/)`, "A,,B,bold,/,B,and,,CODE,coded,/,CODE,")
-	test(`_.length`, "13")
-	test(`_[1] === undefined`, "true")
-	test(`_[12] === ""`, "true")
-}
-
-func TestString_slice(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".slice()`, "abc")
-	test(`"abc".slice(0)`, "abc")
-	test(`"abc".slice(0,11)`, "abc")
-	test(`"abc".slice(0,-1)`, "ab")
-	test(`"abc".slice(-1,11)`, "c")
-	test(`abc = "abc"; abc.slice(abc.length+1, 0)`, "")
-}
-
-func TestString_substring(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".substring()`, "abc")
-	test(`"abc".substring(0)`, "abc")
-	test(`"abc".substring(0,11)`, "abc")
-	test(`"abc".substring(11,0)`, "abc")
-	test(`"abc".substring(0,-1)`, "")
-	test(`"abc".substring(-1,11)`, "abc")
-	test(`"abc".substring(11,1)`, "bc")
-	test(`"abc".substring(1)`, "bc")
-	test(`"abc".substring(Infinity, Infinity)`, "")
-}
-
-func TestString_toCase(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"abc".toLowerCase()`, "abc")
-	test(`"ABC".toLowerCase()`, "abc")
-	test(`"abc".toLocaleLowerCase()`, "abc")
-	test(`"ABC".toLocaleLowerCase()`, "abc")
-	test(`"abc".toUpperCase()`, "ABC")
-	test(`"ABC".toUpperCase()`, "ABC")
-	test(`"abc".toLocaleUpperCase()`, "ABC")
-	test(`"ABC".toLocaleUpperCase()`, "ABC")
-}
-
-func Test_floatToString(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`String(-1234567890)`, "-1234567890")
-	test(`-+String(-(-1234567890))`, "-1234567890")
-	test(`String(-1e128)`, "-1e+128")
-	test(`String(0.12345)`, "0.12345")
-	test(`String(-0.00000012345)`, "-1.2345e-7")
-	test(`String(0.0000012345)`, "0.0000012345")
-	test(`String(1000000000000000000000)`, "1e+21")
-	test(`String(1e21)`, "1e+21")
-	test(`String(1E21)`, "1e+21")
-	test(`String(-1000000000000000000000)`, "-1e+21")
-	test(`String(-1e21)`, "-1e+21")
-	test(`String(-1E21)`, "-1e+21")
-	test(`String(0.0000001)`, "1e-7")
-	test(`String(1e-7)`, "1e-7")
-	test(`String(1E-7)`, "1e-7")
-	test(`String(-0.0000001)`, "-1e-7")
-	test(`String(-1e-7)`, "-1e-7")
-	test(`String(-1E-7)`, "-1e-7")
-}
-
-func TestString_indexing(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	// Actually a test of stringToArrayIndex, under the hood.
-	test(`
-        abc = new String("abc");
-        index = Math.pow(2, 32);
-        [ abc.length, abc[index], abc[index+1], abc[index+2], abc[index+3] ];
-    `, "3,,,,")
-}
-
-func TestString_trim(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`'    \n abc   \t \n'.trim();`, "abc")
-	test(`"		abc\u000B".trim()`, "abc")
-	test(`"abc ".trim()`, "abc")
-	test(`
-		var a = "\u180Eabc \u000B "
-		var b = a.trim()
-		a.length + b.length
-	`, "10")
-}
-
-func TestString_trimLeft(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"		abc\u000B".trimLeft()`, "abc\u000B")
-	test(`"abc ".trimLeft()`, "abc ")
-	test(`
-		var a = "\u180Eabc \u000B "
-		var b = a.trimLeft()
-		a.length + b.length
-	`, "13")
-}
-
-func TestString_trimRight(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-	test(`"		abc\u000B".trimRight()`, "		abc")
-	test(`" abc ".trimRight()`, " abc")
-	test(`
-		var a = "\u180Eabc \u000B "
-		var b = a.trimRight()
-		a.length + b.length
-	`, "11")
-}
-
-func TestString_localeCompare(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	test(`'a'.localeCompare('c');`, "-1")
-	test(`'c'.localeCompare('a');`, "1")
-	test(`'a'.localeCompare('a');`, "0")
-}
diff --git a/vendor/github.com/robertkrimen/otto/terst/terst.go b/vendor/github.com/robertkrimen/otto/terst/terst.go
deleted file mode 100644
index 11b5215df..000000000
--- a/vendor/github.com/robertkrimen/otto/terst/terst.go
+++ /dev/null
@@ -1,1172 +0,0 @@
-// This file was AUTOMATICALLY GENERATED by terst-import from github.com/robertkrimen/terst
-
-/* 
-Package terst is a terse (terst = test + terse), easy-to-use testing library for Go.
-
-terst is compatible with (and works via) the standard testing package: http://golang.org/pkg/testing
-
-	import (
-		"testing"
-		. "github.com/robertkrimen/terst"
-	)
-
-	func Test(t *testing.T) {
-		Terst(t) // Associate terst methods with t (the current testing.T)
-
-		Is(getApple(), "apple") // Pass
-		Is(getOrange(), "orange") // Fail: emits nice-looking diagnostic 
-
-		Compare(1, ">", 0) // Pass
-		Compare(1, "==", 1.0) // Pass
-	}
-
-	func getApple() string {
-		return "apple"
-	}
-
-	func getOrange() string {
-		return "apple" // Intentional mistake
-	}
-
-At the top of your testing function, call Terst(), passing the testing.T you receive as the first argument:
-
-	func TestExample(t *testing.T) {
-		Terst(t)
-		...
-	}
-
-After you initialize with the given *testing.T, you can use the following to test:
-
-	Is
-	IsNot
-	Equal
-	Unequal
-	IsTrue
-	IsFalse
-	Like
-	Unlike
-	Compare
-
-Each of the methods above can take an additional (optional) argument,
-which is a string describing the test. If the test fails, this
-description will be included with the test output For example:
-
-	Is(2 + 2, float32(5), "This result is Doubleplusgood")
-
-	--- FAIL: Test (0.00 seconds)
-		test.go:17: This result is Doubleplusgood
-			Failed test (Is)
-			     got: 4 (int)
-			expected: 5 (float32)
-
-Future
-
-	- Add Catch() for testing panic()
-	- Add Same() for testing via .DeepEqual && == (without panicking?)
-	- Add StrictCompare to use {}= scoping
-	- Add BigCompare for easier math/big.Int testing?
-	- Support the complex type in Compare()
-	- Equality test for NaN?
-	- Better syntax for At*
-	- Need IsType/TypeIs
-
-*/
-package terst
-
-import (
-	"fmt"
-	"math/big"
-	"os"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strings"
-	"testing"
-	"unsafe"
-)
-
-func (self *Tester) hadResult(result bool, test *test, onFail func()) bool {
-	if self.selfTesting {
-		expect := true
-		if self.failIsPassing {
-			expect = false
-		}
-		if expect != result {
-			self.Log(fmt.Sprintf("Expect %v but got %v (%v) (%v) (%v)\n", expect, result, test.kind, test.have, test.want))
-			onFail()
-			self._fail()
-		}
-		return result
-	}
-	if !result {
-		onFail()
-		self._fail()
-	}
-	return result
-}
-
-// IsTrue is DEPRECATED by:
-//
-//      Is(..., true)
-//
-func IsTrue(have bool, description ...interface{}) bool {
-	return terstTester().IsTrue(have, description...)
-}
-
-// IsTrue is DEPRECATED by:
-//
-//      Is(..., true)
-//
-func (self *Tester) IsTrue(have bool, description ...interface{}) bool {
-	return self.trueOrFalse(true, have, description...)
-}
-
-// IsFalse is DEPRECATED by:
-//
-//      Is(..., false)
-//
-func IsFalse(have bool, description ...interface{}) bool {
-	return terstTester().IsFalse(have, description...)
-}
-
-// IsFalse is DEPRECATED by:
-//
-//      Is(..., false)
-//
-func (self *Tester) IsFalse(have bool, description ...interface{}) bool {
-	return self.trueOrFalse(false, have, description...)
-}
-
-func (self *Tester) trueOrFalse(want bool, have bool, description ...interface{}) bool {
-	kind := "IsTrue"
-	if want == false {
-		kind = "IsFalse"
-	}
-	test := newTest(kind, have, want, description)
-	didPass := have == want
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForIsTrue(test))
-	})
-}
-
-// Fail will fail immediately, reporting a test failure with the (optional) description
-func Fail(description ...interface{}) bool {
-	return terstTester().Fail(description...)
-}
-
-// Fail will fail immediately, reporting a test failure with the (optional) description
-func (self *Tester) Fail(description ...interface{}) bool {
-	return self.fail(description...)
-}
-
-func (self *Tester) fail(description ...interface{}) bool {
-	kind := "Fail"
-	test := newTest(kind, false, false, description)
-	didPass := false
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForFail(test))
-	})
-}
-
-// FailNow will fail immediately, triggering testing.FailNow() and optionally reporting a test failure with description
-func FailNow(description ...interface{}) bool {
-	return terstTester().FailNow(description...)
-}
-
-// FailNow will fail immediately, triggering testing.FailNow() and optionally reporting a test failure with description
-func (self *Tester) FailNow(description ...interface{}) bool {
-	return self.failNow(description...)
-}
-
-func (self *Tester) failNow(description ...interface{}) bool {
-	if len(description) > 0 {
-		kind := "FailNow"
-		test := newTest(kind, false, false, description)
-		didPass := false
-		self.hadResult(didPass, test, func() {
-			self.Log(self.failMessageForFail(test))
-		})
-	}
-	self.TestingT.FailNow()
-	return false
-}
-
-// Equal tests have against want via ==:
-//
-//		Equal(have, want) // Pass if have == want
-//
-// No special coercion or type inspection is done.
-//
-// If the type is incomparable (e.g. type mismatch) this will panic.
-func Equal(have, want interface{}, description ...interface{}) bool {
-	return terstTester().Equal(have, want, description...)
-}
-
-func (self *Tester) Equal(have, want interface{}, description ...interface{}) bool {
-	return self.equal(have, want, description...)
-}
-
-func (self *Tester) equal(have, want interface{}, description ...interface{}) bool {
-	test := newTest("==", have, want, description)
-	didPass := have == want
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForEqual(test))
-	})
-}
-
-// Unequal tests have against want via !=:
-//
-//		Unequal(have, want) // Pass if have != want
-//
-// No special coercion or type inspection is done.
-//
-// If the type is incomparable (e.g. type mismatch) this will panic.
-func Unequal(have, want interface{}, description ...interface{}) bool {
-	return terstTester().Unequal(have, want, description...)
-}
-
-func (self *Tester) Unequal(have, want interface{}, description ...interface{}) bool {
-	return self.unequal(have, want, description...)
-}
-
-func (self *Tester) unequal(have, want interface{}, description ...interface{}) bool {
-	test := newTest("!=", have, want, description)
-	didPass := have != want
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForIs(test))
-	})
-}
-
-// Is tests <have> against <want> in different ways, depending on the
-// type of <want>.
-//
-// If <want> is a string, then it will first convert
-// <have> to a string before doing the comparison:
-//
-//		Is(fmt.Sprintf("%v", have), want) // Pass if have == want
-//
-// Otherwise, Is is a shortcut for:
-//
-//		Compare(have, "==", want)
-//
-// If <want> is a slice, struct, or similar, Is will perform a reflect.DeepEqual() comparison.
-func Is(have, want interface{}, description ...interface{}) bool {
-	return terstTester().Is(have, want, description...)
-}
-
-// TODO "slice, struct, or similar" What is similar?
-
-func (self *Tester) Is(have, want interface{}, description ...interface{}) bool {
-	return self.isOrIsNot(true, have, want, description...)
-}
-
-// IsNot tests <have> against <want> in different ways, depending on the
-// type of <want>.
-//
-// If <want> is a string, then it will first convert
-// <have> to a string before doing the comparison:
-//
-//		IsNot(fmt.Sprintf("%v", have), want) // Pass if have != want
-//
-// Otherwise, Is is a shortcut for:
-//
-//		Compare(have, "!=", want)
-//
-// If <want> is a slice, struct, or similar, Is will perform a reflect.DeepEqual() comparison.
-func IsNot(have, want interface{}, description ...interface{}) bool {
-	return terstTester().IsNot(have, want, description...)
-}
-
-// TODO "slice, struct, or similar" What is similar?
-
-func (self *Tester) IsNot(have, want interface{}, description ...interface{}) bool {
-	return self.isOrIsNot(false, have, want, description...)
-}
-
-func (self *Tester) isOrIsNot(wantIs bool, have, want interface{}, description ...interface{}) bool {
-	test := newTest("Is", have, want, description)
-	if !wantIs {
-		test.kind = "IsNot"
-	}
-	didPass := false
-	switch want.(type) {
-	case string:
-		didPass = stringValue(have) == want
-	default:
-		didPass, _ = compare(have, "{}* ==", want)
-	}
-	if !wantIs {
-		didPass = !didPass
-	}
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForIs(test))
-	})
-}
-
-// Like tests <have> against <want> in different ways, depending on the
-// type of <want>.
-//
-// If <want> is a string, then it will first convert
-// <have> to a string before doing a regular expression comparison:
-//
-//		Like(fmt.Sprintf("%v", have), want) // Pass if regexp.Match(want, have)
-//
-// Otherwise, Like is a shortcut for:
-//
-//		Compare(have, "{}~ ==", want)
-//
-// If <want> is a slice, struct, or similar, Like will perform a reflect.DeepEqual() comparison.
-func Like(have, want interface{}, description ...interface{}) bool {
-	return terstTester().Like(have, want, description...)
-}
-
-func (self *Tester) Like(have, want interface{}, description ...interface{}) bool {
-	return self.likeOrUnlike(true, have, want, description...)
-}
-
-// Unlike tests <have> against <want> in different ways, depending on the
-// type of <want>.
-//
-// If <want> is a string, then it will first convert
-// <have> to a string before doing a regular expression comparison:
-//
-//		Unlike(fmt.Sprintf("%v", have), want) // Pass if !regexp.Match(want, have)
-//
-// Otherwise, Unlike is a shortcut for:
-//
-//		Compare(have, "{}~ !=", want)
-//
-// If <want> is a slice, struct, or similar, Unlike will perform a reflect.DeepEqual() comparison.
-func Unlike(have, want interface{}, description ...interface{}) bool {
-	return terstTester().Unlike(have, want, description...)
-}
-
-func (self *Tester) Unlike(have, want interface{}, description ...interface{}) bool {
-	return self.likeOrUnlike(false, have, want, description...)
-}
-
-func (self *Tester) likeOrUnlike(wantLike bool, have, want interface{}, description ...interface{}) bool {
-	test := newTest("Like", have, want, description)
-	if !wantLike {
-		test.kind = "Unlike"
-	}
-	didPass := false
-	switch want0 := want.(type) {
-	case string:
-		haveString := stringValue(have)
-		didPass, error := regexp.Match(want0, []byte(haveString))
-		if !wantLike {
-			didPass = !didPass
-		}
-		if error != nil {
-			panic("regexp.Match(" + want0 + ", ...): " + error.Error())
-		}
-		want = fmt.Sprintf("(?:%v)", want) // Make it look like a regular expression
-		return self.hadResult(didPass, test, func() {
-			self.Log(self.failMessageForMatch(test, stringValue(have), stringValue(want), wantLike))
-		})
-	}
-	didPass, operator := compare(have, "{}~ ==", want)
-	if !wantLike {
-		didPass = !didPass
-	}
-	test.operator = operator
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForLike(test, stringValue(have), stringValue(want), wantLike))
-	})
-}
-
-// Compare will compare <have> to <want> with the given operator. The operator can be one of the following:
-//
-//		  ==
-//		  !=
-//		  <
-//		  <=
-//		  >
-//		  >=
-//
-// Compare is not strict when comparing numeric types,
-// and will make a best effort to promote <have> and <want> to the
-// same type.
-//
-// Compare will promote int and uint to big.Int for testing
-// against each other.
-//
-// Compare will promote int, uint, and float to float64 for
-// float testing.
-//
-// For example:
-//	
-//		Compare(float32(1.0), "<", int8(2)) // A valid test
-//
-//		result := float32(1.0) < int8(2) // Will not compile because of the type mismatch
-//
-func Compare(have interface{}, operator string, want interface{}, description ...interface{}) bool {
-	return terstTester().Compare(have, operator, want, description...)
-}
-
-func (self *Tester) Compare(have interface{}, operator string, want interface{}, description ...interface{}) bool {
-	return self.compare(have, operator, want, description...)
-}
-
-func (self *Tester) compare(left interface{}, operatorString string, right interface{}, description ...interface{}) bool {
-	operatorString = strings.TrimSpace(operatorString)
-	test := newTest("Compare "+operatorString, left, right, description)
-	didPass, operator := compare(left, operatorString, right)
-	test.operator = operator
-	return self.hadResult(didPass, test, func() {
-		self.Log(self.failMessageForCompare(test))
-	})
-}
-
-type (
-	compareScope int
-)
-
-const (
-	compareScopeEqual compareScope = iota
-	compareScopeTilde
-	compareScopeAsterisk
-)
-
-type compareOperator struct {
-	scope      compareScope
-	comparison string
-}
-
-var newCompareOperatorRE *regexp.Regexp = regexp.MustCompile(`^\s*(?:((?:{}|#)[*~=])\s+)?(==|!=|<|<=|>|>=)\s*$`)
-
-func newCompareOperator(operatorString string) compareOperator {
-
-	if operatorString == "" {
-		return compareOperator{compareScopeEqual, ""}
-	}
-
-	result := newCompareOperatorRE.FindStringSubmatch(operatorString)
-	if result == nil {
-		panic(fmt.Errorf("Unable to parse %v into a compareOperator", operatorString))
-	}
-
-	scope := compareScopeAsterisk
-	switch result[1] {
-	case "#*", "{}*":
-		scope = compareScopeAsterisk
-	case "#~", "{}~":
-		scope = compareScopeTilde
-	case "#=", "{}=":
-		scope = compareScopeEqual
-	}
-
-	comparison := result[2]
-
-	return compareOperator{scope, comparison}
-}
-
-func compare(left interface{}, operatorString string, right interface{}) (bool, compareOperator) {
-	pass := true
-	operator := newCompareOperator(operatorString)
-	comparator := newComparator(left, operator, right)
-	// FIXME Confusing
-	switch operator.comparison {
-	case "==":
-		pass = comparator.IsEqual()
-	case "!=":
-		pass = !comparator.IsEqual()
-	default:
-		if comparator.HasOrder() {
-			switch operator.comparison {
-			case "<":
-				pass = comparator.Compare() == -1
-			case "<=":
-				pass = comparator.Compare() <= 0
-			case ">":
-				pass = comparator.Compare() == 1
-			case ">=":
-				pass = comparator.Compare() >= 0
-			default:
-				panic(fmt.Errorf("Compare operator (%v) is invalid", operator.comparison))
-			}
-		} else {
-			pass = false
-		}
-	}
-	return pass, operator
-}
-
-// Compare / Comparator
-
-type compareKind int
-
-const (
-	kindInterface compareKind = iota
-	kindInteger
-	kindUnsignedInteger
-	kindFloat
-	kindString
-	kindBoolean
-)
-
-func comparatorValue(value interface{}) (reflect.Value, compareKind) {
-	reflectValue := reflect.ValueOf(value)
-	kind := kindInterface
-	switch value.(type) {
-	case int, int8, int16, int32, int64:
-		kind = kindInteger
-	case uint, uint8, uint16, uint32, uint64:
-		kind = kindUnsignedInteger
-	case float32, float64:
-		kind = kindFloat
-	case string:
-		kind = kindString
-	case bool:
-		kind = kindBoolean
-	}
-	return reflectValue, kind
-}
-
-func toFloat(value reflect.Value) float64 {
-	switch result := value.Interface().(type) {
-	case int, int8, int16, int32, int64:
-		return float64(value.Int())
-	case uint, uint8, uint16, uint32, uint64:
-		return float64(value.Uint())
-	case float32, float64:
-		return float64(value.Float())
-	default:
-		panic(fmt.Errorf("toFloat( %v )", result))
-	}
-	panic(0)
-}
-
-func toInteger(value reflect.Value) *big.Int {
-	switch result := value.Interface().(type) {
-	case int, int8, int16, int32, int64:
-		return big.NewInt(value.Int())
-	case uint, uint8, uint16, uint32, uint64:
-		yield := big.NewInt(0)
-		yield.SetString(fmt.Sprintf("%v", value.Uint()), 10)
-		return yield
-	default:
-		panic(fmt.Errorf("toInteger( %v )", result))
-	}
-	panic(0)
-}
-
-func toString(value reflect.Value) string {
-	switch result := value.Interface().(type) {
-	case string:
-		return result
-	default:
-		panic(fmt.Errorf("toString( %v )", result))
-	}
-	panic(0)
-}
-
-func toBoolean(value reflect.Value) bool {
-	switch result := value.Interface().(type) {
-	case bool:
-		return result
-	default:
-		panic(fmt.Errorf("toBoolean( %v )", result))
-	}
-	panic(0)
-}
-
-type aComparator interface {
-	Compare() int
-	HasOrder() bool
-	IsEqual() bool
-	CompareScope() compareScope
-}
-
-type baseComparator struct {
-	hasOrder bool
-	operator compareOperator
-}
-
-func (self *baseComparator) Compare() int {
-	panic(fmt.Errorf("Invalid .Compare()"))
-}
-func (self *baseComparator) HasOrder() bool {
-	return self.hasOrder
-}
-func (self *baseComparator) CompareScope() compareScope {
-	return self.operator.scope
-}
-func comparatorWithOrder(operator compareOperator) *baseComparator {
-	return &baseComparator{true, operator}
-}
-func comparatorWithoutOrder(operator compareOperator) *baseComparator {
-	return &baseComparator{false, operator}
-}
-
-type interfaceComparator struct {
-	*baseComparator
-	left  interface{}
-	right interface{}
-}
-
-func (self *interfaceComparator) IsEqual() bool {
-	if self.CompareScope() != compareScopeEqual {
-		return reflect.DeepEqual(self.left, self.right)
-	}
-	return self.left == self.right
-}
-
-type floatComparator struct {
-	*baseComparator
-	left  float64
-	right float64
-}
-
-func (self *floatComparator) Compare() int {
-	if self.left == self.right {
-		return 0
-	} else if self.left < self.right {
-		return -1
-	}
-	return 1
-}
-func (self *floatComparator) IsEqual() bool {
-	return self.left == self.right
-}
-
-type integerComparator struct {
-	*baseComparator
-	left  *big.Int
-	right *big.Int
-}
-
-func (self *integerComparator) Compare() int {
-	return self.left.Cmp(self.right)
-}
-func (self *integerComparator) IsEqual() bool {
-	return 0 == self.left.Cmp(self.right)
-}
-
-type stringComparator struct {
-	*baseComparator
-	left  string
-	right string
-}
-
-func (self *stringComparator) Compare() int {
-	if self.left == self.right {
-		return 0
-	} else if self.left < self.right {
-		return -1
-	}
-	return 1
-}
-func (self *stringComparator) IsEqual() bool {
-	return self.left == self.right
-}
-
-type booleanComparator struct {
-	*baseComparator
-	left  bool
-	right bool
-}
-
-func (self *booleanComparator) IsEqual() bool {
-	return self.left == self.right
-}
-
-func newComparator(left interface{}, operator compareOperator, right interface{}) aComparator {
-	leftValue, _ := comparatorValue(left)
-	rightValue, rightKind := comparatorValue(right)
-
-	// The simplest comparator is comparing interface{} =? interface{}
-	targetKind := kindInterface
-	// Are left and right of the same kind?
-	// (reflect.Value.Kind() is different from compareKind)
-	scopeEqual := leftValue.Kind() == rightValue.Kind()
-	scopeTilde := false
-	scopeAsterisk := false
-	if scopeEqual {
-		targetKind = rightKind // Since left and right are the same, the targetKind is Integer/Float/String/Boolean
-	} else {
-		// Examine the prefix of reflect.Value.Kind().String() to see if there is a similarity of 
-		// the left value to right value
-		lk := leftValue.Kind().String()
-		hasPrefix := func(prefix string) bool {
-			return strings.HasPrefix(lk, prefix)
-		}
-
-		switch right.(type) {
-		case float32, float64:
-			// Right is float*
-			if hasPrefix("float") {
-				// Left is also float*
-				targetKind = kindFloat
-				scopeTilde = true
-			} else if hasPrefix("int") || hasPrefix("uint") {
-				// Left is a kind of numeric (int* or uint*)
-				targetKind = kindFloat
-				scopeAsterisk = true
-			} else {
-				// Otherwise left is a non-numeric
-			}
-		case uint, uint8, uint16, uint32, uint64:
-			// Right is uint*
-			if hasPrefix("uint") {
-				// Left is also uint*
-				targetKind = kindInteger
-				scopeTilde = true
-			} else if hasPrefix("int") {
-				// Left is an int* (a numeric)
-				targetKind = kindInteger
-				scopeAsterisk = true
-			} else if hasPrefix("float") {
-				// Left is an float* (a numeric)
-				targetKind = kindFloat
-				scopeAsterisk = true
-			} else {
-				// Otherwise left is a non-numeric
-			}
-		case int, int8, int16, int32, int64:
-			// Right is int*
-			if hasPrefix("int") {
-				// Left is also int*
-				targetKind = kindInteger
-				scopeTilde = true
-			} else if hasPrefix("uint") {
-				// Left is a uint* (a numeric)
-				targetKind = kindInteger
-				scopeAsterisk = true
-			} else if hasPrefix("float") {
-				// Left is an float* (a numeric)
-				targetKind = kindFloat
-				scopeAsterisk = true
-			} else {
-				// Otherwise left is a non-numeric
-			}
-		default:
-			// Right is a non-numeric
-			// Can only really compare string to string or boolean to boolean, so
-			// we will either have a string/boolean/interfaceComparator
-		}
-	}
-
-	/*fmt.Println("%v %v %v %v %s %s", operator.scope, same, sibling, family, leftValue, rightValue)*/
-	{
-		mismatch := false
-		switch operator.scope {
-		case compareScopeEqual:
-			mismatch = !scopeEqual
-		case compareScopeTilde:
-			mismatch = !scopeEqual && !scopeTilde
-		case compareScopeAsterisk:
-			mismatch = !scopeEqual && !scopeTilde && !scopeAsterisk
-		}
-		if mismatch {
-			targetKind = kindInterface
-		}
-	}
-
-	switch targetKind {
-	case kindFloat:
-		return &floatComparator{
-			comparatorWithOrder(operator),
-			toFloat(leftValue),
-			toFloat(rightValue),
-		}
-	case kindInteger:
-		return &integerComparator{
-			comparatorWithOrder(operator),
-			toInteger(leftValue),
-			toInteger(rightValue),
-		}
-	case kindString:
-		return &stringComparator{
-			comparatorWithOrder(operator),
-			toString(leftValue),
-			toString(rightValue),
-		}
-	case kindBoolean:
-		return &booleanComparator{
-			comparatorWithoutOrder(operator),
-			toBoolean(leftValue),
-			toBoolean(rightValue),
-		}
-	}
-
-	// As a last resort, we can always compare left (interface{}) to right (interface{})
-	return &interfaceComparator{
-		comparatorWithoutOrder(operator),
-		left,
-		right,
-	}
-}
-
-// failMessage*
-
-func (self *Tester) failMessageForIsTrue(test *test) string {
-	test.findFileLineFunction(self)
-	return formatMessage(`
-        %s:%d: %s 
-           Failed test (%s)
-                  got: %s
-             expected: %s
-    `, test.file, test.line, test.Description(), test.kind, stringValue(test.have), stringValue(test.want))
-}
-
-func (self *Tester) failMessageForFail(test *test) string {
-	test.findFileLineFunction(self)
-	return formatMessage(`
-        %s:%d: %s 
-           Failed test (%s)
-    `, test.file, test.line, test.Description(), test.kind)
-}
-
-func typeKindString(value interface{}) string {
-	reflectValue := reflect.ValueOf(value)
-	kind := reflectValue.Kind().String()
-	result := fmt.Sprintf("%T", value)
-	if kind == result {
-		if kind == "string" {
-			return ""
-		}
-		return fmt.Sprintf(" (%T)", value)
-	}
-	return fmt.Sprintf(" (%T=%s)", value, kind)
-}
-
-func (self *Tester) failMessageForCompare(test *test) string {
-	test.findFileLineFunction(self)
-	return formatMessage(`
-        %s:%d: %s 
-           Failed test (%s)
-                  %v%s
-                       %s
-                  %v%s
-    `, test.file, test.line, test.Description(), test.kind, test.have, typeKindString(test.have), test.operator.comparison, test.want, typeKindString(test.want))
-}
-
-func (self *Tester) failMessageForEqual(test *test) string {
-	return self.failMessageForIs(test)
-}
-
-func (self *Tester) failMessageForIs(test *test) string {
-	test.findFileLineFunction(self)
-	return formatMessage(`
-        %s:%d: %v
-           Failed test (%s)
-                  got: %v%s
-             expected: %v%s
-    `, test.file, test.line, test.Description(), test.kind, test.have, typeKindString(test.have), test.want, typeKindString(test.want))
-}
-
-func (self *Tester) failMessageForMatch(test *test, have, want string, wantMatch bool) string {
-	test.findFileLineFunction(self)
-	expect := "  like"
-	if !wantMatch {
-		expect = "unlike"
-	}
-	return formatMessage(`
-        %s:%d: %s 
-           Failed test (%s)
-                  got: %v%s
-               %s: %s
-    `, test.file, test.line, test.Description(), test.kind, have, typeKindString(have), expect, want)
-}
-
-func (self *Tester) failMessageForLike(test *test, have, want string, wantLike bool) string {
-	test.findFileLineFunction(self)
-	if !wantLike {
-		want = "Anything else"
-	}
-	return formatMessage(`
-        %s:%d: %s 
-           Failed test (%s)
-                  got: %v%s
-             expected: %v%s
-    `, test.file, test.line, test.Description(), test.kind, have, typeKindString(have), want, typeKindString(want))
-}
-
-// ...
-
-type Tester struct {
-	TestingT *testing.T
-
-	sanityChecking bool
-	selfTesting    bool
-	failIsPassing  bool
-
-	testEntry  uintptr
-	focusEntry uintptr
-}
-
-var _terstTester *Tester = nil
-
-func findTestEntry() uintptr {
-	height := 2
-	for {
-		functionPC, _, _, ok := runtime.Caller(height)
-		function := runtime.FuncForPC(functionPC)
-		functionName := function.Name()
-		if !ok {
-			return 0
-		}
-		if index := strings.LastIndex(functionName, ".Test"); index >= 0 {
-			// Assume we have an instance of TestXyzzy in a _test file
-			return function.Entry()
-		}
-		height += 1
-	}
-	return 0
-}
-
-// Focus will focus the entry point of the test to the current method.
-//
-// This is important for test failures in getting feedback on which line was at fault.
-//
-// Consider the following scenario:
-//
-//		func testingMethod( ... ) {
-//			Is( ..., ... )
-//		}
-//
-//		func TestExample(t *testing.T) {
-//			Terst(t)
-//
-//			testingMethod( ... )
-//			testingMethod( ... ) // If something in testingMethod fails, this line number will come up
-//			testingMethod( ... )
-//		}
-//	
-// By default, when a test fails, terst will report the outermost line that led to the failure.
-// Usually this is what you want, but if you need to drill down, you can by inserting a special
-// call at the top of your testing method:
-//
-//		func testingMethod( ... ) {
-//			Terst().Focus() // Grab the global Tester and tell it to focus on this method
-//			Is( ..., ... ) // Now if this test fails, this line number will come up
-//		}
-//
-func (self *Tester) Focus() {
-	pc, _, _, ok := runtime.Caller(1)
-	if ok {
-		function := runtime.FuncForPC(pc)
-		self.focusEntry = function.Entry()
-	}
-}
-
-//		Terst(*testing.T)
-//
-// Create a new terst Tester and return it.  Associate calls to Is, Compare, Like, etc. with the newly created terst.
-//
-//		Terst()
-//
-// Return the current Tester (if any).
-//
-//		Terst(nil)
-//
-// Clear out the current Tester (if any).
-func Terst(terst ...interface{}) *Tester {
-	if len(terst) == 0 {
-		return terstTester()
-	} else {
-		if terst[0] == nil {
-			_terstTester = nil
-			return nil
-		}
-		_terstTester = newTester(terst[0].(*testing.T))
-		_terstTester.enableSanityChecking()
-		_terstTester.testEntry = findTestEntry()
-		_terstTester.focusEntry = _terstTester.testEntry
-	}
-	return _terstTester
-}
-
-func terstTester() *Tester {
-	if _terstTester == nil {
-		panic("_terstTester == nil")
-	}
-	return _terstTester.checkSanity()
-}
-
-func newTester(t *testing.T) *Tester {
-	return &Tester{
-		TestingT: t,
-	}
-}
-
-func formatMessage(message string, argumentList ...interface{}) string {
-	message = fmt.Sprintf(message, argumentList...)
-	message = strings.TrimLeft(message, "\n")
-	message = strings.TrimRight(message, " \n")
-	return message + "\n\n"
-}
-
-// Log is a utility method that will append the given output to the normal output stream.
-func (self *Tester) Log(output string) {
-	outputValue := reflect.ValueOf(self.TestingT).Elem().FieldByName("output")
-	output_ := outputValue.Bytes()
-	output_ = append(output_, output...)
-	*(*[]byte)(unsafe.Pointer(outputValue.UnsafeAddr())) = output_
-}
-
-func (self *Tester) _fail() {
-	self.TestingT.Fail()
-}
-
-func (self *Tester) enableSanityChecking() *Tester {
-	self.sanityChecking = true
-	return self
-}
-
-func (self *Tester) disableSanityChecking() *Tester {
-	self.sanityChecking = false
-	return self
-}
-
-func (self *Tester) enableSelfTesting() *Tester {
-	self.selfTesting = true
-	return self
-}
-
-func (self *Tester) disableSelfTesting() *Tester {
-	self.selfTesting = false
-	return self
-}
-
-func (self *Tester) failIsPass() *Tester {
-	self.failIsPassing = true
-	return self
-}
-
-func (self *Tester) passIsPass() *Tester {
-	self.failIsPassing = false
-	return self
-}
-
-func (self *Tester) checkSanity() *Tester {
-	if self.sanityChecking && self.testEntry != 0 {
-		foundEntryPoint := findTestEntry()
-		if self.testEntry != foundEntryPoint {
-			panic(fmt.Errorf("TestEntry(%v) does not match foundEntry(%v): Did you call Terst when entering a new Test* function?", self.testEntry, foundEntryPoint))
-		}
-	}
-	return self
-}
-
-func (self *Tester) findDepth() int {
-	height := 1 // Skip us
-	for {
-		pc, _, _, ok := runtime.Caller(height)
-		function := runtime.FuncForPC(pc)
-		if !ok {
-			// Got too close to the sun
-			if false {
-				for ; height > 0; height-- {
-					pc, _, _, ok := runtime.Caller(height)
-					fmt.Printf("[%d %v %v]", height, pc, ok)
-					if ok {
-						function := runtime.FuncForPC(pc)
-						fmt.Printf(" => [%s]", function.Name())
-					}
-					fmt.Printf("\n")
-				}
-			}
-			return 1
-		}
-		functionEntry := function.Entry()
-		if functionEntry == self.focusEntry || functionEntry == self.testEntry {
-			return height - 1 // Not the surrounding test function, but within it
-		}
-		height += 1
-	}
-	return 1
-}
-
-// test
-
-type test struct {
-	kind        string
-	have        interface{}
-	want        interface{}
-	description []interface{}
-	operator    compareOperator
-
-	file       string
-	line       int
-	functionPC uintptr
-	function   string
-}
-
-func newTest(kind string, have, want interface{}, description []interface{}) *test {
-	operator := newCompareOperator("")
-	return &test{
-		kind:        kind,
-		have:        have,
-		want:        want,
-		description: description,
-		operator:    operator,
-	}
-}
-
-func (self *test) findFileLineFunction(tester *Tester) {
-	self.file, self.line, self.functionPC, self.function, _ = atFileLineFunction(tester.findDepth())
-}
-
-func (self *test) Description() string {
-	description := ""
-	if len(self.description) > 0 {
-		description = fmt.Sprintf("%v", self.description[0])
-	}
-	return description
-}
-
-func findPathForFile(file string) string {
-	terstBase := os.ExpandEnv("$TERST_BASE")
-	if len(terstBase) > 0 && strings.HasPrefix(file, terstBase) {
-		file = file[len(terstBase):]
-		if file[0] == '/' || file[0] == '\\' {
-			file = file[1:]
-		}
-		return file
-	}
-
-	if index := strings.LastIndex(file, "/"); index >= 0 {
-		file = file[index+1:]
-	} else if index = strings.LastIndex(file, "\\"); index >= 0 {
-		file = file[index+1:]
-	}
-
-	return file
-}
-
-func atFileLineFunction(callDepth int) (string, int, uintptr, string, bool) {
-	pc, file, line, ok := runtime.Caller(callDepth + 1)
-	function := runtime.FuncForPC(pc).Name()
-	if ok {
-		file = findPathForFile(file)
-		if index := strings.LastIndex(function, ".Test"); index >= 0 {
-			function = function[index+1:]
-		}
-	} else {
-		pc = 0
-		file = "?"
-		line = 1
-	}
-	return file, line, pc, function, ok
-}
-
-// Conversion
-
-func integerValue(value interface{}) int64 {
-	return reflect.ValueOf(value).Int()
-}
-
-func unsignedIntegerValue(value interface{}) uint64 {
-	return reflect.ValueOf(value).Uint()
-}
-
-func floatValue(value interface{}) float64 {
-	return reflect.ValueOf(value).Float()
-}
-
-func stringValue(value interface{}) string {
-	return fmt.Sprintf("%v", value)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_arguments.go b/vendor/github.com/robertkrimen/otto/type_arguments.go
deleted file mode 100644
index ad3f3206c..000000000
--- a/vendor/github.com/robertkrimen/otto/type_arguments.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package otto
-
-import (
-	"strconv"
-)
-
-func (runtime *_runtime) newArgumentsObject(indexOfParameterName []string, environment _environment, length int) *_object {
-	self := runtime.newClassObject("Arguments")
-
-	self.objectClass = _classArguments
-	self.value = _argumentsObject{
-		indexOfParameterName: indexOfParameterName,
-		environment:          environment,
-	}
-
-	self.prototype = runtime.Global.ObjectPrototype
-
-	self.defineProperty("length", toValue_int(length), 0101, false)
-
-	return self
-}
-
-type _argumentsObject struct {
-	indexOfParameterName []string
-	// function(abc, def, ghi)
-	// indexOfParameterName[0] = "abc"
-	// indexOfParameterName[1] = "def"
-	// indexOfParameterName[2] = "ghi"
-	// ...
-	environment _environment
-}
-
-func (self0 _argumentsObject) clone(clone *_clone) _argumentsObject {
-	indexOfParameterName := make([]string, len(self0.indexOfParameterName))
-	copy(indexOfParameterName, self0.indexOfParameterName)
-	return _argumentsObject{
-		indexOfParameterName,
-		clone.environment(self0.environment),
-	}
-}
-
-func (self _argumentsObject) get(name string) (Value, bool) {
-	index := stringToArrayIndex(name)
-	if index >= 0 && index < int64(len(self.indexOfParameterName)) {
-		name := self.indexOfParameterName[index]
-		if name == "" {
-			return Value{}, false
-		}
-		return self.environment.GetBindingValue(name, false), true
-	}
-	return Value{}, false
-}
-
-func (self _argumentsObject) put(name string, value Value) {
-	index := stringToArrayIndex(name)
-	name = self.indexOfParameterName[index]
-	self.environment.SetMutableBinding(name, value, false)
-}
-
-func (self _argumentsObject) delete(name string) {
-	index := stringToArrayIndex(name)
-	self.indexOfParameterName[index] = ""
-}
-
-func argumentsGet(self *_object, name string) Value {
-	if value, exists := self.value.(_argumentsObject).get(name); exists {
-		return value
-	}
-	return objectGet(self, name)
-}
-
-func argumentsGetOwnProperty(self *_object, name string) *_property {
-	if value, exists := self.value.(_argumentsObject).get(name); exists {
-		return &_property{value, 0111}
-	}
-	return objectGetOwnProperty(self, name)
-}
-
-func argumentsDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	if _, exists := self.value.(_argumentsObject).get(name); exists {
-		if !objectDefineOwnProperty(self, name, descriptor, false) {
-			return typeErrorResult(throw)
-		}
-		if value, valid := descriptor.value.(Value); valid {
-			self.value.(_argumentsObject).put(name, value)
-		}
-		return true
-	}
-	return objectDefineOwnProperty(self, name, descriptor, throw)
-}
-
-func argumentsDelete(self *_object, name string, throw bool) bool {
-	if _, exists := self.value.(_argumentsObject).get(name); exists {
-		self.value.(_argumentsObject).delete(name)
-		return true
-	}
-	return objectDelete(self, name, throw)
-}
-
-func argumentsEnumerate(self *_object, all bool, each func(string) bool) {
-	{
-		object := self.value.(_argumentsObject)
-		for index, value := range object.indexOfParameterName {
-			if value != "" {
-				if !each(strconv.FormatInt(int64(index), 10)) {
-					return
-				}
-			}
-		}
-		objectEnumerate(self, all, each)
-	}
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_array.go b/vendor/github.com/robertkrimen/otto/type_array.go
deleted file mode 100644
index 63b3c98c1..000000000
--- a/vendor/github.com/robertkrimen/otto/type_array.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package otto
-
-import (
-	"strconv"
-)
-
-func (runtime *_runtime) newArrayObject(length uint32) *_object {
-	self := runtime.newObject()
-	self.class = "Array"
-	self.defineProperty("length", toValue_uint32(length), 0100, false)
-	self.objectClass = _classArray
-	return self
-}
-
-func isArray(object *_object) bool {
-	return object != nil && (object.class == "Array" || object.class == "GoArray")
-}
-
-func arrayDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	lengthProperty := self.getOwnProperty("length")
-	lengthValue, valid := lengthProperty.value.(Value)
-	if !valid {
-		panic("Array.length != Value{}")
-	}
-	length := lengthValue.value.(uint32)
-	if name == "length" {
-		if descriptor.value == nil {
-			return objectDefineOwnProperty(self, name, descriptor, throw)
-		}
-		newLength := uint32(0)
-		{
-			tmp := toInteger(descriptor.value.(Value))
-			if !tmp.valid() || !isUint32(tmp.value) {
-				panic(newRangeError())
-			}
-			newLength = uint32(tmp.value)
-		}
-		descriptor.value = toValue_uint32(newLength)
-		if newLength > length {
-			return objectDefineOwnProperty(self, name, descriptor, throw)
-		}
-		if !lengthProperty.writable() {
-			goto Reject
-		}
-		newWritable := true
-		if descriptor.mode&0700 == 0 {
-			// If writable is off
-			newWritable = false
-			descriptor.mode |= 0100
-		}
-		if !objectDefineOwnProperty(self, name, descriptor, throw) {
-			return false
-		}
-		for newLength < length {
-			length -= 1
-			if !self.delete(strconv.FormatInt(int64(length), 10), false) {
-				descriptor.value = toValue_uint32(length + 1)
-				if !newWritable {
-					descriptor.mode &= 0077
-				}
-				objectDefineOwnProperty(self, name, descriptor, false)
-				goto Reject
-			}
-		}
-		if !newWritable {
-			descriptor.mode &= 0077
-			objectDefineOwnProperty(self, name, descriptor, false)
-		}
-	} else if index := stringToArrayIndex(name); index >= 0 {
-		if index >= int64(length) && !lengthProperty.writable() {
-			goto Reject
-		}
-		if !objectDefineOwnProperty(self, strconv.FormatInt(index, 10), descriptor, false) {
-			goto Reject
-		}
-		if index >= int64(length) {
-			lengthProperty.value = toValue_uint32(uint32(index + 1))
-			objectDefineOwnProperty(self, "length", *lengthProperty, false)
-			return true
-		}
-	}
-	return objectDefineOwnProperty(self, name, descriptor, throw)
-Reject:
-	if throw {
-		panic(newTypeError())
-	}
-	return false
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_boolean.go b/vendor/github.com/robertkrimen/otto/type_boolean.go
deleted file mode 100644
index c24409de1..000000000
--- a/vendor/github.com/robertkrimen/otto/type_boolean.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package otto
-
-import (
-	"strconv"
-)
-
-func (runtime *_runtime) newBooleanObject(value Value) *_object {
-	return runtime.newPrimitiveObject("Boolean", toValue_bool(toBoolean(value)))
-}
-
-func booleanToString(value bool) string {
-	return strconv.FormatBool(value)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_date.go b/vendor/github.com/robertkrimen/otto/type_date.go
deleted file mode 100644
index 337bb9d42..000000000
--- a/vendor/github.com/robertkrimen/otto/type_date.go
+++ /dev/null
@@ -1,297 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	Time "time"
-)
-
-type _dateObject struct {
-	time  Time.Time // Time from the "time" package, a cached version of time
-	epoch int64
-	value Value
-	isNaN bool
-}
-
-var (
-	invalidDateObject = _dateObject{
-		time:  Time.Time{},
-		epoch: -1,
-		value: NaNValue(),
-		isNaN: true,
-	}
-)
-
-type _ecmaTime struct {
-	year        int
-	month       int
-	day         int
-	hour        int
-	minute      int
-	second      int
-	millisecond int
-	location    *Time.Location // Basically, either local or UTC
-}
-
-func ecmaTime(goTime Time.Time) _ecmaTime {
-	return _ecmaTime{
-		goTime.Year(),
-		dateFromGoMonth(goTime.Month()),
-		goTime.Day(),
-		goTime.Hour(),
-		goTime.Minute(),
-		goTime.Second(),
-		goTime.Nanosecond() / (100 * 100 * 100),
-		goTime.Location(),
-	}
-}
-
-func (self *_ecmaTime) goTime() Time.Time {
-	return Time.Date(
-		self.year,
-		dateToGoMonth(self.month),
-		self.day,
-		self.hour,
-		self.minute,
-		self.second,
-		self.millisecond*(100*100*100),
-		self.location,
-	)
-}
-
-func (self *_dateObject) Time() Time.Time {
-	return self.time
-}
-
-func (self *_dateObject) Epoch() int64 {
-	return self.epoch
-}
-
-func (self *_dateObject) Value() Value {
-	return self.value
-}
-
-// FIXME A date should only be in the range of -100,000,000 to +100,000,000 (1970): 15.9.1.1
-func (self *_dateObject) SetNaN() {
-	self.time = Time.Time{}
-	self.epoch = -1
-	self.value = NaNValue()
-	self.isNaN = true
-}
-
-func (self *_dateObject) SetTime(time Time.Time) {
-	self.Set(timeToEpoch(time))
-}
-
-func epoch2dateObject(epoch float64) _dateObject {
-	date := _dateObject{}
-	date.Set(epoch)
-	return date
-}
-
-func (self *_dateObject) Set(epoch float64) {
-	// epoch
-	self.epoch = epochToInteger(epoch)
-
-	// time
-	time, err := epochToTime(epoch)
-	self.time = time // Is either a valid time, or the zero-value for time.Time
-
-	// value & isNaN
-	if err != nil {
-		self.isNaN = true
-		self.epoch = -1
-		self.value = NaNValue()
-	} else {
-		self.value = toValue_int64(self.epoch)
-	}
-}
-
-func epochToInteger(value float64) int64 {
-	if value > 0 {
-		return int64(math.Floor(value))
-	}
-	return int64(math.Ceil(value))
-}
-
-func epochToTime(value float64) (time Time.Time, err error) {
-	epochWithMilli := value
-	if math.IsNaN(epochWithMilli) || math.IsInf(epochWithMilli, 0) {
-		err = fmt.Errorf("Invalid time %v", value)
-		return
-	}
-
-	epoch := int64(epochWithMilli / 1000)
-	milli := int64(epochWithMilli) % 1000
-
-	time = Time.Unix(int64(epoch), milli*1000000).UTC()
-	return
-}
-
-func timeToEpoch(time Time.Time) float64 {
-	return float64(time.Unix()*1000 + int64(time.Nanosecond()/1000000))
-}
-
-func (runtime *_runtime) newDateObject(epoch float64) *_object {
-	self := runtime.newObject()
-	self.class = "Date"
-
-	// FIXME This is ugly...
-	date := _dateObject{}
-	date.Set(epoch)
-	self.value = date
-	return self
-}
-
-func (self *_object) dateValue() _dateObject {
-	value, _ := self.value.(_dateObject)
-	return value
-}
-
-func dateObjectOf(_dateObject *_object) _dateObject {
-	if _dateObject == nil || _dateObject.class != "Date" {
-		panic(newTypeError())
-	}
-	return _dateObject.dateValue()
-}
-
-// JavaScript is 0-based, Go is 1-based (15.9.1.4)
-func dateToGoMonth(month int) Time.Month {
-	return Time.Month(month + 1)
-}
-
-func dateFromGoMonth(month Time.Month) int {
-	return int(month) - 1
-}
-
-// Both JavaScript & Go are 0-based (Sunday == 0)
-func dateToGoDay(day int) Time.Weekday {
-	return Time.Weekday(day)
-}
-
-func dateFromGoDay(day Time.Weekday) int {
-	return int(day)
-}
-
-func newDateTime(argumentList []Value, location *Time.Location) (epoch float64) {
-
-	pick := func(index int, default_ float64) (float64, bool) {
-		if index >= len(argumentList) {
-			return default_, false
-		}
-		value := toFloat(argumentList[index])
-		if math.IsNaN(value) || math.IsInf(value, 0) {
-			return 0, true
-		}
-		return value, false
-	}
-
-	if len(argumentList) >= 2 { // 2-argument, 3-argument, ...
-		var year, month, day, hour, minute, second, millisecond float64
-		var invalid bool
-		if year, invalid = pick(0, 1900.0); invalid {
-			goto INVALID
-		}
-		if month, invalid = pick(1, 0.0); invalid {
-			goto INVALID
-		}
-		if day, invalid = pick(2, 1.0); invalid {
-			goto INVALID
-		}
-		if hour, invalid = pick(3, 0.0); invalid {
-			goto INVALID
-		}
-		if minute, invalid = pick(4, 0.0); invalid {
-			goto INVALID
-		}
-		if second, invalid = pick(5, 0.0); invalid {
-			goto INVALID
-		}
-		if millisecond, invalid = pick(6, 0.0); invalid {
-			goto INVALID
-		}
-
-		if year >= 0 && year <= 99 {
-			year += 1900
-		}
-
-		time := Time.Date(int(year), dateToGoMonth(int(month)), int(day), int(hour), int(minute), int(second), int(millisecond)*1000*1000, location)
-		return timeToEpoch(time)
-
-	} else if len(argumentList) == 0 { // 0-argument
-		time := Time.Now().UTC()
-		return timeToEpoch(time)
-	} else { // 1-argument
-		value := valueOfArrayIndex(argumentList, 0)
-		value = toPrimitive(value)
-		if value.IsString() {
-			return dateParse(toString(value))
-		}
-
-		return toFloat(value)
-	}
-
-INVALID:
-	epoch = math.NaN()
-	return
-}
-
-var (
-	dateLayoutList = []string{
-		"2006",
-		"2006-01",
-		"2006-01-02",
-
-		"2006T15:04",
-		"2006-01T15:04",
-		"2006-01-02T15:04",
-
-		"2006T15:04:05",
-		"2006-01T15:04:05",
-		"2006-01-02T15:04:05",
-
-		"2006T15:04:05.000",
-		"2006-01T15:04:05.000",
-		"2006-01-02T15:04:05.000",
-
-		"2006T15:04-0700",
-		"2006-01T15:04-0700",
-		"2006-01-02T15:04-0700",
-
-		"2006T15:04:05-0700",
-		"2006-01T15:04:05-0700",
-		"2006-01-02T15:04:05-0700",
-
-		"2006T15:04:05.000-0700",
-		"2006-01T15:04:05.000-0700",
-		"2006-01-02T15:04:05.000-0700",
-	}
-	matchDateTimeZone = regexp.MustCompile(`^(.*)(?:(Z)|([\+\-]\d{2}):(\d{2}))$`)
-)
-
-func dateParse(date string) (epoch float64) {
-	// YYYY-MM-DDTHH:mm:ss.sssZ
-	var time Time.Time
-	var err error
-	{
-		date := date
-		if match := matchDateTimeZone.FindStringSubmatch(date); match != nil {
-			if match[2] == "Z" {
-				date = match[1] + "+0000"
-			} else {
-				date = match[1] + match[3] + match[4]
-			}
-		}
-		for _, layout := range dateLayoutList {
-			time, err = Time.Parse(layout, date)
-			if err == nil {
-				break
-			}
-		}
-	}
-	if err != nil {
-		return math.NaN()
-	}
-	return float64(time.UnixNano()) / (1000 * 1000) // UnixMilli()
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_error.go b/vendor/github.com/robertkrimen/otto/type_error.go
deleted file mode 100644
index 683fcf929..000000000
--- a/vendor/github.com/robertkrimen/otto/type_error.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package otto
-
-func (runtime *_runtime) newErrorObject(message Value) *_object {
-	self := runtime.newClassObject("Error")
-	if message.IsDefined() {
-		self.defineProperty("message", toValue_string(toString(message)), 0111, false)
-	}
-	return self
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_function.go b/vendor/github.com/robertkrimen/otto/type_function.go
deleted file mode 100644
index 476b78f12..000000000
--- a/vendor/github.com/robertkrimen/otto/type_function.go
+++ /dev/null
@@ -1,277 +0,0 @@
-package otto
-
-type _functionObject struct {
-	call      _callFunction
-	construct _constructFunction
-}
-
-func (self0 _functionObject) clone(clone *_clone) _functionObject {
-	return _functionObject{
-		clone.callFunction(self0.call),
-		self0.construct,
-	}
-}
-
-func (runtime *_runtime) newNativeFunctionObject(native _nativeFunction, length int) *_object {
-	self := runtime.newClassObject("Function")
-	self.value = _functionObject{
-		call:      newNativeCallFunction(native),
-		construct: defaultConstructFunction,
-	}
-	self.defineProperty("length", toValue_int(length), 0000, false)
-	return self
-}
-
-func (runtime *_runtime) newNodeFunctionObject(node *_functionNode, scopeEnvironment _environment) *_object {
-	self := runtime.newClassObject("Function")
-	self.value = _functionObject{
-		call:      newNodeCallFunction(node, scopeEnvironment),
-		construct: defaultConstructFunction,
-	}
-	self.defineProperty("length", toValue_int(len(node.ParameterList)), 0000, false)
-	return self
-}
-
-func (runtime *_runtime) newBoundFunctionObject(target *_object, this Value, argumentList []Value) *_object {
-	self := runtime.newClassObject("Function")
-	self.value = _functionObject{
-		call:      newBoundCallFunction(target, this, argumentList),
-		construct: defaultConstructFunction,
-	}
-	// FIXME
-	self.defineProperty("length", toValue_int(0), 0000, false)
-	return self
-}
-
-func (self *_object) functionValue() _functionObject {
-	value, _ := self.value.(_functionObject)
-	return value
-}
-
-func (self *_object) Call(this Value, argumentList ...interface{}) Value {
-	if self.functionValue().call == nil {
-		panic(newTypeError("%v is not a function", toValue_object(self)))
-	}
-	return self.runtime.Call(self, this, self.runtime.toValueArray(argumentList...), false)
-	// ... -> runtime -> self.Function.Call.Dispatch -> ...
-}
-
-func (self *_object) Construct(this Value, argumentList ...interface{}) Value {
-	function := self.functionValue()
-	if function.call == nil {
-		panic(newTypeError("%v is not a function", toValue_object(self)))
-	}
-	if function.construct == nil {
-		panic(newTypeError("%v is not a constructor", toValue_object(self)))
-	}
-	return function.construct(self, this, self.runtime.toValueArray(argumentList...))
-}
-
-func defaultConstructFunction(self *_object, this Value, argumentList []Value) Value {
-	newObject := self.runtime.newObject()
-	newObject.class = "Object"
-	prototypeValue := self.get("prototype")
-	if !prototypeValue.IsObject() {
-		prototypeValue = toValue_object(self.runtime.Global.ObjectPrototype)
-	}
-	newObject.prototype = prototypeValue._object()
-	newObjectValue := toValue_object(newObject)
-	result := self.Call(newObjectValue, argumentList)
-	if result.IsObject() {
-		return result
-	}
-	return newObjectValue
-}
-
-func (self *_object) CallGet(name string) Value {
-	return self.runtime.Call(self, toValue_object(self), []Value{toValue_string(name)}, false)
-}
-
-func (self *_object) CallSet(name string, value Value) {
-	self.runtime.Call(self, toValue_object(self), []Value{toValue_string(name), value}, false)
-}
-
-// 15.3.5.3
-func (self *_object) HasInstance(of Value) bool {
-	if self.functionValue().call == nil {
-		// We should not have a HasInstance method
-		panic(newTypeError())
-	}
-	if !of.IsObject() {
-		return false
-	}
-	prototype := self.get("prototype")
-	if !prototype.IsObject() {
-		panic(newTypeError())
-	}
-	prototypeObject := prototype._object()
-
-	value := of._object().prototype
-	for value != nil {
-		if value == prototypeObject {
-			return true
-		}
-		value = value.prototype
-	}
-	return false
-}
-
-type _nativeFunction func(FunctionCall) Value
-
-// _constructFunction
-type _constructFunction func(*_object, Value, []Value) Value
-
-// _callFunction
-type _callFunction interface {
-	Dispatch(*_object, *_functionEnvironment, *_runtime, Value, []Value, bool) Value
-	Source() string
-	ScopeEnvironment() _environment
-	clone(clone *_clone) _callFunction
-}
-
-// _nativeCallFunction
-type _nativeCallFunction _nativeFunction
-
-func newNativeCallFunction(native _nativeFunction) _nativeCallFunction {
-	return _nativeCallFunction(native)
-}
-
-func (self _nativeCallFunction) Dispatch(_ *_object, _ *_functionEnvironment, runtime *_runtime, this Value, argumentList []Value, evalHint bool) Value {
-	return self(FunctionCall{
-		runtime:  runtime,
-		evalHint: evalHint,
-
-		This:         this,
-		ArgumentList: argumentList,
-		Otto:         runtime.Otto,
-	})
-}
-
-func (self _nativeCallFunction) ScopeEnvironment() _environment {
-	return nil
-}
-
-func (self _nativeCallFunction) Source() string {
-	return ""
-}
-
-func (self0 _nativeCallFunction) clone(clone *_clone) _callFunction {
-	return self0
-}
-
-// _nodeCallFunction
-type _nodeCallFunction struct {
-	node             *_functionNode
-	scopeEnvironment _environment // Can be either Lexical or Variable
-}
-
-func newNodeCallFunction(node *_functionNode, scopeEnvironment _environment) *_nodeCallFunction {
-	self := &_nodeCallFunction{
-		node: node,
-	}
-	self.scopeEnvironment = scopeEnvironment
-	return self
-}
-
-func (self _nodeCallFunction) Dispatch(function *_object, environment *_functionEnvironment, runtime *_runtime, this Value, argumentList []Value, _ bool) Value {
-	return runtime._callNode(function, environment, self.node, this, argumentList)
-}
-
-func (self _nodeCallFunction) ScopeEnvironment() _environment {
-	return self.scopeEnvironment
-}
-
-func (self _nodeCallFunction) Source() string {
-	return ""
-}
-
-func (self0 _nodeCallFunction) clone(clone *_clone) _callFunction {
-	return _nodeCallFunction{
-		node:             self0.node,
-		scopeEnvironment: clone.environment(self0.scopeEnvironment),
-	}
-}
-
-// _boundCallFunction
-type _boundCallFunction struct {
-	target       *_object
-	this         Value
-	argumentList []Value
-}
-
-func newBoundCallFunction(target *_object, this Value, argumentList []Value) *_boundCallFunction {
-	self := &_boundCallFunction{
-		target:       target,
-		this:         this,
-		argumentList: argumentList,
-	}
-	return self
-}
-
-func (self _boundCallFunction) Dispatch(_ *_object, _ *_functionEnvironment, runtime *_runtime, this Value, argumentList []Value, _ bool) Value {
-	argumentList = append(self.argumentList, argumentList...)
-	return runtime.Call(self.target, self.this, argumentList, false)
-}
-
-func (self _boundCallFunction) ScopeEnvironment() _environment {
-	return nil
-}
-
-func (self _boundCallFunction) Source() string {
-	return ""
-}
-
-func (self0 _boundCallFunction) clone(clone *_clone) _callFunction {
-	return _boundCallFunction{
-		target:       clone.object(self0.target),
-		this:         clone.value(self0.this),
-		argumentList: clone.valueArray(self0.argumentList),
-	}
-}
-
-// FunctionCall{}
-
-// FunctionCall is an enscapulation of a JavaScript function call.
-type FunctionCall struct {
-	runtime     *_runtime
-	_thisObject *_object
-	evalHint    bool
-
-	This         Value
-	ArgumentList []Value
-	Otto         *Otto
-}
-
-// Argument will return the value of the argument at the given index.
-//
-// If no such argument exists, undefined is returned.
-func (self FunctionCall) Argument(index int) Value {
-	return valueOfArrayIndex(self.ArgumentList, index)
-}
-
-func (self FunctionCall) slice(index int) []Value {
-	if index < len(self.ArgumentList) {
-		return self.ArgumentList[index:]
-	}
-	return []Value{}
-}
-
-func (self *FunctionCall) thisObject() *_object {
-	if self._thisObject == nil {
-		this := self.runtime.GetValue(self.This) // FIXME Is this right?
-		self._thisObject = self.runtime.toObject(this)
-	}
-	return self._thisObject
-}
-
-func (self *FunctionCall) thisClassObject(class string) *_object {
-	thisObject := self.thisObject()
-	if thisObject.class != class {
-		panic(newTypeError())
-	}
-	return self._thisObject
-}
-
-func (self FunctionCall) toObject(value Value) *_object {
-	return self.runtime.toObject(value)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_go_array.go b/vendor/github.com/robertkrimen/otto/type_go_array.go
deleted file mode 100644
index cf2ddd437..000000000
--- a/vendor/github.com/robertkrimen/otto/type_go_array.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package otto
-
-import (
-	"reflect"
-	"strconv"
-)
-
-func (runtime *_runtime) newGoArrayObject(value reflect.Value) *_object {
-	self := runtime.newObject()
-	self.class = "GoArray"
-	self.objectClass = _classGoArray
-	self.value = _newGoArrayObject(value)
-	return self
-}
-
-type _goArrayObject struct {
-	value        reflect.Value
-	writable     bool
-	propertyMode _propertyMode
-}
-
-func _newGoArrayObject(value reflect.Value) *_goArrayObject {
-	writable := value.Kind() == reflect.Ptr // The Array is addressable (like a Slice)
-	mode := _propertyMode(0010)
-	if writable {
-		mode = 0110
-	}
-	self := &_goArrayObject{
-		value:        value,
-		writable:     writable,
-		propertyMode: mode,
-	}
-	return self
-}
-
-func (self _goArrayObject) getValue(index int64) (reflect.Value, bool) {
-	value := reflect.Indirect(self.value)
-	if index < int64(value.Len()) {
-		return value.Index(int(index)), true
-	}
-	return reflect.Value{}, false
-}
-
-func (self _goArrayObject) setValue(index int64, value Value) bool {
-	indexValue, exists := self.getValue(index)
-	if !exists {
-		return false
-	}
-	reflectValue, err := value.toReflectValue(reflect.Indirect(self.value).Type().Elem().Kind())
-	if err != nil {
-		panic(err)
-	}
-	indexValue.Set(reflectValue)
-	return true
-}
-
-func goArrayGetOwnProperty(self *_object, name string) *_property {
-	// length
-	if name == "length" {
-		return &_property{
-			value: toValue(reflect.Indirect(self.value.(*_goArrayObject).value).Len()),
-			mode:  0,
-		}
-	}
-
-	// .0, .1, .2, ...
-	index := stringToArrayIndex(name)
-	if index >= 0 {
-		object := self.value.(*_goArrayObject)
-		value := UndefinedValue()
-		reflectValue, exists := object.getValue(index)
-		if exists {
-			value = self.runtime.toValue(reflectValue.Interface())
-		}
-		return &_property{
-			value: value,
-			mode:  object.propertyMode,
-		}
-	}
-
-	return objectGetOwnProperty(self, name)
-}
-
-func goArrayEnumerate(self *_object, all bool, each func(string) bool) {
-	object := self.value.(*_goArrayObject)
-	// .0, .1, .2, ...
-
-	for index, length := 0, object.value.Len(); index < length; index++ {
-		name := strconv.FormatInt(int64(index), 10)
-		if !each(name) {
-			return
-		}
-	}
-
-	objectEnumerate(self, all, each)
-}
-
-func goArrayDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	if name == "length" {
-		return typeErrorResult(throw)
-	} else if index := stringToArrayIndex(name); index >= 0 {
-		object := self.value.(*_goArrayObject)
-		if object.writable {
-			if self.value.(*_goArrayObject).setValue(index, descriptor.value.(Value)) {
-				return true
-			}
-		}
-		return typeErrorResult(throw)
-	}
-	return objectDefineOwnProperty(self, name, descriptor, throw)
-}
-
-func goArrayDelete(self *_object, name string, throw bool) bool {
-	// length
-	if name == "length" {
-		return typeErrorResult(throw)
-	}
-
-	// .0, .1, .2, ...
-	index := stringToArrayIndex(name)
-	if index >= 0 {
-		object := self.value.(*_goArrayObject)
-		if object.writable {
-			indexValue, exists := object.getValue(index)
-			if exists {
-				indexValue.Set(reflect.Zero(reflect.Indirect(object.value).Type().Elem()))
-				return true
-			}
-		}
-		return typeErrorResult(throw)
-	}
-
-	return self.delete(name, throw)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_go_map.go b/vendor/github.com/robertkrimen/otto/type_go_map.go
deleted file mode 100644
index 4635fb231..000000000
--- a/vendor/github.com/robertkrimen/otto/type_go_map.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package otto
-
-import (
-	"reflect"
-)
-
-func (runtime *_runtime) newGoMapObject(value reflect.Value) *_object {
-	self := runtime.newObject()
-	self.class = "Object" // TODO Should this be something else?
-	self.objectClass = _classGoMap
-	self.value = _newGoMapObject(value)
-	return self
-}
-
-type _goMapObject struct {
-	value     reflect.Value
-	keyKind   reflect.Kind
-	valueKind reflect.Kind
-}
-
-func _newGoMapObject(value reflect.Value) *_goMapObject {
-	if value.Kind() != reflect.Map {
-		dbgf("%/panic//%@: %v != reflect.Map", value.Kind())
-	}
-	self := &_goMapObject{
-		value:     value,
-		keyKind:   value.Type().Key().Kind(),
-		valueKind: value.Type().Elem().Kind(),
-	}
-	return self
-}
-
-func (self _goMapObject) toKey(name string) reflect.Value {
-	reflectValue, err := stringToReflectValue(name, self.keyKind)
-	if err != nil {
-		panic(err)
-	}
-	return reflectValue
-}
-
-func (self _goMapObject) toValue(value Value) reflect.Value {
-	reflectValue, err := value.toReflectValue(self.valueKind)
-	if err != nil {
-		panic(err)
-	}
-	return reflectValue
-}
-
-func goMapGetOwnProperty(self *_object, name string) *_property {
-	object := self.value.(*_goMapObject)
-	value := object.value.MapIndex(object.toKey(name))
-	if value.IsValid() {
-		return &_property{self.runtime.toValue(value.Interface()), 0111}
-	}
-
-	return nil
-}
-
-func goMapEnumerate(self *_object, all bool, each func(string) bool) {
-	object := self.value.(*_goMapObject)
-	keys := object.value.MapKeys()
-	for _, key := range keys {
-		if !each(key.String()) {
-			return
-		}
-	}
-}
-
-func goMapDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	object := self.value.(*_goMapObject)
-	// TODO ...or 0222
-	if descriptor.mode != 0111 {
-		return typeErrorResult(throw)
-	}
-	if !descriptor.isDataDescriptor() {
-		return typeErrorResult(throw)
-	}
-	object.value.SetMapIndex(object.toKey(name), object.toValue(descriptor.value.(Value)))
-	return true
-}
-
-func goMapDelete(self *_object, name string, throw bool) bool {
-	object := self.value.(*_goMapObject)
-	object.value.SetMapIndex(object.toKey(name), reflect.Value{})
-	// FIXME
-	return true
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_go_slice.go b/vendor/github.com/robertkrimen/otto/type_go_slice.go
deleted file mode 100644
index 5821e2ad3..000000000
--- a/vendor/github.com/robertkrimen/otto/type_go_slice.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package otto
-
-import (
-	"reflect"
-	"strconv"
-)
-
-func (runtime *_runtime) newGoSliceObject(value reflect.Value) *_object {
-	self := runtime.newObject()
-	self.class = "GoArray" // TODO GoSlice?
-	self.objectClass = _classGoSlice
-	self.value = _newGoSliceObject(value)
-	return self
-}
-
-type _goSliceObject struct {
-	value reflect.Value
-}
-
-func _newGoSliceObject(value reflect.Value) *_goSliceObject {
-	self := &_goSliceObject{
-		value: value,
-	}
-	return self
-}
-
-func (self _goSliceObject) getValue(index int64) (reflect.Value, bool) {
-	if index < int64(self.value.Len()) {
-		return self.value.Index(int(index)), true
-	}
-	return reflect.Value{}, false
-}
-
-func (self _goSliceObject) setValue(index int64, value Value) bool {
-	indexValue, exists := self.getValue(index)
-	if !exists {
-		return false
-	}
-	reflectValue, err := value.toReflectValue(self.value.Type().Elem().Kind())
-	if err != nil {
-		panic(err)
-	}
-	indexValue.Set(reflectValue)
-	return true
-}
-
-func goSliceGetOwnProperty(self *_object, name string) *_property {
-	// length
-	if name == "length" {
-		return &_property{
-			value: toValue(self.value.(*_goSliceObject).value.Len()),
-			mode:  0,
-		}
-	}
-
-	// .0, .1, .2, ...
-	index := stringToArrayIndex(name)
-	if index >= 0 {
-		value := UndefinedValue()
-		reflectValue, exists := self.value.(*_goSliceObject).getValue(index)
-		if exists {
-			value = self.runtime.toValue(reflectValue.Interface())
-		}
-		return &_property{
-			value: value,
-			mode:  0110,
-		}
-	}
-
-	return objectGetOwnProperty(self, name)
-}
-
-func goSliceEnumerate(self *_object, all bool, each func(string) bool) {
-	object := self.value.(*_goSliceObject)
-	// .0, .1, .2, ...
-
-	for index, length := 0, object.value.Len(); index < length; index++ {
-		name := strconv.FormatInt(int64(index), 10)
-		if !each(name) {
-			return
-		}
-	}
-
-	objectEnumerate(self, all, each)
-}
-
-func goSliceDefineOwnProperty(self *_object, name string, descriptor _property, throw bool) bool {
-	if name == "length" {
-		return typeErrorResult(throw)
-	} else if index := stringToArrayIndex(name); index >= 0 {
-		if self.value.(*_goSliceObject).setValue(index, descriptor.value.(Value)) {
-			return true
-		}
-		return typeErrorResult(throw)
-	}
-	return objectDefineOwnProperty(self, name, descriptor, throw)
-}
-
-func goSliceDelete(self *_object, name string, throw bool) bool {
-	// length
-	if name == "length" {
-		return typeErrorResult(throw)
-	}
-
-	// .0, .1, .2, ...
-	index := stringToArrayIndex(name)
-	if index >= 0 {
-		object := self.value.(*_goSliceObject)
-		indexValue, exists := object.getValue(index)
-		if exists {
-			indexValue.Set(reflect.Zero(object.value.Type().Elem()))
-			return true
-		}
-		return typeErrorResult(throw)
-	}
-
-	return self.delete(name, throw)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_go_struct.go b/vendor/github.com/robertkrimen/otto/type_go_struct.go
deleted file mode 100644
index 0cc205e7b..000000000
--- a/vendor/github.com/robertkrimen/otto/type_go_struct.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package otto
-
-import (
-	"reflect"
-)
-
-func (runtime *_runtime) newGoStructObject(value reflect.Value) *_object {
-	self := runtime.newObject()
-	self.class = "Object" // TODO Should this be something else?
-	self.objectClass = _classGoStruct
-	self.value = _newGoStructObject(value)
-	return self
-}
-
-type _goStructObject struct {
-	value reflect.Value
-}
-
-func _newGoStructObject(value reflect.Value) *_goStructObject {
-	if reflect.Indirect(value).Kind() != reflect.Struct {
-		dbgf("%/panic//%@: %v != reflect.Struct", value.Kind())
-	}
-	self := &_goStructObject{
-		value: value,
-	}
-	return self
-}
-
-func (self _goStructObject) getValue(name string) reflect.Value {
-	return reflect.Indirect(self.value).FieldByName(name)
-}
-
-func (self _goStructObject) field(name string) (reflect.StructField, bool) {
-	return reflect.Indirect(self.value).Type().FieldByName(name)
-}
-
-func (self _goStructObject) setValue(name string, value Value) bool {
-	field, exists := self.field(name)
-	if !exists {
-		return false
-	}
-	fieldValue := self.getValue(name)
-	reflectValue, err := value.toReflectValue(field.Type.Kind())
-	if err != nil {
-		panic(err)
-	}
-	fieldValue.Set(reflectValue)
-	return true
-}
-
-func goStructGetOwnProperty(self *_object, name string) *_property {
-	object := self.value.(*_goStructObject)
-	value := object.getValue(name)
-	if value.IsValid() {
-		return &_property{self.runtime.toValue(value.Interface()), 0110}
-	}
-
-	return objectGetOwnProperty(self, name)
-}
-
-func goStructEnumerate(self *_object, all bool, each func(string) bool) {
-	object := self.value.(*_goStructObject)
-	count := object.value.NumField()
-	type_ := object.value.Type()
-	for index := 0; index < count; index++ {
-		if !each(type_.Field(index).Name) {
-			return
-		}
-	}
-
-	objectEnumerate(self, all, each)
-}
-
-func goStructCanPut(self *_object, name string) bool {
-	object := self.value.(*_goStructObject)
-	value := object.getValue(name)
-	if value.IsValid() {
-		return true
-	}
-
-	return objectCanPut(self, name)
-}
-
-func goStructPut(self *_object, name string, value Value, throw bool) {
-	object := self.value.(*_goStructObject)
-	if object.setValue(name, value) {
-		return
-	}
-
-	objectPut(self, name, value, throw)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_number.go b/vendor/github.com/robertkrimen/otto/type_number.go
deleted file mode 100644
index ee7adc985..000000000
--- a/vendor/github.com/robertkrimen/otto/type_number.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package otto
-
-func (runtime *_runtime) newNumberObject(value Value) *_object {
-	return runtime.newPrimitiveObject("Number", toNumber(value))
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_reference.go b/vendor/github.com/robertkrimen/otto/type_reference.go
deleted file mode 100644
index 24f6cc64c..000000000
--- a/vendor/github.com/robertkrimen/otto/type_reference.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package otto
-
-type _reference interface {
-	GetBase() interface{}      // GetBase
-	GetName() string           // GetReferencedName
-	IsStrict() bool            // IsStrictReference
-	IsUnresolvable() bool      // IsUnresolvableReference
-	IsPropertyReference() bool // IsPropertyReference
-	GetValue() Value           // GetValue
-	PutValue(Value) bool       // PutValue
-	Delete() bool
-}
-
-// Reference
-
-type _referenceDefault struct {
-	name   string
-	strict bool
-}
-
-func (self _referenceDefault) GetName() string {
-	return self.name
-}
-
-func (self _referenceDefault) IsStrict() bool {
-	return self.strict
-}
-
-// PropertyReference
-
-type _propertyReference struct {
-	_referenceDefault
-	Base *_object
-	node _node
-}
-
-func newPropertyReference(base *_object, name string, strict bool, node _node) *_propertyReference {
-	return &_propertyReference{
-		Base: base,
-		_referenceDefault: _referenceDefault{
-			name:   name,
-			strict: strict,
-		},
-		node: node,
-	}
-}
-
-func (self *_propertyReference) GetBase() interface{} {
-	return self.Base
-}
-
-func (self *_propertyReference) IsUnresolvable() bool {
-	return self.Base == nil
-}
-
-func (self *_propertyReference) IsPropertyReference() bool {
-	return true
-}
-
-func (self *_propertyReference) GetValue() Value {
-	if self.Base == nil {
-		panic(newReferenceError("notDefined", self.name, self.node))
-	}
-	return self.Base.get(self.name)
-}
-
-func (self *_propertyReference) PutValue(value Value) bool {
-	if self.Base == nil {
-		return false
-	}
-	self.Base.put(self.name, value, self.IsStrict())
-	return true
-}
-
-func (self *_propertyReference) Delete() bool {
-	if self.Base == nil {
-		// TODO Throw an error if strict
-		return true
-	}
-	return self.Base.delete(self.name, self.IsStrict())
-}
-
-// ArgumentReference
-
-func newArgumentReference(base *_object, name string, strict bool) *_propertyReference {
-	if base == nil {
-		panic(hereBeDragons())
-	}
-	return newPropertyReference(base, name, strict, nil)
-}
-
-type _environmentReference struct {
-	_referenceDefault
-	Base _environment
-	node _node
-}
-
-func newEnvironmentReference(base _environment, name string, strict bool, node _node) *_environmentReference {
-	return &_environmentReference{
-		Base: base,
-		_referenceDefault: _referenceDefault{
-			name:   name,
-			strict: strict,
-		},
-		node: node,
-	}
-}
-
-func (self *_environmentReference) GetBase() interface{} {
-	return self.Base
-}
-
-func (self *_environmentReference) IsUnresolvable() bool {
-	return self.Base == nil // The base (an environment) will never be nil
-}
-
-func (self *_environmentReference) IsPropertyReference() bool {
-	return false
-}
-
-func (self *_environmentReference) GetValue() Value {
-	if self.Base == nil {
-		// This should never be reached, but just in case
-	}
-	return self.Base.GetValue(self.name, self.IsStrict())
-}
-
-func (self *_environmentReference) PutValue(value Value) bool {
-	if self.Base == nil {
-		// This should never be reached, but just in case
-		return false
-	}
-	self.Base.SetValue(self.name, value, self.IsStrict())
-	return true
-}
-
-func (self *_environmentReference) Delete() bool {
-	if self.Base == nil {
-		// This should never be reached, but just in case
-		return false
-	}
-	return self.Base.DeleteBinding(self.name)
-}
-
-// getIdentifierReference
-
-func getIdentifierReference(environment _environment, name string, strict bool, node _node) _reference {
-	if environment == nil {
-		return newPropertyReference(nil, name, strict, node)
-	}
-	if environment.HasBinding(name) {
-		return environment.newReference(name, strict)
-	}
-	return getIdentifierReference(environment.Outer(), name, strict, node)
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_regexp.go b/vendor/github.com/robertkrimen/otto/type_regexp.go
deleted file mode 100644
index 89cf62443..000000000
--- a/vendor/github.com/robertkrimen/otto/type_regexp.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package otto
-
-import (
-	"bytes"
-	"fmt"
-	"regexp"
-	"strings"
-	"unicode/utf8"
-)
-
-type _regExpObject struct {
-	regularExpression *regexp.Regexp
-	global            bool
-	ignoreCase        bool
-	multiline         bool
-	source            string
-	flags             string
-}
-
-func (runtime *_runtime) newRegExpObject(pattern string, flags string) *_object {
-	self := runtime.newObject()
-	self.class = "RegExp"
-
-	global := false
-	ignoreCase := false
-	multiline := false
-	re2flags := ""
-
-	for _, chr := range flags {
-		switch chr {
-		case 'g':
-			if global {
-				panic(newError("SyntaxError: newRegExpObject: %s %s", pattern, flags))
-			}
-			global = true
-		case 'm':
-			if multiline {
-				panic(newError("SyntaxError: newRegExpObject: %s %s", pattern, flags))
-			}
-			multiline = true
-			re2flags += "m"
-		case 'i':
-			if ignoreCase {
-				panic(newError("SyntaxError: newRegExpObject: %s %s", pattern, flags))
-			}
-			ignoreCase = true
-			re2flags += "i"
-		}
-	}
-
-	re2pattern := transformRegExp(pattern)
-	if len(re2flags) > 0 {
-		re2pattern = fmt.Sprintf("(?%s:%s)", re2flags, re2pattern)
-	}
-
-	regularExpression, err := regexp.Compile(re2pattern)
-	if err != nil {
-		panic(newSyntaxError("Invalid regular expression: %s", err.Error()[22:]))
-	}
-
-	self.value = _regExpObject{
-		regularExpression: regularExpression,
-		global:            global,
-		ignoreCase:        ignoreCase,
-		multiline:         multiline,
-		source:            pattern,
-		flags:             flags,
-	}
-	self.defineProperty("global", toValue_bool(global), 0, false)
-	self.defineProperty("ignoreCase", toValue_bool(ignoreCase), 0, false)
-	self.defineProperty("multiline", toValue_bool(multiline), 0, false)
-	self.defineProperty("lastIndex", toValue_int(0), 0100, false)
-	self.defineProperty("source", toValue_string(pattern), 0, false)
-	return self
-}
-
-func (self *_object) regExpValue() _regExpObject {
-	value, _ := self.value.(_regExpObject)
-	return value
-}
-
-func execRegExp(this *_object, target string) (match bool, result []int) {
-	if this.class != "RegExp" {
-		panic(newTypeError("Calling RegExp.exec on a non-RegExp object"))
-	}
-	lastIndex := toInteger(this.get("lastIndex")).value
-	index := lastIndex
-	global := toBoolean(this.get("global"))
-	if !global {
-		index = 0
-	}
-	if 0 > index || index > int64(len(target)) {
-	} else {
-		result = this.regExpValue().regularExpression.FindStringSubmatchIndex(target[index:])
-	}
-	if result == nil {
-		//this.defineProperty("lastIndex", toValue_(0), 0111, true)
-		this.put("lastIndex", toValue_int(0), true)
-		return // !match
-	}
-	match = true
-	startIndex := index
-	endIndex := int(lastIndex) + result[1]
-	// We do this shift here because the .FindStringSubmatchIndex above
-	// was done on a local subordinate slice of the string, not the whole string
-	for index, _ := range result {
-		result[index] += int(startIndex)
-	}
-	if global {
-		//this.defineProperty("lastIndex", toValue_(endIndex), 0111, true)
-		this.put("lastIndex", toValue_int(endIndex), true)
-	}
-	return // match
-}
-
-func execResultToArray(runtime *_runtime, target string, result []int) *_object {
-	captureCount := len(result) / 2
-	valueArray := make([]Value, captureCount)
-	for index := 0; index < captureCount; index++ {
-		offset := 2 * index
-		if result[offset] != -1 {
-			valueArray[index] = toValue_string(target[result[offset]:result[offset+1]])
-		} else {
-			valueArray[index] = UndefinedValue()
-		}
-	}
-	matchIndex := result[0]
-	if matchIndex != 0 {
-		matchIndex = 0
-		// Find the rune index in the string, not the byte index
-		for index := 0; index < result[0]; {
-			_, size := utf8.DecodeRuneInString(target[index:])
-			matchIndex += 1
-			index += size
-		}
-	}
-	match := runtime.newArrayOf(valueArray)
-	match.defineProperty("input", toValue_string(target), 0111, false)
-	match.defineProperty("index", toValue_int(matchIndex), 0111, false)
-	return match
-}
-
-// 0031,0032,0033,0034,0035,0036,0037,0038,0039 // 1 - 9
-// 0043,0045,0046,0047,0048,0049,004A,004B,004C,004D,004E,004F
-// 0050,0052,0054,0055,0056,0058,0059,005A
-// 0063,0065,0067,0068,0069,006A,006B,006C,006D,006F
-// 0070,0071,0075,0078,0079
-// 0080,0081,0082,0083,0084,0085,0086,0087,0088,0089,008A,008B,008C,008D,008E,008F
-// 0090,0091,0092,0093,0094,0095,0096,0097,0098,0099,009A,009B,009C,009D,009E,009F
-// 00A0,00A1,00A2,00A3,00A4,00A5,00A6,00A7,00A8,00A9,00AA,00AB,00AC,00AD,00AE,00AF
-// 00B0,00B1,00B2,00B3,00B4,00B5,00B6,00B7,00B8,00B9,00BA,00BB,00BC,00BD,00BE,00BF
-// 00C0,00C1,00C2,00C3,00C4,00C5,00C6,00C7,00C8,00C9,00CA,00CB,00CC,00CD,00CE,00CF
-// ...
-// c = 63* c[A-Z]
-// p = 70
-// u = 75* u[:xdigit:]{4}
-// x = 78* x[:xdigit:]{2}
-//\x{0031}-\x{0039}
-
-var transformRegExp_matchSlashU = regexp.MustCompile(`\\u([[:xdigit:]]{1,4})`)
-var transformRegExp_escape_c = regexp.MustCompile(`\\c([A-Za-z])`)
-var transformRegExp_unescape_c = regexp.MustCompile(`\\c`)
-var transformRegExp_unescape = []*regexp.Regexp{
-	regexp.MustCompile(strings.NewReplacer("\n", "", "\t", "", " ", "").Replace(`
-		\\(
-		[
-			\x{0043}\x{0045}-\x{004F}
-			\x{0050}\x{0052}\x{0054}-\x{0056}\x{0058}-\x{005A}
-			\x{0065}\x{0067}-\x{006D}\x{006F}
-			\x{0070}\x{0071}\x{0079}
-			\x{0080}-\x{FFFF}
-		]
-		)()
-	`)),
-	regexp.MustCompile(`\\(u)([^[:xdigit:]])`),
-	regexp.MustCompile(`\\(u)([[:xdigit:]][^[:xdigit:]])`),
-	regexp.MustCompile(`\\(u)([[:xdigit:]][[:xdigit:]][^[:xdigit:]])`),
-	regexp.MustCompile(`\\(u)([[:xdigit:]][[:xdigit:]][[:xdigit:]][^[:xdigit:]])`),
-	regexp.MustCompile(`\\(x)([^[:xdigit:]])`),
-	regexp.MustCompile(`\\(x)([[:xdigit:]][^[:xdigit:]])`),
-}
-
-var transformRegExp_unescapeDollar = regexp.MustCompile(`\\([cux])$`)
-
-// TODO Go "regexp" bug? Can't do: (?:)|(?:$)
-
-func transformRegExp(ecmaRegExp string) (goRegExp string) {
-	// https://bugzilla.mozilla.org/show_bug.cgi/show_bug.cgi?id=334158
-	tmp := []byte(ecmaRegExp)
-	for _, value := range transformRegExp_unescape {
-		tmp = value.ReplaceAll(tmp, []byte(`$1$2`))
-	}
-	tmp = transformRegExp_escape_c.ReplaceAllFunc(tmp, func(in []byte) []byte {
-		in = bytes.ToUpper(in)
-		// in = [ \, c, A-Z ]
-		in[2] -= 64 // 64 => 01
-		return []byte(fmt.Sprintf("\\0%o", in[2]))
-	})
-	tmp = transformRegExp_unescape_c.ReplaceAll(tmp, []byte(`c`))
-	tmp = transformRegExp_unescapeDollar.ReplaceAll(tmp, []byte(`$1`))
-	tmp = transformRegExp_matchSlashU.ReplaceAll(tmp, []byte(`\x{$1}`))
-	return string(tmp)
-}
-
-func isValidRegExp(ecmaRegExp string) bool {
-	shibboleth := 0 // The shibboleth in this case is (?
-	// Since we're looking for (?! / (?=
-	inSet := false // In a bracketed set, e.g. [0-9]
-	escape := false
-	for _, chr := range ecmaRegExp {
-		if escape {
-			escape = false
-			shibboleth = 0
-			continue
-		}
-		if chr == '\\' {
-			escape = true
-			continue
-		}
-		if inSet {
-			if chr == ']' {
-				inSet = false
-				shibboleth = 0
-			}
-			continue
-		}
-		switch chr {
-		case '[':
-			inSet = true
-			continue
-		case '(':
-			shibboleth = 1
-			continue
-		case '?':
-			if shibboleth == 1 {
-				shibboleth = 2
-			}
-			continue
-		case '=', '!':
-			if shibboleth == 2 {
-				return false
-			}
-		}
-		shibboleth = 0
-	}
-
-	return true
-}
diff --git a/vendor/github.com/robertkrimen/otto/type_string.go b/vendor/github.com/robertkrimen/otto/type_string.go
deleted file mode 100644
index 2901743eb..000000000
--- a/vendor/github.com/robertkrimen/otto/type_string.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package otto
-
-import (
-	"strconv"
-	"unicode/utf16"
-)
-
-type _stringObject struct {
-	value   Value
-	value16 []uint16
-}
-
-func (runtime *_runtime) newStringObject(value Value) *_object {
-	value = toValue_string(toString(value))
-	value16 := utf16Of(value.value.(string))
-
-	self := runtime.newClassObject("String")
-	self.defineProperty("length", toValue_int(len(value16)), 0, false)
-	self.objectClass = _classString
-	self.value = _stringObject{
-		value:   value,
-		value16: value16,
-	}
-	return self
-}
-
-func (self *_object) stringValue() (string, _stringObject) {
-	value, valid := self.value.(_stringObject)
-	if valid {
-		return value.value.value.(string), value
-	}
-	return "", _stringObject{}
-}
-
-func (self *_object) stringValue16() []uint16 {
-	_, value := self.stringValue()
-	return value.value16
-}
-
-func utf16Of(value string) []uint16 {
-	return utf16.Encode([]rune(value))
-}
-
-func stringEnumerate(self *_object, all bool, each func(string) bool) {
-	length := len(self.stringValue16())
-	for index := 0; index < length; index += 1 {
-		if !each(strconv.FormatInt(int64(index), 10)) {
-			return
-		}
-	}
-	objectEnumerate(self, all, each)
-}
-
-func stringGetOwnProperty(self *_object, name string) *_property {
-	if property := objectGetOwnProperty(self, name); property != nil {
-		return property
-	}
-	index := stringToArrayIndex(name)
-	if index >= 0 {
-		value16 := self.stringValue16()
-		if index < int64(len(value16)) {
-			return &_property{toValue_string(string(value16[index])), 0}
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore/Makefile b/vendor/github.com/robertkrimen/otto/underscore/Makefile
deleted file mode 100644
index fc872917f..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-.PHONY: source
-
-source: source.go
-
-underscore.js:
-	curl -kL http://underscorejs.org/underscore.js > $@
-
-source.go: underscore.js
-	go-bindata -f underscore -p underscore -u true < $< 2>/dev/null | grep -v '^//' | gofmt > $@
-	head -4 $< >> $@
-	mv $< ..
diff --git a/vendor/github.com/robertkrimen/otto/underscore/README.markdown b/vendor/github.com/robertkrimen/otto/underscore/README.markdown
deleted file mode 100644
index bce37b695..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore/README.markdown
+++ /dev/null
@@ -1,53 +0,0 @@
-# underscore
---
-    import "github.com/robertkrimen/otto/underscore"
-
-Package underscore contains the source for the JavaScript utility-belt library.
-
-    import (
-    	_ "github.com/robertkrimen/otto/underscore"
-    )
-    // Every Otto runtime will now include underscore
-
-http://underscorejs.org
-
-https://github.com/documentcloud/underscore
-
-By importing this package, you'll automatically load underscore every time you
-create a new Otto runtime.
-
-To prevent this behavior, you can do the following:
-
-    import (
-    	"github.com/robertkrimen/otto/underscore"
-    )
-
-    func init() {
-    	underscore.Disable()
-    }
-
-## Usage
-
-#### func  Disable
-
-```go
-func Disable()
-```
-Disable underscore runtime inclusion.
-
-#### func  Enable
-
-```go
-func Enable()
-```
-Enable underscore runtime inclusion.
-
-#### func  Source
-
-```go
-func Source() string
-```
-Source returns the underscore source.
-
---
-**godocdown** http://github.com/robertkrimen/godocdown
diff --git a/vendor/github.com/robertkrimen/otto/underscore/source.go b/vendor/github.com/robertkrimen/otto/underscore/source.go
deleted file mode 100644
index 65754ab71..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore/source.go
+++ /dev/null
@@ -1,3462 +0,0 @@
-package underscore
-
-func underscore() []byte {
-	return []byte{
-		0x2f, 0x2f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x72,
-		0x73, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x73, 0x20, 0x31, 0x2e, 0x34,
-		0x2e, 0x34, 0x0a, 0x2f, 0x2f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x74,
-		0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63,
-		0x6f, 0x72, 0x65, 0x6a, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x0a, 0x2f, 0x2f,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x28, 0x63, 0x29, 0x20, 0x32, 0x30, 0x30,
-		0x39, 0x2d, 0x32, 0x30, 0x31, 0x33, 0x20, 0x4a, 0x65, 0x72, 0x65, 0x6d,
-		0x79, 0x20, 0x41, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x61, 0x73, 0x2c, 0x20,
-		0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6c, 0x6f, 0x75,
-		0x64, 0x20, 0x49, 0x6e, 0x63, 0x2e, 0x0a, 0x2f, 0x2f, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65,
-		0x20, 0x6d, 0x61, 0x79, 0x20, 0x62, 0x65, 0x20, 0x66, 0x72, 0x65, 0x65,
-		0x6c, 0x79, 0x20, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
-		0x65, 0x64, 0x20, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x4d, 0x49, 0x54, 0x20, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65,
-		0x2e, 0x0a, 0x0a, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x29, 0x20, 0x7b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x42,
-		0x61, 0x73, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x73, 0x65, 0x74, 0x75,
-		0x70, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73,
-		0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x20, 0x6f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x60, 0x77, 0x69, 0x6e, 0x64,
-		0x6f, 0x77, 0x60, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62,
-		0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x60,
-		0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x60, 0x20, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x0a, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x6f, 0x6f, 0x74, 0x20, 0x3d, 0x20,
-		0x74, 0x68, 0x69, 0x73, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x53, 0x61, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x65,
-		0x76, 0x69, 0x6f, 0x75, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20,
-		0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x60, 0x5f, 0x60, 0x20, 0x76,
-		0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x55,
-		0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x3d, 0x20,
-		0x72, 0x6f, 0x6f, 0x74, 0x2e, 0x5f, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x67, 0x65, 0x74, 0x73, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x72, 0x65,
-		0x61, 0x6b, 0x20, 0x6f, 0x75, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20,
-		0x6c, 0x6f, 0x6f, 0x70, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x69,
-		0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62, 0x72,
-		0x65, 0x61, 0x6b, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x53, 0x61, 0x76, 0x65, 0x20, 0x62,
-		0x79, 0x74, 0x65, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x6d, 0x69, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x28, 0x62, 0x75,
-		0x74, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x67, 0x7a, 0x69, 0x70, 0x70, 0x65,
-		0x64, 0x29, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3a, 0x0a,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50,
-		0x72, 0x6f, 0x74, 0x6f, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79,
-		0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2c, 0x20,
-		0x4f, 0x62, 0x6a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x20, 0x3d, 0x20, 0x4f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74,
-		0x79, 0x70, 0x65, 0x2c, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x50, 0x72, 0x6f,
-		0x74, 0x6f, 0x20, 0x3d, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x3b,
-		0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74,
-		0x65, 0x20, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x20, 0x72, 0x65, 0x66, 0x65,
-		0x72, 0x65, 0x6e, 0x63, 0x65, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62,
-		0x6c, 0x65, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x73, 0x70, 0x65, 0x65,
-		0x64, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x74, 0x6f, 0x20,
-		0x63, 0x6f, 0x72, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79,
-		0x70, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70,
-		0x75, 0x73, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50,
-		0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x2c, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20,
-		0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x73,
-		0x6c, 0x69, 0x63, 0x65, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79,
-		0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74,
-		0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x6f, 0x53, 0x74,
-		0x72, 0x69, 0x6e, 0x67, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x3d, 0x20, 0x4f, 0x62, 0x6a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-		0x74, 0x6f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2c, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x73, 0x4f, 0x77, 0x6e, 0x50, 0x72,
-		0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x4f,
-		0x62, 0x6a, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x68, 0x61, 0x73, 0x4f,
-		0x77, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6c, 0x6c, 0x20, 0x2a, 0x2a,
-		0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35,
-		0x2a, 0x2a, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65,
-		0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x77, 0x65, 0x20, 0x68, 0x6f, 0x70, 0x65, 0x20,
-		0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x61, 0x72, 0x65, 0x20, 0x64, 0x65, 0x63, 0x6c, 0x61, 0x72, 0x65, 0x64,
-		0x20, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x46,
-		0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-		0x2e, 0x66, 0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x2c, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x70, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41,
-		0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6d, 0x61,
-		0x70, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76,
-		0x65, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f,
-		0x74, 0x6f, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x2c, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x64,
-		0x75, 0x63, 0x65, 0x52, 0x69, 0x67, 0x68, 0x74, 0x20, 0x20, 0x3d, 0x20,
-		0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x72,
-		0x65, 0x64, 0x75, 0x63, 0x65, 0x52, 0x69, 0x67, 0x68, 0x74, 0x2c, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x46, 0x69,
-		0x6c, 0x74, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d,
-		0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-		0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x45, 0x76, 0x65, 0x72, 0x79, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72,
-		0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x65, 0x76, 0x65, 0x72,
-		0x79, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76,
-		0x65, 0x53, 0x6f, 0x6d, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f,
-		0x74, 0x6f, 0x2e, 0x73, 0x6f, 0x6d, 0x65, 0x2c, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78,
-		0x4f, 0x66, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72,
-		0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x64,
-		0x65, 0x78, 0x4f, 0x66, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x61,
-		0x74, 0x69, 0x76, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x65,
-		0x78, 0x4f, 0x66, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79,
-		0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e,
-		0x64, 0x65, 0x78, 0x4f, 0x66, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e,
-		0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20, 0x41, 0x72, 0x72, 0x61,
-		0x79, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4b, 0x65, 0x79,
-		0x73, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3d, 0x20,
-		0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x6b, 0x65, 0x79, 0x73, 0x2c,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x42,
-		0x69, 0x6e, 0x64, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x3d, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-		0x62, 0x69, 0x6e, 0x64, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x73, 0x61, 0x66,
-		0x65, 0x20, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x20,
-		0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x72,
-		0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x20, 0x66, 0x6f, 0x72, 0x20, 0x75, 0x73, 0x65, 0x20, 0x62, 0x65, 0x6c,
-		0x6f, 0x77, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x5f, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-		0x63, 0x65, 0x6f, 0x66, 0x20, 0x5f, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x21, 0x28, 0x74, 0x68, 0x69, 0x73, 0x20, 0x69,
-		0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x6f, 0x66, 0x20, 0x5f, 0x29,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6e, 0x65, 0x77,
-		0x20, 0x5f, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x74, 0x68, 0x69, 0x73, 0x2e, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x70,
-		0x65, 0x64, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x45, 0x78, 0x70,
-		0x6f, 0x72, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x55, 0x6e, 0x64, 0x65,
-		0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x2a, 0x2a, 0x4e, 0x6f, 0x64, 0x65,
-		0x2e, 0x6a, 0x73, 0x2a, 0x2a, 0x2c, 0x20, 0x77, 0x69, 0x74, 0x68, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72,
-		0x64, 0x73, 0x2d, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x69, 0x62, 0x69,
-		0x6c, 0x69, 0x74, 0x79, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x6f, 0x6c, 0x64, 0x20, 0x60, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72,
-		0x65, 0x28, 0x29, 0x60, 0x20, 0x41, 0x50, 0x49, 0x2e, 0x20, 0x49, 0x66,
-		0x20, 0x77, 0x65, 0x27, 0x72, 0x65, 0x20, 0x69, 0x6e, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x73,
-		0x65, 0x72, 0x2c, 0x20, 0x61, 0x64, 0x64, 0x20, 0x60, 0x5f, 0x60, 0x20,
-		0x61, 0x73, 0x20, 0x61, 0x20, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x76, 0x69, 0x61, 0x20, 0x61,
-		0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x64, 0x65, 0x6e,
-		0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x2c, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x66, 0x6f, 0x72, 0x20, 0x43, 0x6c, 0x6f, 0x73, 0x75, 0x72, 0x65,
-		0x20, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x20, 0x22, 0x61,
-		0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x64, 0x22, 0x20, 0x6d, 0x6f, 0x64,
-		0x65, 0x2e, 0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x79, 0x70,
-		0x65, 0x6f, 0x66, 0x20, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x20,
-		0x21, 0x3d, 0x3d, 0x20, 0x27, 0x75, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e,
-		0x65, 0x64, 0x27, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x6f, 0x66, 0x20, 0x6d, 0x6f,
-		0x64, 0x75, 0x6c, 0x65, 0x20, 0x21, 0x3d, 0x3d, 0x20, 0x27, 0x75, 0x6e,
-		0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x27, 0x20, 0x26, 0x26, 0x20,
-		0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x65, 0x78, 0x70, 0x6f, 0x72,
-		0x74, 0x73, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x6d, 0x6f,
-		0x64, 0x75, 0x6c, 0x65, 0x2e, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x73,
-		0x20, 0x3d, 0x20, 0x5f, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x2e,
-		0x5f, 0x20, 0x3d, 0x20, 0x5f, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x20, 0x65,
-		0x6c, 0x73, 0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x6f,
-		0x6f, 0x74, 0x2e, 0x5f, 0x20, 0x3d, 0x20, 0x5f, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x75, 0x72, 0x72,
-		0x65, 0x6e, 0x74, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x56, 0x45, 0x52, 0x53, 0x49, 0x4f, 0x4e,
-		0x20, 0x3d, 0x20, 0x27, 0x31, 0x2e, 0x34, 0x2e, 0x34, 0x27, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x54,
-		0x68, 0x65, 0x20, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0x73, 0x74, 0x6f,
-		0x6e, 0x65, 0x2c, 0x20, 0x61, 0x6e, 0x20, 0x60, 0x65, 0x61, 0x63, 0x68,
-		0x60, 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61,
-		0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x61, 0x6b, 0x61, 0x20, 0x60, 0x66,
-		0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x73, 0x20, 0x6f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x62, 0x75, 0x69, 0x6c, 0x74, 0x2d, 0x69, 0x6e, 0x20,
-		0x60, 0x66, 0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x60, 0x2c, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x73, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x72,
-		0x61, 0x77, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x2e, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74,
-		0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41,
-		0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73,
-		0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x66, 0x6f, 0x72,
-		0x45, 0x61, 0x63, 0x68, 0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61,
-		0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x65, 0x61, 0x63, 0x68, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x65,
-		0x61, 0x63, 0x68, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x66, 0x6f, 0x72, 0x45,
-		0x61, 0x63, 0x68, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-		0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-		0x46, 0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x20, 0x26, 0x26, 0x20, 0x6f,
-		0x62, 0x6a, 0x2e, 0x66, 0x6f, 0x72, 0x45, 0x61, 0x63, 0x68, 0x20, 0x3d,
-		0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x46, 0x6f, 0x72,
-		0x45, 0x61, 0x63, 0x68, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x66, 0x6f, 0x72, 0x45, 0x61, 0x63,
-		0x68, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x2b, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x69, 0x20,
-		0x3d, 0x20, 0x30, 0x2c, 0x20, 0x6c, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a,
-		0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b, 0x20, 0x69, 0x20, 0x3c,
-		0x20, 0x6c, 0x3b, 0x20, 0x69, 0x2b, 0x2b, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x6f, 0x62,
-		0x6a, 0x5b, 0x69, 0x5d, 0x2c, 0x20, 0x69, 0x2c, 0x20, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65,
-		0x72, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x6b,
-		0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20,
-		0x6b, 0x65, 0x79, 0x29, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x6f, 0x62, 0x6a,
-		0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x2c, 0x20,
-		0x6f, 0x62, 0x6a, 0x29, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x62, 0x72, 0x65,
-		0x61, 0x6b, 0x65, 0x72, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x61,
-		0x70, 0x70, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x74, 0x6f, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-		0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67,
-		0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43,
-		0x4d, 0x41, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a,
-		0x27, 0x73, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x6d,
-		0x61, 0x70, 0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c,
-		0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d, 0x61,
-		0x70, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-		0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72,
-		0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a,
-		0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61,
-		0x74, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x70, 0x20, 0x26, 0x26, 0x20, 0x6f,
-		0x62, 0x6a, 0x2e, 0x6d, 0x61, 0x70, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e,
-		0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x70, 0x29, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x6d, 0x61, 0x70,
-		0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69,
-		0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5b, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5d, 0x20,
-		0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65,
-		0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-		0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x45, 0x72, 0x72, 0x6f,
-		0x72, 0x20, 0x3d, 0x20, 0x27, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x20,
-		0x6f, 0x66, 0x20, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6e, 0x6f, 0x20, 0x69,
-		0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x27, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2a, 0x2a, 0x52,
-		0x65, 0x64, 0x75, 0x63, 0x65, 0x2a, 0x2a, 0x20, 0x62, 0x75, 0x69, 0x6c,
-		0x64, 0x73, 0x20, 0x75, 0x70, 0x20, 0x61, 0x20, 0x73, 0x69, 0x6e, 0x67,
-		0x6c, 0x65, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x66, 0x72,
-		0x6f, 0x6d, 0x20, 0x61, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2c, 0x20, 0x61, 0x6b, 0x61,
-		0x20, 0x60, 0x69, 0x6e, 0x6a, 0x65, 0x63, 0x74, 0x60, 0x2c, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x72, 0x20, 0x60, 0x66, 0x6f, 0x6c, 0x64,
-		0x6c, 0x60, 0x2e, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65,
-		0x73, 0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53,
-		0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20,
-		0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x72, 0x65, 0x64, 0x75,
-		0x63, 0x65, 0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c,
-		0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x72, 0x65,
-		0x64, 0x75, 0x63, 0x65, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x66, 0x6f, 0x6c,
-		0x64, 0x6c, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69, 0x6e, 0x6a, 0x65, 0x63,
-		0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x20, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-		0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3e, 0x20, 0x32, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a,
-		0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x6f, 0x62,
-		0x6a, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65,
-		0x64, 0x75, 0x63, 0x65, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e,
-		0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e,
-		0x61, 0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x62,
-		0x69, 0x6e, 0x64, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
-		0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x3f, 0x20, 0x6f,
-		0x62, 0x6a, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x28, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f,
-		0x29, 0x20, 0x3a, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x72, 0x65, 0x64, 0x75,
-		0x63, 0x65, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73,
-		0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x21, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d,
-		0x65, 0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x69,
-		0x74, 0x69, 0x61, 0x6c, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73,
-		0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x6d, 0x65, 0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x69, 0x6e,
-		0x69, 0x74, 0x69, 0x61, 0x6c, 0x29, 0x20, 0x74, 0x68, 0x72, 0x6f, 0x77,
-		0x20, 0x6e, 0x65, 0x77, 0x20, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72,
-		0x6f, 0x72, 0x28, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x45, 0x72, 0x72,
-		0x6f, 0x72, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x54, 0x68, 0x65,
-		0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x61, 0x73, 0x73, 0x6f, 0x63,
-		0x69, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69,
-		0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65,
-		0x2c, 0x20, 0x61, 0x6c, 0x73, 0x6f, 0x20, 0x6b, 0x6e, 0x6f, 0x77, 0x6e,
-		0x20, 0x61, 0x73, 0x20, 0x60, 0x66, 0x6f, 0x6c, 0x64, 0x72, 0x60, 0x2e,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61,
-		0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d,
-		0x41, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27,
-		0x73, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x72, 0x65,
-		0x64, 0x75, 0x63, 0x65, 0x52, 0x69, 0x67, 0x68, 0x74, 0x60, 0x20, 0x69,
-		0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x52,
-		0x69, 0x67, 0x68, 0x74, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x66, 0x6f, 0x6c,
-		0x64, 0x72, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61,
-		0x6c, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3e, 0x20, 0x32,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62,
-		0x6a, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x6f,
-		0x62, 0x6a, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x52,
-		0x65, 0x64, 0x75, 0x63, 0x65, 0x52, 0x69, 0x67, 0x68, 0x74, 0x20, 0x26,
-		0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65,
-		0x52, 0x69, 0x67, 0x68, 0x74, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61,
-		0x74, 0x69, 0x76, 0x65, 0x52, 0x65, 0x64, 0x75, 0x63, 0x65, 0x52, 0x69,
-		0x67, 0x68, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-		0x29, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d,
-		0x20, 0x5f, 0x2e, 0x62, 0x69, 0x6e, 0x64, 0x28, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-		0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-		0x20, 0x3f, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63,
-		0x65, 0x52, 0x69, 0x67, 0x68, 0x74, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x29, 0x20, 0x3a,
-		0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x52,
-		0x69, 0x67, 0x68, 0x74, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,
-		0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-		0x68, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x21, 0x3d, 0x3d, 0x20, 0x2b, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20,
-		0x3d, 0x20, 0x5f, 0x2e, 0x6b, 0x65, 0x79, 0x73, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x2e, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3d, 0x20,
-		0x6b, 0x65, 0x79, 0x73, 0x20, 0x3f, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x5b,
-		0x2d, 0x2d, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5d, 0x20, 0x3a, 0x20,
-		0x2d, 0x2d, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x69, 0x6e, 0x69,
-		0x74, 0x69, 0x61, 0x6c, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x6f,
-		0x62, 0x6a, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x69, 0x74, 0x69,
-		0x61, 0x6c, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65,
-		0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x2c, 0x20, 0x6f, 0x62,
-		0x6a, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x5d, 0x2c, 0x20, 0x69, 0x6e,
-		0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28,
-		0x21, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x29, 0x20, 0x74, 0x68,
-		0x72, 0x6f, 0x77, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x54, 0x79, 0x70, 0x65,
-		0x45, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65,
-		0x45, 0x72, 0x72, 0x6f, 0x72, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66,
-		0x69, 0x72, 0x73, 0x74, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x77,
-		0x68, 0x69, 0x63, 0x68, 0x20, 0x70, 0x61, 0x73, 0x73, 0x65, 0x73, 0x20,
-		0x61, 0x20, 0x74, 0x72, 0x75, 0x74, 0x68, 0x20, 0x74, 0x65, 0x73, 0x74,
-		0x2e, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x61, 0x73,
-		0x20, 0x60, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x60, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x66, 0x69, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x5f, 0x2e,
-		0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x61, 0x6e, 0x79, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20,
-		0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74,
-		0x65, 0x78, 0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20,
-		0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x72, 0x75, 0x65, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x70, 0x61, 0x73, 0x73, 0x20, 0x61, 0x20, 0x74,
-		0x72, 0x75, 0x74, 0x68, 0x20, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65,
-		0x73, 0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53,
-		0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20,
-		0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x66, 0x69, 0x6c, 0x74,
-		0x65, 0x72, 0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c,
-		0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41,
-		0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x60, 0x73,
-		0x65, 0x6c, 0x65, 0x63, 0x74, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e,
-		0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x73,
-		0x65, 0x6c, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74,
-		0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x3d,
-		0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x74,
-		0x65, 0x72, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x66, 0x69,
-		0x6c, 0x74, 0x65, 0x72, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74,
-		0x69, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x66, 0x69,
-		0x6c, 0x74, 0x65, 0x72, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73,
-		0x74, 0x29, 0x29, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5b,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x6c, 0x65, 0x6e, 0x67,
-		0x74, 0x68, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61,
-		0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65,
-		0x6e, 0x74, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x77, 0x68, 0x69, 0x63,
-		0x68, 0x20, 0x61, 0x20, 0x74, 0x72, 0x75, 0x74, 0x68, 0x20, 0x74, 0x65,
-		0x73, 0x74, 0x20, 0x66, 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x72, 0x65, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x66,
-		0x69, 0x6c, 0x74, 0x65, 0x72, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69,
-		0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x21, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73,
-		0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x74, 0x65,
-		0x72, 0x6d, 0x69, 0x6e, 0x65, 0x20, 0x77, 0x68, 0x65, 0x74, 0x68, 0x65,
-		0x72, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20, 0x6d, 0x61,
-		0x74, 0x63, 0x68, 0x20, 0x61, 0x20, 0x74, 0x72, 0x75, 0x74, 0x68, 0x20,
-		0x74, 0x65, 0x73, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44,
-		0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20,
-		0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-		0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76,
-		0x65, 0x20, 0x60, 0x65, 0x76, 0x65, 0x72, 0x79, 0x60, 0x20, 0x69, 0x66,
-		0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64,
-		0x20, 0x61, 0x73, 0x20, 0x60, 0x61, 0x6c, 0x6c, 0x60, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x3d, 0x20, 0x5f,
-		0x2e, 0x61, 0x6c, 0x6c, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65,
-		0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x7c, 0x7c, 0x20, 0x28, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x5f, 0x2e,
-		0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d,
-		0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-		0x45, 0x76, 0x65, 0x72, 0x79, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a,
-		0x2e, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e,
-		0x61, 0x74, 0x69, 0x76, 0x65, 0x45, 0x76, 0x65, 0x72, 0x79, 0x29, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x65,
-		0x76, 0x65, 0x72, 0x79, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x28, 0x72, 0x65,
-		0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x20, 0x26, 0x26, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69,
-		0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x29,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x62, 0x72, 0x65,
-		0x61, 0x6b, 0x65, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x21, 0x21, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65,
-		0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x65, 0x20, 0x69, 0x66, 0x20, 0x61,
-		0x74, 0x20, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x20, 0x6f, 0x6e, 0x65, 0x20,
-		0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x6e, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6d, 0x61,
-		0x74, 0x63, 0x68, 0x65, 0x73, 0x20, 0x61, 0x20, 0x74, 0x72, 0x75, 0x74,
-		0x68, 0x20, 0x74, 0x65, 0x73, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74,
-		0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69,
-		0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74,
-		0x69, 0x76, 0x65, 0x20, 0x60, 0x73, 0x6f, 0x6d, 0x65, 0x60, 0x20, 0x69,
-		0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65,
-		0x64, 0x20, 0x61, 0x73, 0x20, 0x60, 0x61, 0x6e, 0x79, 0x60, 0x2e, 0x0a,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x3d, 0x20,
-		0x5f, 0x2e, 0x73, 0x6f, 0x6d, 0x65, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x61,
-		0x6e, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x20, 0x7c, 0x7c, 0x20, 0x28, 0x69, 0x74, 0x65,
-		0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69, 0x64,
-		0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20,
-		0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20,
-		0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53,
-		0x6f, 0x6d, 0x65, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x73,
-		0x6f, 0x6d, 0x65, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69,
-		0x76, 0x65, 0x53, 0x6f, 0x6d, 0x65, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x73, 0x6f, 0x6d, 0x65, 0x28,
-		0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73,
-		0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x7c, 0x7c,
-		0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20,
-		0x6c, 0x69, 0x73, 0x74, 0x29, 0x29, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x65, 0x72, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x21, 0x21, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e,
-		0x65, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x20, 0x6f, 0x72, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x61, 0x20,
-		0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20,
-		0x28, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x60, 0x3d, 0x3d, 0x3d, 0x60,
-		0x29, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6c, 0x69, 0x61,
-		0x73, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x60, 0x69, 0x6e, 0x63, 0x6c,
-		0x75, 0x64, 0x65, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x63, 0x6f,
-		0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69,
-		0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x74,
-		0x61, 0x72, 0x67, 0x65, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20,
-		0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e,
-		0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a,
-		0x2e, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x3d, 0x3d, 0x3d,
-		0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78,
-		0x4f, 0x66, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f,
-		0x62, 0x6a, 0x2e, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x28, 0x74,
-		0x61, 0x72, 0x67, 0x65, 0x74, 0x29, 0x20, 0x21, 0x3d, 0x20, 0x2d, 0x31,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x61, 0x6e, 0x79, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d,
-		0x3d, 0x3d, 0x20, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65,
-		0x20, 0x61, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x28, 0x77,
-		0x69, 0x74, 0x68, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x29, 0x20, 0x6f, 0x6e, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20,
-		0x69, 0x74, 0x65, 0x6d, 0x20, 0x69, 0x6e, 0x20, 0x61, 0x20, 0x63, 0x6f,
-		0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x69, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67, 0x73, 0x20,
-		0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20,
-		0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x69, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69,
-		0x73, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6d, 0x65,
-		0x74, 0x68, 0x6f, 0x64, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x6d, 0x61, 0x70, 0x28,
-		0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x28, 0x69, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x20, 0x3f, 0x20, 0x6d, 0x65,
-		0x74, 0x68, 0x6f, 0x64, 0x20, 0x3a, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x5b, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x5d, 0x29, 0x2e, 0x61, 0x70,
-		0x70, 0x6c, 0x79, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x61,
-		0x72, 0x67, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x63, 0x65,
-		0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20,
-		0x61, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x20, 0x75, 0x73, 0x65,
-		0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x6d, 0x61,
-		0x70, 0x60, 0x3a, 0x20, 0x66, 0x65, 0x74, 0x63, 0x68, 0x69, 0x6e, 0x67,
-		0x20, 0x61, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x70, 0x6c, 0x75, 0x63, 0x6b, 0x20, 0x3d,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x6d,
-		0x61, 0x70, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x7b,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x3b, 0x20, 0x7d, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43,
-		0x6f, 0x6e, 0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x20, 0x76,
-		0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20,
-		0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x20, 0x63,
-		0x61, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x66, 0x69, 0x6c, 0x74,
-		0x65, 0x72, 0x60, 0x3a, 0x20, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69,
-		0x6e, 0x67, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x73, 0x70, 0x65, 0x63,
-		0x69, 0x66, 0x69, 0x63, 0x20, 0x60, 0x6b, 0x65, 0x79, 0x3a, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x60, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x77, 0x68, 0x65, 0x72, 0x65, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x2c, 0x20, 0x66, 0x69, 0x72,
-		0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x5f, 0x2e, 0x69, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x28,
-		0x61, 0x74, 0x74, 0x72, 0x73, 0x29, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x3f, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x20, 0x3a, 0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x5b, 0x66,
-		0x69, 0x72, 0x73, 0x74, 0x20, 0x3f, 0x20, 0x27, 0x66, 0x69, 0x6e, 0x64,
-		0x27, 0x20, 0x3a, 0x20, 0x27, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x27,
-		0x5d, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28,
-		0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x61,
-		0x74, 0x74, 0x72, 0x73, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x74, 0x74, 0x72,
-		0x73, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20, 0x21, 0x3d, 0x3d, 0x20, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x72,
-		0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43,
-		0x6f, 0x6e, 0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x20, 0x76,
-		0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20,
-		0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x20, 0x63,
-		0x61, 0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x66, 0x69, 0x6e, 0x64,
-		0x60, 0x3a, 0x20, 0x67, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x73, 0x70, 0x65, 0x63,
-		0x69, 0x66, 0x69, 0x63, 0x20, 0x60, 0x6b, 0x65, 0x79, 0x3a, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x60, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x66, 0x69, 0x6e, 0x64, 0x57, 0x68, 0x65, 0x72,
-		0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x5f, 0x2e, 0x77, 0x68, 0x65, 0x72, 0x65, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x61, 0x74, 0x74, 0x72, 0x73, 0x2c, 0x20, 0x74, 0x72,
-		0x75, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x20, 0x65,
-		0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x28, 0x65,
-		0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65, 0x64,
-		0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-		0x29, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x61, 0x6e, 0x27,
-		0x74, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x69, 0x6e, 0x74,
-		0x65, 0x67, 0x65, 0x72, 0x73, 0x20, 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72,
-		0x20, 0x74, 0x68, 0x61, 0x6e, 0x20, 0x36, 0x35, 0x2c, 0x35, 0x33, 0x35,
-		0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x53, 0x65, 0x65, 0x3a, 0x20, 0x68, 0x74, 0x74,
-		0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x62, 0x75, 0x67, 0x73, 0x2e, 0x77, 0x65,
-		0x62, 0x6b, 0x69, 0x74, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x73, 0x68, 0x6f,
-		0x77, 0x5f, 0x62, 0x75, 0x67, 0x2e, 0x63, 0x67, 0x69, 0x3f, 0x69, 0x64,
-		0x3d, 0x38, 0x30, 0x37, 0x39, 0x37, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d,
-		0x61, 0x78, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28,
-		0x21, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x26, 0x26,
-		0x20, 0x5f, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x30,
-		0x5d, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x2b, 0x6f, 0x62, 0x6a, 0x5b, 0x30,
-		0x5d, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x20, 0x3c, 0x20, 0x36, 0x35, 0x35, 0x33, 0x35, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x6d, 0x61, 0x78,
-		0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x4d, 0x61, 0x74, 0x68, 0x2c,
-		0x20, 0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x26, 0x26, 0x20, 0x5f, 0x2e,
-		0x69, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x28, 0x6f, 0x62, 0x6a, 0x29,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x2d, 0x49, 0x6e,
-		0x66, 0x69, 0x6e, 0x69, 0x74, 0x79, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d,
-		0x20, 0x7b, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x20, 0x3a,
-		0x20, 0x2d, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x79, 0x2c, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x20, 0x2d, 0x49, 0x6e, 0x66, 0x69,
-		0x6e, 0x69, 0x74, 0x79, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
-		0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c,
-		0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x20, 0x3d,
-		0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3f, 0x20,
-		0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c,
-		0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c,
-		0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x3a, 0x20, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f,
-		0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x20, 0x3e, 0x3d, 0x20, 0x72, 0x65,
-		0x73, 0x75, 0x6c, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-		0x64, 0x20, 0x26, 0x26, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-		0x20, 0x3d, 0x20, 0x7b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3a, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75,
-		0x74, 0x65, 0x64, 0x20, 0x3a, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74,
-		0x65, 0x64, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x20, 0x65, 0x6c, 0x65,
-		0x6d, 0x65, 0x6e, 0x74, 0x20, 0x28, 0x6f, 0x72, 0x20, 0x65, 0x6c, 0x65,
-		0x6d, 0x65, 0x6e, 0x74, 0x2d, 0x62, 0x61, 0x73, 0x65, 0x64, 0x20, 0x63,
-		0x6f, 0x6d, 0x70, 0x75, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d, 0x69, 0x6e, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x20, 0x26, 0x26, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x41,
-		0x72, 0x72, 0x61, 0x79, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x26, 0x26,
-		0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x30, 0x5d, 0x20, 0x3d, 0x3d, 0x3d, 0x20,
-		0x2b, 0x6f, 0x62, 0x6a, 0x5b, 0x30, 0x5d, 0x20, 0x26, 0x26, 0x20, 0x6f,
-		0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3c, 0x20,
-		0x36, 0x35, 0x35, 0x33, 0x35, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x4d, 0x61,
-		0x74, 0x68, 0x2e, 0x6d, 0x69, 0x6e, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79,
-		0x28, 0x4d, 0x61, 0x74, 0x68, 0x2c, 0x20, 0x6f, 0x62, 0x6a, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x21, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
-		0x20, 0x26, 0x26, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x45, 0x6d, 0x70, 0x74,
-		0x79, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x79, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x63, 0x6f, 0x6d, 0x70, 0x75,
-		0x74, 0x65, 0x64, 0x20, 0x3a, 0x20, 0x49, 0x6e, 0x66, 0x69, 0x6e, 0x69,
-		0x74, 0x79, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x20, 0x49,
-		0x6e, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x79, 0x7d, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c,
-		0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-		0x64, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
-		0x20, 0x3f, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e,
-		0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-		0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64,
-		0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x3a, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x20, 0x3c, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x75,
-		0x74, 0x65, 0x64, 0x20, 0x26, 0x26, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x20, 0x3d, 0x20, 0x7b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20,
-		0x3a, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x63, 0x6f, 0x6d,
-		0x70, 0x75, 0x74, 0x65, 0x64, 0x20, 0x3a, 0x20, 0x63, 0x6f, 0x6d, 0x70,
-		0x75, 0x74, 0x65, 0x64, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x53, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x20,
-		0x61, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x72, 0x61, 0x6e, 0x64, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3d, 0x20, 0x30, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x68, 0x75,
-		0x66, 0x66, 0x6c, 0x65, 0x64, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6f, 0x62, 0x6a,
-		0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x61, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x72,
-		0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2b,
-		0x2b, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x68,
-		0x75, 0x66, 0x66, 0x6c, 0x65, 0x64, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x20, 0x2d, 0x20, 0x31, 0x5d, 0x20, 0x3d, 0x20, 0x73, 0x68, 0x75, 0x66,
-		0x66, 0x6c, 0x65, 0x64, 0x5b, 0x72, 0x61, 0x6e, 0x64, 0x5d, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c,
-		0x65, 0x64, 0x5b, 0x72, 0x61, 0x6e, 0x64, 0x5d, 0x20, 0x3d, 0x20, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x64, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6e,
-		0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x65,
-		0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x20, 0x6c, 0x6f, 0x6f, 0x6b, 0x75,
-		0x70, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x73, 0x2e,
-		0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c, 0x6f, 0x6f, 0x6b, 0x75,
-		0x70, 0x49, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x46, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29,
-		0x20, 0x3f, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3a, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29,
-		0x7b, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a,
-		0x5b, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5d, 0x3b, 0x20, 0x7d, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x53,
-		0x6f, 0x72, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x27, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20,
-		0x62, 0x79, 0x20, 0x61, 0x20, 0x63, 0x72, 0x69, 0x74, 0x65, 0x72, 0x69,
-		0x6f, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x64, 0x20,
-		0x62, 0x79, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x73, 0x6f, 0x72, 0x74,
-		0x42, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65,
-		0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x6f, 0x6b,
-		0x75, 0x70, 0x49, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x28, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x70, 0x6c, 0x75, 0x63,
-		0x6b, 0x28, 0x5f, 0x2e, 0x6d, 0x61, 0x70, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20,
-		0x6c, 0x69, 0x73, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x20, 0x3a, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20,
-		0x3a, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x72, 0x69, 0x74, 0x65, 0x72, 0x69,
-		0x61, 0x20, 0x3a, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
-		0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-		0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e,
-		0x64, 0x65, 0x78, 0x2c, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x29, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x29, 0x2e, 0x73, 0x6f, 0x72, 0x74, 0x28, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6c, 0x65, 0x66, 0x74, 0x2c, 0x20, 0x72,
-		0x69, 0x67, 0x68, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x20, 0x3d, 0x20, 0x6c, 0x65,
-		0x66, 0x74, 0x2e, 0x63, 0x72, 0x69, 0x74, 0x65, 0x72, 0x69, 0x61, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x62,
-		0x20, 0x3d, 0x20, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2e, 0x63, 0x72, 0x69,
-		0x74, 0x65, 0x72, 0x69, 0x61, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x20, 0x21, 0x3d, 0x3d, 0x20, 0x62,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x61, 0x20, 0x3e, 0x20, 0x62, 0x20, 0x7c, 0x7c,
-		0x20, 0x61, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x76, 0x6f, 0x69, 0x64, 0x20,
-		0x30, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x31, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x61, 0x20, 0x3c, 0x20, 0x62, 0x20, 0x7c, 0x7c, 0x20, 0x62, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x76, 0x6f, 0x69, 0x64, 0x20, 0x30, 0x29, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x2d, 0x31, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6c, 0x65, 0x66, 0x74,
-		0x2e, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3c, 0x20, 0x72, 0x69, 0x67,
-		0x68, 0x74, 0x2e, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3f, 0x20, 0x2d,
-		0x31, 0x20, 0x3a, 0x20, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x29, 0x2c, 0x20, 0x27, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x27, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x41, 0x6e, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x75, 0x73, 0x65,
-		0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-		0x61, 0x74, 0x65, 0x20, 0x22, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x62,
-		0x79, 0x22, 0x20, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-		0x73, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x67, 0x72, 0x6f,
-		0x75, 0x70, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x62,
-		0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x20, 0x3d, 0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
-		0x20, 0x3d, 0x20, 0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x49, 0x74, 0x65,
-		0x72, 0x61, 0x74, 0x6f, 0x72, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20,
-		0x7c, 0x7c, 0x20, 0x5f, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
-		0x79, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e,
-		0x64, 0x65, 0x78, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x3d, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20,
-		0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x28, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x2c, 0x20, 0x76, 0x61,
-		0x6c, 0x75, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x47, 0x72, 0x6f, 0x75,
-		0x70, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x27, 0x73, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x62,
-		0x79, 0x20, 0x61, 0x20, 0x63, 0x72, 0x69, 0x74, 0x65, 0x72, 0x69, 0x6f,
-		0x6e, 0x2e, 0x20, 0x50, 0x61, 0x73, 0x73, 0x20, 0x65, 0x69, 0x74, 0x68,
-		0x65, 0x72, 0x20, 0x61, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20,
-		0x61, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x74, 0x6f, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20,
-		0x62, 0x79, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x61, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63,
-		0x72, 0x69, 0x74, 0x65, 0x72, 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c,
-		0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x28,
-		0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-		0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x3f, 0x20, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20, 0x3a, 0x20, 0x28,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20,
-		0x3d, 0x20, 0x5b, 0x5d, 0x29, 0x29, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x20, 0x69, 0x6e,
-		0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x61,
-		0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x74, 0x68, 0x61,
-		0x74, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x62, 0x79, 0x20, 0x61,
-		0x20, 0x63, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x63, 0x72, 0x69,
-		0x74, 0x65, 0x72, 0x69, 0x6f, 0x6e, 0x2e, 0x20, 0x50, 0x61, 0x73, 0x73,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72,
-		0x20, 0x61, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x74,
-		0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x63,
-		0x6f, 0x75, 0x6e, 0x74, 0x20, 0x62, 0x79, 0x2c, 0x20, 0x6f, 0x72, 0x20,
-		0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20,
-		0x74, 0x68, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x63, 0x72, 0x69,
-		0x74, 0x65, 0x72, 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e,
-		0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x28, 0x6f,
-		0x62, 0x6a, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2c,
-		0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x5f, 0x2e, 0x68, 0x61, 0x73,
-		0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2c, 0x20, 0x6b, 0x65, 0x79,
-		0x29, 0x29, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6b, 0x65,
-		0x79, 0x5d, 0x20, 0x3d, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6b, 0x65, 0x79,
-		0x5d, 0x2b, 0x2b, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x55, 0x73, 0x65, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x20, 0x74, 0x6f, 0x20, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x20,
-		0x6f, 0x75, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x6d, 0x61, 0x6c,
-		0x6c, 0x65, 0x73, 0x74, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x61,
-		0x74, 0x20, 0x77, 0x68, 0x69, 0x63, 0x68, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x73,
-		0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, 0x20, 0x69, 0x6e, 0x73,
-		0x65, 0x72, 0x74, 0x65, 0x64, 0x20, 0x73, 0x6f, 0x20, 0x61, 0x73, 0x20,
-		0x74, 0x6f, 0x20, 0x6d, 0x61, 0x69, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20,
-		0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x20, 0x55, 0x73, 0x65, 0x73, 0x20,
-		0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x73, 0x65, 0x61, 0x72, 0x63,
-		0x68, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x73, 0x6f, 0x72, 0x74, 0x65,
-		0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c,
-		0x20, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x20, 0x3f,
-		0x20, 0x5f, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x20,
-		0x3a, 0x20, 0x6c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x49, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x28, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f,
-		0x72, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x6f, 0x62, 0x6a, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c, 0x6f, 0x77,
-		0x20, 0x3d, 0x20, 0x30, 0x2c, 0x20, 0x68, 0x69, 0x67, 0x68, 0x20, 0x3d,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-		0x68, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65,
-		0x20, 0x28, 0x6c, 0x6f, 0x77, 0x20, 0x3c, 0x20, 0x68, 0x69, 0x67, 0x68,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x6d, 0x69, 0x64, 0x20, 0x3d, 0x20, 0x28, 0x6c, 0x6f, 0x77,
-		0x20, 0x2b, 0x20, 0x68, 0x69, 0x67, 0x68, 0x29, 0x20, 0x3e, 0x3e, 0x3e,
-		0x20, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x5b, 0x6d, 0x69, 0x64, 0x5d, 0x29, 0x20, 0x3c, 0x20, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x20, 0x3f, 0x20, 0x6c, 0x6f, 0x77, 0x20, 0x3d,
-		0x20, 0x6d, 0x69, 0x64, 0x20, 0x2b, 0x20, 0x31, 0x20, 0x3a, 0x20, 0x68,
-		0x69, 0x67, 0x68, 0x20, 0x3d, 0x20, 0x6d, 0x69, 0x64, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x6c, 0x6f, 0x77, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x53, 0x61, 0x66, 0x65,
-		0x6c, 0x79, 0x20, 0x63, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x20, 0x61,
-		0x6e, 0x79, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x62, 0x6c, 0x65, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20, 0x61, 0x20,
-		0x72, 0x65, 0x61, 0x6c, 0x2c, 0x20, 0x6c, 0x69, 0x76, 0x65, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x74, 0x6f,
-		0x41, 0x72, 0x72, 0x61, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5b, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x69,
-		0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x29,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a,
-		0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x3d, 0x3d, 0x20,
-		0x2b, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x29,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x6d, 0x61,
-		0x70, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x5f, 0x2e, 0x69, 0x64, 0x65,
-		0x6e, 0x74, 0x69, 0x74, 0x79, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62,
-		0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
-		0x74, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x73, 0x69, 0x7a,
-		0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-		0x68, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x2b, 0x6f, 0x62, 0x6a, 0x2e, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x29, 0x20, 0x3f, 0x20, 0x6f, 0x62, 0x6a,
-		0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3a, 0x20, 0x5f, 0x2e,
-		0x6b, 0x65, 0x79, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x2e, 0x6c, 0x65,
-		0x6e, 0x67, 0x74, 0x68, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x20, 0x46,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x47, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73,
-		0x74, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x6f, 0x66,
-		0x20, 0x61, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x20, 0x50,
-		0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x2a, 0x2a, 0x6e, 0x2a, 0x2a,
-		0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x4e,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-		0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x2e, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x61,
-		0x73, 0x20, 0x60, 0x68, 0x65, 0x61, 0x64, 0x60, 0x20, 0x61, 0x6e, 0x64,
-		0x20, 0x60, 0x74, 0x61, 0x6b, 0x65, 0x60, 0x2e, 0x20, 0x54, 0x68, 0x65,
-		0x20, 0x2a, 0x2a, 0x67, 0x75, 0x61, 0x72, 0x64, 0x2a, 0x2a, 0x20, 0x63,
-		0x68, 0x65, 0x63, 0x6b, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x61, 0x6c,
-		0x6c, 0x6f, 0x77, 0x73, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x77,
-		0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x60, 0x5f, 0x2e,
-		0x6d, 0x61, 0x70, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x66, 0x69,
-		0x72, 0x73, 0x74, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x68, 0x65, 0x61, 0x64,
-		0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x74, 0x61, 0x6b, 0x65, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x2c, 0x20, 0x6e, 0x2c, 0x20, 0x67, 0x75, 0x61, 0x72, 0x64,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28,
-		0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c,
-		0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x76, 0x6f,
-		0x69, 0x64, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x6e, 0x20, 0x21, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x29, 0x20, 0x26, 0x26, 0x20, 0x21, 0x67, 0x75, 0x61,
-		0x72, 0x64, 0x20, 0x3f, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x30,
-		0x2c, 0x20, 0x6e, 0x29, 0x20, 0x3a, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x5b, 0x30, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20,
-		0x65, 0x76, 0x65, 0x72, 0x79, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x20, 0x62,
-		0x75, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x61, 0x73, 0x74, 0x20,
-		0x65, 0x6e, 0x74, 0x72, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x20, 0x45, 0x73, 0x70, 0x65,
-		0x63, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x75, 0x73, 0x65, 0x66, 0x75,
-		0x6c, 0x20, 0x6f, 0x6e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x20, 0x50, 0x61, 0x73, 0x73,
-		0x69, 0x6e, 0x67, 0x20, 0x2a, 0x2a, 0x6e, 0x2a, 0x2a, 0x20, 0x77, 0x69,
-		0x6c, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x6c,
-		0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-		0x20, 0x69, 0x6e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x65, 0x78, 0x63, 0x6c,
-		0x75, 0x64, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x61,
-		0x73, 0x74, 0x20, 0x4e, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, 0x2a, 0x2a,
-		0x67, 0x75, 0x61, 0x72, 0x64, 0x2a, 0x2a, 0x20, 0x63, 0x68, 0x65, 0x63,
-		0x6b, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x69, 0x74, 0x20,
-		0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, 0x74, 0x68,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x60, 0x5f, 0x2e, 0x6d, 0x61, 0x70,
-		0x60, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x6e, 0x69, 0x74, 0x69,
-		0x61, 0x6c, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x6e, 0x2c, 0x20,
-		0x67, 0x75, 0x61, 0x72, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x2c, 0x20, 0x30, 0x2c, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x2d, 0x20, 0x28, 0x28, 0x6e, 0x20,
-		0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x7c, 0x7c, 0x20,
-		0x67, 0x75, 0x61, 0x72, 0x64, 0x20, 0x3f, 0x20, 0x31, 0x20, 0x3a, 0x20,
-		0x6e, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x47, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x6c, 0x61, 0x73, 0x74, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-		0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x2e, 0x20, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x20, 0x2a, 0x2a,
-		0x6e, 0x2a, 0x2a, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6c, 0x61, 0x73, 0x74,
-		0x20, 0x4e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72,
-		0x72, 0x61, 0x79, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, 0x2a, 0x2a, 0x67,
-		0x75, 0x61, 0x72, 0x64, 0x2a, 0x2a, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b,
-		0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x69, 0x74, 0x20, 0x74,
-		0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
-		0x60, 0x5f, 0x2e, 0x6d, 0x61, 0x70, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x6c, 0x61, 0x73, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20,
-		0x6e, 0x2c, 0x20, 0x67, 0x75, 0x61, 0x72, 0x64, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x76, 0x6f, 0x69, 0x64, 0x20, 0x30,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x28, 0x6e,
-		0x20, 0x21, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x26, 0x26,
-		0x20, 0x21, 0x67, 0x75, 0x61, 0x72, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x6d,
-		0x61, 0x78, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x20, 0x2d, 0x20, 0x6e, 0x2c, 0x20, 0x30, 0x29, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5b, 0x61, 0x72,
-		0x72, 0x61, 0x79, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x2d,
-		0x20, 0x31, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x74,
-		0x68, 0x69, 0x6e, 0x67, 0x20, 0x62, 0x75, 0x74, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x65, 0x6e, 0x74, 0x72, 0x79,
-		0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x2e, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x61,
-		0x73, 0x20, 0x60, 0x74, 0x61, 0x69, 0x6c, 0x60, 0x20, 0x61, 0x6e, 0x64,
-		0x20, 0x60, 0x64, 0x72, 0x6f, 0x70, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x45, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x6c, 0x79,
-		0x20, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x20, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x20, 0x50, 0x61, 0x73,
-		0x73, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x20, 0x2a, 0x2a, 0x6e, 0x2a,
-		0x2a, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72,
-		0x65, 0x73, 0x74, 0x20, 0x4e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-		0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, 0x2a, 0x2a, 0x67, 0x75, 0x61,
-		0x72, 0x64, 0x2a, 0x2a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x63, 0x68,
-		0x65, 0x63, 0x6b, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x20, 0x69,
-		0x74, 0x20, 0x74, 0x6f, 0x20, 0x77, 0x6f, 0x72, 0x6b, 0x20, 0x77, 0x69,
-		0x74, 0x68, 0x20, 0x60, 0x5f, 0x2e, 0x6d, 0x61, 0x70, 0x60, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x72, 0x65, 0x73, 0x74, 0x20, 0x3d, 0x20, 0x5f,
-		0x2e, 0x74, 0x61, 0x69, 0x6c, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x64, 0x72,
-		0x6f, 0x70, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x6e, 0x2c, 0x20,
-		0x67, 0x75, 0x61, 0x72, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x2c, 0x20, 0x28, 0x6e, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c,
-		0x29, 0x20, 0x7c, 0x7c, 0x20, 0x67, 0x75, 0x61, 0x72, 0x64, 0x20, 0x3f,
-		0x20, 0x31, 0x20, 0x3a, 0x20, 0x6e, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x54, 0x72, 0x69, 0x6d,
-		0x20, 0x6f, 0x75, 0x74, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x66, 0x61, 0x6c,
-		0x73, 0x79, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x66, 0x72,
-		0x6f, 0x6d, 0x20, 0x61, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x63, 0x74,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x61, 0x72, 0x72, 0x61, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x66, 0x69,
-		0x6c, 0x74, 0x65, 0x72, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20,
-		0x5f, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x20, 0x69, 0x6d, 0x70,
-		0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20,
-		0x6f, 0x66, 0x20, 0x61, 0x20, 0x72, 0x65, 0x63, 0x75, 0x72, 0x73, 0x69,
-		0x76, 0x65, 0x20, 0x60, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x60,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x69, 0x6e, 0x70, 0x75, 0x74, 0x2c, 0x20, 0x73, 0x68, 0x61, 0x6c, 0x6c,
-		0x6f, 0x77, 0x2c, 0x20, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x69,
-		0x6e, 0x70, 0x75, 0x74, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e,
-		0x69, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x29, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x73, 0x68, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x20, 0x3f, 0x20,
-		0x70, 0x75, 0x73, 0x68, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x6f,
-		0x75, 0x74, 0x70, 0x75, 0x74, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x29, 0x20, 0x3a, 0x20, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x73, 0x68, 0x61, 0x6c, 0x6c,
-		0x6f, 0x77, 0x2c, 0x20, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73,
-		0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f,
-		0x75, 0x74, 0x70, 0x75, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x61, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x6c,
-		0x79, 0x20, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x65, 0x64, 0x20,
-		0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x61,
-		0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x2c, 0x20, 0x73, 0x68, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x28, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x2c, 0x20, 0x73, 0x68, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x2c,
-		0x20, 0x5b, 0x5d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x61, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74,
-		0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x20, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x28, 0x73, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72,
-		0x65, 0x6e, 0x63, 0x65, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20,
-		0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61,
-		0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x20, 0x61, 0x20,
-		0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2d, 0x66, 0x72,
-		0x65, 0x65, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f,
-		0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e,
-		0x20, 0x49, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64,
-		0x79, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x62, 0x65, 0x65, 0x6e, 0x20,
-		0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x79, 0x6f, 0x75, 0x20,
-		0x68, 0x61, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x70, 0x74,
-		0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x75, 0x73, 0x69, 0x6e, 0x67,
-		0x20, 0x61, 0x20, 0x66, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x61, 0x6c,
-		0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x2e, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x65, 0x64, 0x20, 0x61, 0x73,
-		0x20, 0x60, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x60, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x75, 0x6e, 0x69, 0x71, 0x20, 0x3d, 0x20, 0x5f, 0x2e,
-		0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c,
-		0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x2c, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x69, 0x73, 0x46, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65,
-		0x64, 0x29, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x69, 0x74,
-		0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3d,
-		0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65,
-		0x64, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x3d, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x3f, 0x20, 0x5f, 0x2e,
-		0x6d, 0x61, 0x70, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x69,
-		0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x3a, 0x20, 0x61, 0x72, 0x72, 0x61,
-		0x79, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72,
-		0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x73, 0x65, 0x65,
-		0x6e, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x28, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-		0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76,
-		0x61, 0x6c, 0x75, 0x65, 0x2c, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x20, 0x3f, 0x20,
-		0x28, 0x21, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x7c, 0x7c, 0x20, 0x73,
-		0x65, 0x65, 0x6e, 0x5b, 0x73, 0x65, 0x65, 0x6e, 0x2e, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x20, 0x2d, 0x20, 0x31, 0x5d, 0x20, 0x21, 0x3d, 0x3d,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x20, 0x3a, 0x20, 0x21, 0x5f,
-		0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x28, 0x73, 0x65,
-		0x65, 0x6e, 0x2c, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65,
-		0x65, 0x6e, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x2e, 0x70, 0x75, 0x73, 0x68,
-		0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5b, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x5d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x20, 0x61,
-		0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x74, 0x68, 0x61, 0x74,
-		0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x65, 0x61, 0x63,
-		0x68, 0x20, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x20, 0x65,
-		0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20,
-		0x61, 0x6c, 0x6c, 0x20, 0x6f, 0x66, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x2d, 0x69,
-		0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x73, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e,
-		0x75, 0x6e, 0x69, 0x71, 0x28, 0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74, 0x2e,
-		0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50,
-		0x72, 0x6f, 0x74, 0x6f, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
-		0x6e, 0x74, 0x73, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63,
-		0x65, 0x20, 0x61, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
-		0x20, 0x65, 0x76, 0x65, 0x72, 0x79, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20,
-		0x73, 0x68, 0x61, 0x72, 0x65, 0x64, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65,
-		0x65, 0x6e, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x2d, 0x69,
-		0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x73, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x73, 0x65, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x74, 0x20,
-		0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20,
-		0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x28,
-		0x5f, 0x2e, 0x75, 0x6e, 0x69, 0x71, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x29, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x69, 0x74, 0x65, 0x6d, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x65,
-		0x76, 0x65, 0x72, 0x79, 0x28, 0x72, 0x65, 0x73, 0x74, 0x2c, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x74, 0x68, 0x65,
-		0x72, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x69, 0x6e,
-		0x64, 0x65, 0x78, 0x4f, 0x66, 0x28, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x2c,
-		0x20, 0x69, 0x74, 0x65, 0x6d, 0x29, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x54, 0x61, 0x6b, 0x65, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-		0x65, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x6f, 0x6e,
-		0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x61, 0x6e, 0x64, 0x20,
-		0x61, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20,
-		0x6f, 0x74, 0x68, 0x65, 0x72, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4f, 0x6e, 0x6c, 0x79, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x20, 0x69, 0x6e, 0x20,
-		0x6a, 0x75, 0x73, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72,
-		0x73, 0x74, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x77, 0x69, 0x6c,
-		0x6c, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x61, 0x72, 0x72, 0x61, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x74, 0x20, 0x3d, 0x20,
-		0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79,
-		0x28, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2c,
-		0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31,
-		0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x28,
-		0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x7b, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x21, 0x5f, 0x2e, 0x63, 0x6f,
-		0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x28, 0x72, 0x65, 0x73, 0x74, 0x2c,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29, 0x3b, 0x20, 0x7d, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x5a, 0x69, 0x70, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72,
-		0x20, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x20, 0x6c, 0x69,
-		0x73, 0x74, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20, 0x61, 0x20, 0x73,
-		0x69, 0x6e, 0x67, 0x6c, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20,
-		0x2d, 0x2d, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x20,
-		0x74, 0x68, 0x61, 0x74, 0x20, 0x73, 0x68, 0x61, 0x72, 0x65, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x20, 0x67, 0x6f, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72,
-		0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x7a, 0x69, 0x70, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67,
-		0x73, 0x20, 0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61,
-		0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c,
-		0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x6d, 0x61,
-		0x78, 0x28, 0x5f, 0x2e, 0x70, 0x6c, 0x75, 0x63, 0x6b, 0x28, 0x61, 0x72,
-		0x67, 0x73, 0x2c, 0x20, 0x27, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x27,
-		0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x3d, 0x20, 0x6e, 0x65,
-		0x77, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x6c, 0x65, 0x6e, 0x67,
-		0x74, 0x68, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x30, 0x3b,
-		0x20, 0x69, 0x20, 0x3c, 0x20, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b,
-		0x20, 0x69, 0x2b, 0x2b, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x5b, 0x69, 0x5d,
-		0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x70, 0x6c, 0x75, 0x63, 0x6b, 0x28, 0x61,
-		0x72, 0x67, 0x73, 0x2c, 0x20, 0x22, 0x22, 0x20, 0x2b, 0x20, 0x69, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x73, 0x20,
-		0x6c, 0x69, 0x73, 0x74, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20, 0x6f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x2e, 0x20, 0x50, 0x61, 0x73, 0x73,
-		0x20, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, 0x20, 0x61, 0x20, 0x73, 0x69,
-		0x6e, 0x67, 0x6c, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x6f,
-		0x66, 0x20, 0x60, 0x5b, 0x6b, 0x65, 0x79, 0x2c, 0x20, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x5d, 0x60, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x70, 0x61,
-		0x69, 0x72, 0x73, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x74, 0x77, 0x6f, 0x20,
-		0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73,
-		0x61, 0x6d, 0x65, 0x20, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x2d,
-		0x2d, 0x20, 0x6f, 0x6e, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x6b, 0x65, 0x79,
-		0x73, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6f, 0x6e, 0x65, 0x20, 0x6f,
-		0x66, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63,
-		0x6f, 0x72, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x64, 0x69, 0x6e, 0x67,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6c, 0x69, 0x73, 0x74, 0x2c,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6c, 0x69, 0x73, 0x74, 0x20,
-		0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d,
-		0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x30, 0x2c,
-		0x20, 0x6c, 0x20, 0x3d, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x2e, 0x6c, 0x65,
-		0x6e, 0x67, 0x74, 0x68, 0x3b, 0x20, 0x69, 0x20, 0x3c, 0x20, 0x6c, 0x3b,
-		0x20, 0x69, 0x2b, 0x2b, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6c, 0x69, 0x73, 0x74, 0x5b,
-		0x69, 0x5d, 0x5d, 0x20, 0x3d, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-		0x5b, 0x69, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6c,
-		0x69, 0x73, 0x74, 0x5b, 0x69, 0x5d, 0x5b, 0x30, 0x5d, 0x5d, 0x20, 0x3d,
-		0x20, 0x6c, 0x69, 0x73, 0x74, 0x5b, 0x69, 0x5d, 0x5b, 0x31, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x66, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x20,
-		0x64, 0x6f, 0x65, 0x73, 0x6e, 0x27, 0x74, 0x20, 0x73, 0x75, 0x70, 0x70,
-		0x6c, 0x79, 0x20, 0x75, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x69,
-		0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x28, 0x49, 0x27, 0x6d, 0x20,
-		0x6c, 0x6f, 0x6f, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x74, 0x20, 0x79,
-		0x6f, 0x75, 0x2c, 0x20, 0x2a, 0x2a, 0x4d, 0x53, 0x49, 0x45, 0x2a, 0x2a,
-		0x29, 0x2c, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x77, 0x65, 0x20, 0x6e,
-		0x65, 0x65, 0x64, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-		0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69,
-		0x72, 0x73, 0x74, 0x20, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
-		0x63, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x20, 0x69, 0x6e, 0x20, 0x61, 0x6e,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x2d,
-		0x31, 0x20, 0x69, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x69, 0x74, 0x65,
-		0x6d, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x69, 0x6e, 0x63,
-		0x6c, 0x75, 0x64, 0x65, 0x64, 0x20, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74,
-		0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69,
-		0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74,
-		0x69, 0x76, 0x65, 0x20, 0x60, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66,
-		0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
-		0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x66, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x69, 0x73,
-		0x20, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61,
-		0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x73, 0x6f,
-		0x72, 0x74, 0x20, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2c, 0x20, 0x70, 0x61,
-		0x73, 0x73, 0x20, 0x60, 0x74, 0x72, 0x75, 0x65, 0x60, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x2a, 0x2a, 0x69, 0x73, 0x53,
-		0x6f, 0x72, 0x74, 0x65, 0x64, 0x2a, 0x2a, 0x20, 0x74, 0x6f, 0x20, 0x75,
-		0x73, 0x65, 0x20, 0x62, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x20, 0x73, 0x65,
-		0x61, 0x72, 0x63, 0x68, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x6e,
-		0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20,
-		0x69, 0x74, 0x65, 0x6d, 0x2c, 0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74,
-		0x65, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x3d, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x2d, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x69, 0x20, 0x3d, 0x20, 0x30, 0x2c, 0x20, 0x6c, 0x20, 0x3d, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x73, 0x53,
-		0x6f, 0x72, 0x74, 0x65, 0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x6f,
-		0x66, 0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x20, 0x3d,
-		0x3d, 0x20, 0x27, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x27, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20,
-		0x3d, 0x20, 0x28, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x20,
-		0x3c, 0x20, 0x30, 0x20, 0x3f, 0x20, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x6d,
-		0x61, 0x78, 0x28, 0x30, 0x2c, 0x20, 0x6c, 0x20, 0x2b, 0x20, 0x69, 0x73,
-		0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x29, 0x20, 0x3a, 0x20, 0x69, 0x73,
-		0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x20, 0x3d, 0x20,
-		0x5f, 0x2e, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x64, 0x65,
-		0x78, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2c, 0x20, 0x69, 0x74, 0x65,
-		0x6d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x6d,
-		0x20, 0x3f, 0x20, 0x69, 0x20, 0x3a, 0x20, 0x2d, 0x31, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74,
-		0x69, 0x76, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x26,
-		0x26, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x69, 0x6e, 0x64, 0x65,
-		0x78, 0x4f, 0x66, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69,
-		0x76, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e,
-		0x69, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x28, 0x69, 0x74, 0x65, 0x6d,
-		0x2c, 0x20, 0x69, 0x73, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x3b, 0x20,
-		0x69, 0x20, 0x3c, 0x20, 0x6c, 0x3b, 0x20, 0x69, 0x2b, 0x2b, 0x29, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x5b, 0x69, 0x5d,
-		0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x2d, 0x31, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44,
-		0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20,
-		0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74,
-		0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76,
-		0x65, 0x20, 0x60, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78,
-		0x4f, 0x66, 0x60, 0x20, 0x69, 0x66, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c,
-		0x61, 0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6c, 0x61,
-		0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x2c, 0x20, 0x69, 0x74, 0x65, 0x6d, 0x2c, 0x20, 0x66, 0x72,
-		0x6f, 0x6d, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x3d, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x2d, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x68, 0x61, 0x73, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3d, 0x20, 0x66,
-		0x72, 0x6f, 0x6d, 0x20, 0x21, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6e, 0x61, 0x74,
-		0x69, 0x76, 0x65, 0x4c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78,
-		0x4f, 0x66, 0x20, 0x26, 0x26, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e,
-		0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4c, 0x61,
-		0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x68, 0x61, 0x73, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x20, 0x3f,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c, 0x61, 0x73, 0x74, 0x49,
-		0x6e, 0x64, 0x65, 0x78, 0x4f, 0x66, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x2c,
-		0x20, 0x66, 0x72, 0x6f, 0x6d, 0x29, 0x20, 0x3a, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x2e, 0x6c, 0x61, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78,
-		0x4f, 0x66, 0x28, 0x69, 0x74, 0x65, 0x6d, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x69, 0x20, 0x3d, 0x20, 0x28, 0x68, 0x61, 0x73, 0x49, 0x6e, 0x64, 0x65,
-		0x78, 0x20, 0x3f, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x3a, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20,
-		0x28, 0x69, 0x2d, 0x2d, 0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x72,
-		0x72, 0x61, 0x79, 0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x69,
-		0x74, 0x65, 0x6d, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x69, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x2d, 0x31, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-		0x65, 0x20, 0x61, 0x6e, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72,
-		0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-		0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e, 0x20, 0x61, 0x72, 0x69,
-		0x74, 0x68, 0x6d, 0x65, 0x74, 0x69, 0x63, 0x20, 0x70, 0x72, 0x6f, 0x67,
-		0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x20, 0x41, 0x20, 0x70,
-		0x6f, 0x72, 0x74, 0x20, 0x6f, 0x66, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x50,
-		0x79, 0x74, 0x68, 0x6f, 0x6e, 0x20, 0x60, 0x72, 0x61, 0x6e, 0x67, 0x65,
-		0x28, 0x29, 0x60, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x2e, 0x20, 0x53, 0x65, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x5b,
-		0x74, 0x68, 0x65, 0x20, 0x50, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x20, 0x64,
-		0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-		0x5d, 0x28, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x64, 0x6f, 0x63,
-		0x73, 0x2e, 0x70, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x2e, 0x6f, 0x72, 0x67,
-		0x2f, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x2f, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x23,
-		0x72, 0x61, 0x6e, 0x67, 0x65, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e,
-		0x72, 0x61, 0x6e, 0x67, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x73, 0x74, 0x61, 0x72, 0x74, 0x2c, 0x20,
-		0x73, 0x74, 0x6f, 0x70, 0x2c, 0x20, 0x73, 0x74, 0x65, 0x70, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x6c, 0x65, 0x6e, 0x67,
-		0x74, 0x68, 0x20, 0x3c, 0x3d, 0x20, 0x31, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x3d, 0x20,
-		0x73, 0x74, 0x61, 0x72, 0x74, 0x20, 0x7c, 0x7c, 0x20, 0x30, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20,
-		0x3d, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x73, 0x74, 0x65, 0x70, 0x20, 0x3d, 0x20, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x5b, 0x32, 0x5d, 0x20, 0x7c,
-		0x7c, 0x20, 0x31, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x6c, 0x65, 0x6e, 0x20, 0x3d, 0x20, 0x4d, 0x61, 0x74, 0x68,
-		0x2e, 0x6d, 0x61, 0x78, 0x28, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x63, 0x65,
-		0x69, 0x6c, 0x28, 0x28, 0x73, 0x74, 0x6f, 0x70, 0x20, 0x2d, 0x20, 0x73,
-		0x74, 0x61, 0x72, 0x74, 0x29, 0x20, 0x2f, 0x20, 0x73, 0x74, 0x65, 0x70,
-		0x29, 0x2c, 0x20, 0x30, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x69, 0x64, 0x78, 0x20, 0x3d, 0x20, 0x30, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x61, 0x6e, 0x67,
-		0x65, 0x20, 0x3d, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x41, 0x72, 0x72, 0x61,
-		0x79, 0x28, 0x6c, 0x65, 0x6e, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x28, 0x69, 0x64, 0x78, 0x20, 0x3c,
-		0x20, 0x6c, 0x65, 0x6e, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5b, 0x69, 0x64, 0x78, 0x2b,
-		0x2b, 0x5d, 0x20, 0x3d, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x74, 0x61, 0x72, 0x74, 0x20,
-		0x2b, 0x3d, 0x20, 0x73, 0x74, 0x65, 0x70, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x46, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x28, 0x61, 0x68, 0x65, 0x6d, 0x29,
-		0x20, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x20,
-		0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x62,
-		0x6f, 0x75, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x20, 0x67, 0x69,
-		0x76, 0x65, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x28,
-		0x61, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x60, 0x74,
-		0x68, 0x69, 0x73, 0x60, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x6c, 0x79,
-		0x29, 0x2e, 0x20, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73,
-		0x20, 0x74, 0x6f, 0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63,
-		0x72, 0x69, 0x70, 0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e,
-		0x61, 0x74, 0x69, 0x76, 0x65, 0x20, 0x60, 0x46, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x2e, 0x62, 0x69, 0x6e, 0x64, 0x60, 0x20, 0x69, 0x66,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
-		0x62, 0x6c, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x62, 0x69, 0x6e,
-		0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x2e, 0x62, 0x69, 0x6e, 0x64, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x42, 0x69,
-		0x6e, 0x64, 0x20, 0x26, 0x26, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-		0x42, 0x69, 0x6e, 0x64, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x42, 0x69, 0x6e, 0x64, 0x2e,
-		0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20,
-		0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61,
-		0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61,
-		0x72, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e,
-		0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
-		0x74, 0x73, 0x2c, 0x20, 0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x63, 0x6f, 0x6e, 0x74,
-		0x65, 0x78, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x2e, 0x63, 0x6f,
-		0x6e, 0x63, 0x61, 0x74, 0x28, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x29, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x50, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x6c, 0x79, 0x20, 0x61, 0x70,
-		0x70, 0x6c, 0x79, 0x20, 0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x20, 0x62, 0x79, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69,
-		0x6e, 0x67, 0x20, 0x61, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-		0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x68, 0x61, 0x73, 0x20, 0x68, 0x61,
-		0x64, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x69, 0x74,
-		0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d,
-		0x65, 0x6e, 0x74, 0x73, 0x20, 0x70, 0x72, 0x65, 0x2d, 0x66, 0x69, 0x6c,
-		0x6c, 0x65, 0x64, 0x2c, 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74,
-		0x20, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x74,
-		0x73, 0x20, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x20, 0x60, 0x74,
-		0x68, 0x69, 0x73, 0x60, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-		0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61,
-		0x6c, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67, 0x73, 0x20, 0x3d, 0x20,
-		0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61,
-		0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c,
-		0x79, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73,
-		0x2e, 0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74, 0x28, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d,
-		0x65, 0x6e, 0x74, 0x73, 0x29, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x42, 0x69, 0x6e, 0x64, 0x20, 0x61, 0x6c, 0x6c, 0x20,
-		0x6f, 0x66, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x27, 0x73, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x74,
-		0x6f, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x2e, 0x20, 0x55, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x20, 0x66, 0x6f,
-		0x72, 0x20, 0x65, 0x6e, 0x73, 0x75, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x61, 0x6c, 0x6c,
-		0x20, 0x63, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63, 0x6b, 0x73, 0x20, 0x64,
-		0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x20, 0x6f, 0x6e, 0x20, 0x61, 0x6e,
-		0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x62, 0x65, 0x6c, 0x6f,
-		0x6e, 0x67, 0x20, 0x74, 0x6f, 0x20, 0x69, 0x74, 0x2e, 0x0a, 0x20, 0x20,
-		0x5f, 0x2e, 0x62, 0x69, 0x6e, 0x64, 0x41, 0x6c, 0x6c, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d,
-		0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x2e,
-		0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x30,
-		0x29, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x5f, 0x2e,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x28, 0x6f, 0x62,
-		0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68,
-		0x28, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x29, 0x20, 0x7b, 0x20, 0x6f, 0x62,
-		0x6a, 0x5b, 0x66, 0x5d, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x62, 0x69, 0x6e,
-		0x64, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x66, 0x5d, 0x2c, 0x20, 0x6f, 0x62,
-		0x6a, 0x29, 0x3b, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4d,
-		0x65, 0x6d, 0x6f, 0x69, 0x7a, 0x65, 0x20, 0x61, 0x6e, 0x20, 0x65, 0x78,
-		0x70, 0x65, 0x6e, 0x73, 0x69, 0x76, 0x65, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x20, 0x62, 0x79, 0x20, 0x73, 0x74, 0x6f, 0x72,
-		0x69, 0x6e, 0x67, 0x20, 0x69, 0x74, 0x73, 0x20, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d, 0x65, 0x6d,
-		0x6f, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20, 0x68, 0x61,
-		0x73, 0x68, 0x65, 0x72, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x7b,
-		0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x73, 0x68, 0x65,
-		0x72, 0x20, 0x7c, 0x7c, 0x20, 0x28, 0x68, 0x61, 0x73, 0x68, 0x65, 0x72,
-		0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74,
-		0x79, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x3d, 0x20, 0x68, 0x61, 0x73, 0x68,
-		0x65, 0x72, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x74, 0x68, 0x69,
-		0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28, 0x6d, 0x65,
-		0x6d, 0x6f, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x3f, 0x20, 0x6d,
-		0x65, 0x6d, 0x6f, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20, 0x3a, 0x20, 0x28,
-		0x6d, 0x65, 0x6d, 0x6f, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x74,
-		0x68, 0x69, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
-		0x74, 0x73, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x44, 0x65, 0x6c, 0x61, 0x79, 0x73, 0x20, 0x61, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x6e, 0x75, 0x6d, 0x62,
-		0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73,
-		0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20,
-		0x74, 0x68, 0x65, 0x6e, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x73, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x69, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x20, 0x73, 0x75, 0x70, 0x70, 0x6c, 0x69, 0x65, 0x64, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e,
-		0x63, 0x2c, 0x20, 0x77, 0x61, 0x69, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67, 0x73, 0x20,
-		0x3d, 0x20, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c,
-		0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20,
-		0x32, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x73, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75,
-		0x74, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29,
-		0x7b, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x6e, 0x75, 0x6c, 0x6c,
-		0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x29, 0x3b, 0x20, 0x7d, 0x2c, 0x20,
-		0x77, 0x61, 0x69, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x66, 0x65, 0x72, 0x73,
-		0x20, 0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c,
-		0x20, 0x73, 0x63, 0x68, 0x65, 0x64, 0x75, 0x6c, 0x69, 0x6e, 0x67, 0x20,
-		0x69, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x61, 0x66,
-		0x74, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x75, 0x72, 0x72,
-		0x65, 0x6e, 0x74, 0x20, 0x63, 0x61, 0x6c, 0x6c, 0x20, 0x73, 0x74, 0x61,
-		0x63, 0x6b, 0x20, 0x68, 0x61, 0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x63, 0x6c, 0x65, 0x61, 0x72, 0x65, 0x64, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x64, 0x65, 0x66, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x5f, 0x2e, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x61, 0x70, 0x70,
-		0x6c, 0x79, 0x28, 0x5f, 0x2c, 0x20, 0x5b, 0x66, 0x75, 0x6e, 0x63, 0x2c,
-		0x20, 0x31, 0x5d, 0x2e, 0x63, 0x6f, 0x6e, 0x63, 0x61, 0x74, 0x28, 0x73,
-		0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29, 0x29,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x74, 0x68,
-		0x61, 0x74, 0x2c, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x69, 0x6e, 0x76,
-		0x6f, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x6f,
-		0x6e, 0x6c, 0x79, 0x20, 0x62, 0x65, 0x20, 0x74, 0x72, 0x69, 0x67, 0x67,
-		0x65, 0x72, 0x65, 0x64, 0x20, 0x61, 0x74, 0x20, 0x6d, 0x6f, 0x73, 0x74,
-		0x20, 0x6f, 0x6e, 0x63, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x64,
-		0x75, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65,
-		0x6e, 0x20, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x20, 0x6f, 0x66, 0x20,
-		0x74, 0x69, 0x6d, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x74, 0x68,
-		0x72, 0x6f, 0x74, 0x74, 0x6c, 0x65, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e, 0x63, 0x2c, 0x20,
-		0x77, 0x61, 0x69, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c,
-		0x20, 0x61, 0x72, 0x67, 0x73, 0x2c, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-		0x75, 0x74, 0x2c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x70, 0x72, 0x65, 0x76,
-		0x69, 0x6f, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x72, 0x65,
-		0x76, 0x69, 0x6f, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x6e, 0x65, 0x77, 0x20,
-		0x44, 0x61, 0x74, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x6e, 0x75,
-		0x6c, 0x6c, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e,
-		0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-		0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x6e, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x6e, 0x65, 0x77,
-		0x20, 0x44, 0x61, 0x74, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69,
-		0x6e, 0x67, 0x20, 0x3d, 0x20, 0x77, 0x61, 0x69, 0x74, 0x20, 0x2d, 0x20,
-		0x28, 0x6e, 0x6f, 0x77, 0x20, 0x2d, 0x20, 0x70, 0x72, 0x65, 0x76, 0x69,
-		0x6f, 0x75, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x74, 0x68,
-		0x69, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x72,
-		0x67, 0x73, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e,
-		0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20,
-		0x3c, 0x3d, 0x20, 0x30, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x54, 0x69, 0x6d,
-		0x65, 0x6f, 0x75, 0x74, 0x28, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74,
-		0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x6e, 0x75, 0x6c,
-		0x6c, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70,
-		0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x20, 0x3d, 0x20, 0x6e, 0x6f,
-		0x77, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-		0x78, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x21, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x73, 0x65,
-		0x74, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x28, 0x6c, 0x61, 0x74,
-		0x65, 0x72, 0x2c, 0x20, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e,
-		0x67, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x2c, 0x20, 0x61, 0x73, 0x20, 0x6c, 0x6f, 0x6e, 0x67,
-		0x20, 0x61, 0x73, 0x20, 0x69, 0x74, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x69,
-		0x6e, 0x75, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x62, 0x65, 0x20, 0x69,
-		0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x64, 0x2c, 0x20, 0x77, 0x69, 0x6c, 0x6c,
-		0x20, 0x6e, 0x6f, 0x74, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x62, 0x65,
-		0x20, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x20,
-		0x54, 0x68, 0x65, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, 0x20, 0x63, 0x61, 0x6c,
-		0x6c, 0x65, 0x64, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x69, 0x74,
-		0x20, 0x73, 0x74, 0x6f, 0x70, 0x73, 0x20, 0x62, 0x65, 0x69, 0x6e, 0x67,
-		0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4e, 0x20, 0x6d, 0x69, 0x6c, 0x6c, 0x69,
-		0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x2e, 0x20, 0x49, 0x66, 0x20,
-		0x60, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x60, 0x20,
-		0x69, 0x73, 0x20, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x2c, 0x20, 0x74,
-		0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6c, 0x65, 0x61, 0x64,
-		0x69, 0x6e, 0x67, 0x20, 0x65, 0x64, 0x67, 0x65, 0x2c, 0x20, 0x69, 0x6e,
-		0x73, 0x74, 0x65, 0x61, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x74, 0x72, 0x61, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x64, 0x65, 0x62, 0x6f, 0x75, 0x6e, 0x63, 0x65, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66,
-		0x75, 0x6e, 0x63, 0x2c, 0x20, 0x77, 0x61, 0x69, 0x74, 0x2c, 0x20, 0x69,
-		0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x74, 0x69, 0x6d, 0x65,
-		0x6f, 0x75, 0x74, 0x2c, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x20, 0x3d, 0x20, 0x74, 0x68, 0x69,
-		0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6c, 0x61, 0x74, 0x65, 0x72,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x20, 0x3d, 0x20, 0x6e, 0x75,
-		0x6c, 0x6c, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x21, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61,
-		0x74, 0x65, 0x29, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28,
-		0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67,
-		0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63,
-		0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x77, 0x20, 0x3d, 0x20, 0x69, 0x6d, 0x6d,
-		0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x20, 0x26, 0x26, 0x20, 0x21, 0x74,
-		0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x6f,
-		0x75, 0x74, 0x28, 0x74, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x6f,
-		0x75, 0x74, 0x20, 0x3d, 0x20, 0x73, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65,
-		0x6f, 0x75, 0x74, 0x28, 0x6c, 0x61, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x77,
-		0x61, 0x69, 0x74, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x63, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x77, 0x29,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x63, 0x6f, 0x6e,
-		0x74, 0x65, 0x78, 0x74, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20,
-		0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, 0x20,
-		0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x20, 0x61, 0x74, 0x20,
-		0x6d, 0x6f, 0x73, 0x74, 0x20, 0x6f, 0x6e, 0x65, 0x20, 0x74, 0x69, 0x6d,
-		0x65, 0x2c, 0x20, 0x6e, 0x6f, 0x20, 0x6d, 0x61, 0x74, 0x74, 0x65, 0x72,
-		0x20, 0x68, 0x6f, 0x77, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x66,
-		0x74, 0x65, 0x6e, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, 0x61, 0x6c, 0x6c,
-		0x20, 0x69, 0x74, 0x2e, 0x20, 0x55, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x20,
-		0x66, 0x6f, 0x72, 0x20, 0x6c, 0x61, 0x7a, 0x79, 0x20, 0x69, 0x6e, 0x69,
-		0x74, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6f, 0x6e, 0x63, 0x65, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e,
-		0x63, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x72, 0x61, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65,
-		0x2c, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x61, 0x6e, 0x29, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6d, 0x65, 0x6d, 0x6f, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x61, 0x6e, 0x20, 0x3d, 0x20,
-		0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x6d, 0x65, 0x6d, 0x6f, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e,
-		0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20,
-		0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d,
-		0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6d, 0x65, 0x6d, 0x6f,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73,
-		0x74, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x70,
-		0x61, 0x73, 0x73, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x61, 0x6e, 0x20,
-		0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x74, 0x6f, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x2c, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x69, 0x6e,
-		0x67, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x64, 0x6a,
-		0x75, 0x73, 0x74, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x2c, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x20,
-		0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61,
-		0x66, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-		0x61, 0x6c, 0x6c, 0x79, 0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
-		0x6c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x77, 0x72, 0x61, 0x70, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x66, 0x75, 0x6e, 0x63,
-		0x2c, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61,
-		0x72, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x66, 0x75, 0x6e, 0x63, 0x5d,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x70, 0x75, 0x73, 0x68,
-		0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x61, 0x72, 0x67, 0x73, 0x2c,
-		0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x2e, 0x61, 0x70,
-		0x70, 0x6c, 0x79, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20, 0x61, 0x72,
-		0x67, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x69,
-		0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73,
-		0x69, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x6c,
-		0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x73, 0x2c, 0x20, 0x65, 0x61, 0x63, 0x68, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x69, 0x6e,
-		0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x65,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x73, 0x20, 0x3d, 0x20, 0x61, 0x72, 0x67, 0x75,
-		0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67, 0x73, 0x20, 0x3d, 0x20,
-		0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61,
-		0x72, 0x20, 0x69, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x73, 0x2e,
-		0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x2d, 0x20, 0x31, 0x3b, 0x20,
-		0x69, 0x20, 0x3e, 0x3d, 0x20, 0x30, 0x3b, 0x20, 0x69, 0x2d, 0x2d, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61,
-		0x72, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x66, 0x75, 0x6e, 0x63, 0x73,
-		0x5b, 0x69, 0x5d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x74, 0x68,
-		0x69, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73, 0x29, 0x5d, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x72, 0x67,
-		0x73, 0x5b, 0x30, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20,
-		0x77, 0x69, 0x6c, 0x6c, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x62, 0x65,
-		0x20, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x20, 0x61, 0x66,
-		0x74, 0x65, 0x72, 0x20, 0x62, 0x65, 0x69, 0x6e, 0x67, 0x20, 0x63, 0x61,
-		0x6c, 0x6c, 0x65, 0x64, 0x20, 0x4e, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x74,
-		0x69, 0x6d, 0x65, 0x73, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x69,
-		0x6d, 0x65, 0x73, 0x20, 0x3c, 0x3d, 0x20, 0x30, 0x29, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x28, 0x29, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x2d,
-		0x2d, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x20, 0x3c, 0x20, 0x31, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e, 0x61, 0x70,
-		0x70, 0x6c, 0x79, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20, 0x61, 0x72,
-		0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74,
-		0x72, 0x69, 0x65, 0x76, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x61,
-		0x6d, 0x65, 0x73, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x27, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65,
-		0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f,
-		0x20, 0x2a, 0x2a, 0x45, 0x43, 0x4d, 0x41, 0x53, 0x63, 0x72, 0x69, 0x70,
-		0x74, 0x20, 0x35, 0x2a, 0x2a, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74, 0x69,
-		0x76, 0x65, 0x20, 0x60, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x6b,
-		0x65, 0x79, 0x73, 0x60, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6b, 0x65, 0x79,
-		0x73, 0x20, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4b, 0x65,
-		0x79, 0x73, 0x20, 0x7c, 0x7c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x21, 0x3d,
-		0x3d, 0x20, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x29, 0x20, 0x74, 0x68, 0x72, 0x6f, 0x77, 0x20, 0x6e, 0x65, 0x77,
-		0x20, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x28, 0x27,
-		0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x27, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61,
-		0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28,
-		0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29, 0x20, 0x6b,
-		0x65, 0x79, 0x73, 0x5b, 0x6b, 0x65, 0x79, 0x73, 0x2e, 0x6c, 0x65, 0x6e,
-		0x67, 0x74, 0x68, 0x5d, 0x20, 0x3d, 0x20, 0x6b, 0x65, 0x79, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6b,
-		0x65, 0x79, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x72, 0x69, 0x65, 0x76, 0x65,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20,
-		0x6f, 0x66, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x27, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65,
-		0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x73, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x3d,
-		0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e,
-		0x20, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e,
-		0x68, 0x61, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79,
-		0x29, 0x29, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2e, 0x70, 0x75,
-		0x73, 0x68, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x29,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6e, 0x76,
-		0x65, 0x72, 0x74, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20, 0x61, 0x20, 0x6c, 0x69, 0x73,
-		0x74, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x5b, 0x6b, 0x65, 0x79, 0x2c, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x5d, 0x60, 0x20, 0x70, 0x61, 0x69, 0x72,
-		0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x70, 0x61, 0x69, 0x72, 0x73,
-		0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x20, 0x3d, 0x20, 0x5b,
-		0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28,
-		0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68, 0x61,
-		0x73, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29,
-		0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28,
-		0x5b, 0x6b, 0x65, 0x79, 0x2c, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x6b, 0x65,
-		0x79, 0x5d, 0x5d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x70, 0x61, 0x69, 0x72, 0x73, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49,
-		0x6e, 0x76, 0x65, 0x72, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6b, 0x65,
-		0x79, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x73, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x73, 0x20, 0x6d, 0x75, 0x73, 0x74, 0x20, 0x62, 0x65, 0x20, 0x73,
-		0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x7b,
-		0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28,
-		0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68, 0x61,
-		0x73, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5b, 0x6f, 0x62, 0x6a, 0x5b,
-		0x6b, 0x65, 0x79, 0x5d, 0x5d, 0x20, 0x3d, 0x20, 0x6b, 0x65, 0x79, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x61, 0x20, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x20, 0x6c,
-		0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6e, 0x61, 0x6d, 0x65,
-		0x73, 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x20,
-		0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6c, 0x69, 0x61,
-		0x73, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x60, 0x6d, 0x65, 0x74, 0x68,
-		0x6f, 0x64, 0x73, 0x60, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x6d,
-		0x65, 0x74, 0x68, 0x6f, 0x64, 0x73, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6e, 0x61, 0x6d,
-		0x65, 0x73, 0x20, 0x3d, 0x20, 0x5b, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x6b, 0x65,
-		0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e,
-		0x69, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f,
-		0x62, 0x6a, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x29, 0x29, 0x20, 0x6e, 0x61,
-		0x6d, 0x65, 0x73, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28, 0x6b, 0x65, 0x79,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6e, 0x61, 0x6d, 0x65,
-		0x73, 0x2e, 0x73, 0x6f, 0x72, 0x74, 0x28, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x45, 0x78, 0x74,
-		0x65, 0x6e, 0x64, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
-		0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x20, 0x70, 0x72, 0x6f, 0x70,
-		0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x20, 0x69, 0x6e, 0x20, 0x70, 0x61,
-		0x73, 0x73, 0x65, 0x64, 0x2d, 0x69, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x28, 0x73, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x65,
-		0x78, 0x74, 0x65, 0x6e, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x73, 0x6c, 0x69,
-		0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75,
-		0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29, 0x2c, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x73, 0x6f, 0x75, 0x72,
-		0x63, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f,
-		0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x20,
-		0x69, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6f,
-		0x62, 0x6a, 0x5b, 0x70, 0x72, 0x6f, 0x70, 0x5d, 0x20, 0x3d, 0x20, 0x73,
-		0x6f, 0x75, 0x72, 0x63, 0x65, 0x5b, 0x70, 0x72, 0x6f, 0x70, 0x5d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x61, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x6f, 0x6e,
-		0x6c, 0x79, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e,
-		0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x68, 0x69, 0x74, 0x65, 0x6c,
-		0x69, 0x73, 0x74, 0x65, 0x64, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72,
-		0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x70, 0x69,
-		0x63, 0x6b, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x3d, 0x20,
-		0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x6b, 0x65, 0x79, 0x73, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x6e, 0x63, 0x61,
-		0x74, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x41, 0x72, 0x72, 0x61,
-		0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2c, 0x20, 0x73, 0x6c, 0x69, 0x63,
-		0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d,
-		0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x6b, 0x65, 0x79, 0x73,
-		0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6b,
-		0x65, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f,
-		0x62, 0x6a, 0x29, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x5b, 0x6b, 0x65, 0x79,
-		0x5d, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x6b, 0x65, 0x79, 0x5d,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x63, 0x6f, 0x70,
-		0x79, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x20,
-		0x63, 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68, 0x6f,
-		0x75, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x62, 0x6c, 0x61, 0x63, 0x6b,
-		0x6c, 0x69, 0x73, 0x74, 0x65, 0x64, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65,
-		0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6f,
-		0x6d, 0x69, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x20, 0x3d,
-		0x20, 0x7b, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x3d, 0x20, 0x63, 0x6f, 0x6e, 0x63,
-		0x61, 0x74, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x41, 0x72, 0x72,
-		0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2c, 0x20, 0x73, 0x6c, 0x69,
-		0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67, 0x75,
-		0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31, 0x29, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72,
-		0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x21, 0x5f, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
-		0x28, 0x6b, 0x65, 0x79, 0x73, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29,
-		0x20, 0x63, 0x6f, 0x70, 0x79, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x20, 0x3d,
-		0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x6b, 0x65, 0x79, 0x5d, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x46, 0x69, 0x6c,
-		0x6c, 0x20, 0x69, 0x6e, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e,
-		0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x77, 0x69, 0x74, 0x68,
-		0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x70, 0x72, 0x6f,
-		0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x73, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68,
-		0x28, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x31,
-		0x29, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x73, 0x6f, 0x75, 0x72,
-		0x63, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20, 0x70,
-		0x72, 0x6f, 0x70, 0x20, 0x69, 0x6e, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63,
-		0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x5b, 0x70,
-		0x72, 0x6f, 0x70, 0x5d, 0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c,
-		0x29, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x70, 0x72, 0x6f, 0x70, 0x5d, 0x20,
-		0x3d, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5b, 0x70, 0x72, 0x6f,
-		0x70, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x72, 0x65,
-		0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x28, 0x73, 0x68, 0x61, 0x6c, 0x6c,
-		0x6f, 0x77, 0x2d, 0x63, 0x6c, 0x6f, 0x6e, 0x65, 0x64, 0x29, 0x20, 0x64,
-		0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x6f, 0x66, 0x20,
-		0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x63, 0x6c, 0x6f, 0x6e, 0x65, 0x20, 0x3d, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21,
-		0x5f, 0x2e, 0x69, 0x73, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x28, 0x6f,
-		0x62, 0x6a, 0x29, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x72, 0x61,
-		0x79, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x3f, 0x20, 0x6f, 0x62, 0x6a,
-		0x2e, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x28, 0x29, 0x20, 0x3a, 0x20, 0x5f,
-		0x2e, 0x65, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x28, 0x7b, 0x7d, 0x2c, 0x20,
-		0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x73,
-		0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x65, 0x70, 0x74, 0x6f, 0x72,
-		0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x6f, 0x62, 0x6a, 0x2e,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x54, 0x68, 0x65, 0x20, 0x70, 0x72,
-		0x69, 0x6d, 0x61, 0x72, 0x79, 0x20, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73,
-		0x65, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6d, 0x65,
-		0x74, 0x68, 0x6f, 0x64, 0x20, 0x69, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x22,
-		0x74, 0x61, 0x70, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x22, 0x20, 0x61, 0x20,
-		0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e,
-		0x2c, 0x20, 0x69, 0x6e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x72,
-		0x64, 0x65, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x65, 0x72, 0x66, 0x6f,
-		0x72, 0x6d, 0x20, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-		0x73, 0x20, 0x6f, 0x6e, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65,
-		0x64, 0x69, 0x61, 0x74, 0x65, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-		0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65,
-		0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e,
-		0x74, 0x61, 0x70, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x69, 0x6e, 0x74, 0x65,
-		0x72, 0x63, 0x65, 0x70, 0x74, 0x6f, 0x72, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x63, 0x65, 0x70, 0x74,
-		0x6f, 0x72, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x20, 0x72, 0x65, 0x63,
-		0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61,
-		0x72, 0x69, 0x73, 0x6f, 0x6e, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x60, 0x69, 0x73, 0x45, 0x71,
-		0x75, 0x61, 0x6c, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x65, 0x71, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x61, 0x2c, 0x20, 0x62, 0x2c, 0x20, 0x61, 0x53, 0x74, 0x61,
-		0x63, 0x6b, 0x2c, 0x20, 0x62, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x64, 0x65,
-		0x6e, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x65, 0x71, 0x75, 0x61, 0x6c,
-		0x2e, 0x20, 0x60, 0x30, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x2d, 0x30, 0x60,
-		0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x74, 0x68, 0x65, 0x79, 0x20, 0x61,
-		0x72, 0x65, 0x6e, 0x27, 0x74, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-		0x63, 0x61, 0x6c, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x53, 0x65, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x48, 0x61, 0x72, 0x6d,
-		0x6f, 0x6e, 0x79, 0x20, 0x60, 0x65, 0x67, 0x61, 0x6c, 0x60, 0x20, 0x70,
-		0x72, 0x6f, 0x70, 0x6f, 0x73, 0x61, 0x6c, 0x3a, 0x20, 0x68, 0x74, 0x74,
-		0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x69, 0x6b, 0x69, 0x2e, 0x65, 0x63, 0x6d,
-		0x61, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
-		0x64, 0x6f, 0x6b, 0x75, 0x2e, 0x70, 0x68, 0x70, 0x3f, 0x69, 0x64, 0x3d,
-		0x68, 0x61, 0x72, 0x6d, 0x6f, 0x6e, 0x79, 0x3a, 0x65, 0x67, 0x61, 0x6c,
-		0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x62, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x61, 0x20, 0x21, 0x3d, 0x3d, 0x20, 0x30, 0x20, 0x7c, 0x7c,
-		0x20, 0x31, 0x20, 0x2f, 0x20, 0x61, 0x20, 0x3d, 0x3d, 0x20, 0x31, 0x20,
-		0x2f, 0x20, 0x62, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x41, 0x20, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x20, 0x63, 0x6f, 0x6d,
-		0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x6e,
-		0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x20, 0x62, 0x65, 0x63,
-		0x61, 0x75, 0x73, 0x65, 0x20, 0x60, 0x6e, 0x75, 0x6c, 0x6c, 0x20, 0x3d,
-		0x3d, 0x20, 0x75, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x60,
-		0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x20,
-		0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x20, 0x7c, 0x7c, 0x20, 0x62,
-		0x20, 0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x62,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x55, 0x6e, 0x77,
-		0x72, 0x61, 0x70, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x77, 0x72, 0x61, 0x70,
-		0x70, 0x65, 0x64, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x2e,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x20, 0x69,
-		0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x6f, 0x66, 0x20, 0x5f, 0x29,
-		0x20, 0x61, 0x20, 0x3d, 0x20, 0x61, 0x2e, 0x5f, 0x77, 0x72, 0x61, 0x70,
-		0x70, 0x65, 0x64, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x62, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x6f,
-		0x66, 0x20, 0x5f, 0x29, 0x20, 0x62, 0x20, 0x3d, 0x20, 0x62, 0x2e, 0x5f,
-		0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x20,
-		0x60, 0x5b, 0x5b, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x5d, 0x5d, 0x60, 0x20,
-		0x6e, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65,
-		0x20, 0x3d, 0x20, 0x74, 0x6f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e,
-		0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61,
-		0x6d, 0x65, 0x20, 0x21, 0x3d, 0x20, 0x74, 0x6f, 0x53, 0x74, 0x72, 0x69,
-		0x6e, 0x67, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x62, 0x29, 0x29, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68,
-		0x20, 0x28, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x2c, 0x20, 0x6e, 0x75, 0x6d,
-		0x62, 0x65, 0x72, 0x73, 0x2c, 0x20, 0x64, 0x61, 0x74, 0x65, 0x73, 0x2c,
-		0x20, 0x61, 0x6e, 0x64, 0x20, 0x62, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e,
-		0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72,
-		0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2e,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
-		0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x53, 0x74, 0x72,
-		0x69, 0x6e, 0x67, 0x5d, 0x27, 0x3a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x50, 0x72, 0x69, 0x6d, 0x69, 0x74,
-		0x69, 0x76, 0x65, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x74, 0x68, 0x65,
-		0x69, 0x72, 0x20, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-		0x64, 0x69, 0x6e, 0x67, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20,
-		0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x73, 0x20, 0x61, 0x72, 0x65,
-		0x20, 0x65, 0x71, 0x75, 0x69, 0x76, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x3b,
-		0x20, 0x74, 0x68, 0x75, 0x73, 0x2c, 0x20, 0x60, 0x22, 0x35, 0x22, 0x60,
-		0x20, 0x69, 0x73, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x65, 0x71, 0x75, 0x69, 0x76, 0x61, 0x6c, 0x65, 0x6e,
-		0x74, 0x20, 0x74, 0x6f, 0x20, 0x60, 0x6e, 0x65, 0x77, 0x20, 0x53, 0x74,
-		0x72, 0x69, 0x6e, 0x67, 0x28, 0x22, 0x35, 0x22, 0x29, 0x60, 0x2e, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x61, 0x20, 0x3d, 0x3d, 0x20, 0x53, 0x74, 0x72, 0x69,
-		0x6e, 0x67, 0x28, 0x62, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x20, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x5d, 0x27, 0x3a,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x60, 0x4e, 0x61, 0x4e, 0x60, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x65,
-		0x71, 0x75, 0x69, 0x76, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2c, 0x20, 0x62,
-		0x75, 0x74, 0x20, 0x6e, 0x6f, 0x6e, 0x2d, 0x72, 0x65, 0x66, 0x6c, 0x65,
-		0x78, 0x69, 0x76, 0x65, 0x2e, 0x20, 0x41, 0x6e, 0x20, 0x60, 0x65, 0x67,
-		0x61, 0x6c, 0x60, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73,
-		0x6f, 0x6e, 0x20, 0x69, 0x73, 0x20, 0x70, 0x65, 0x72, 0x66, 0x6f, 0x72,
-		0x6d, 0x65, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72,
-		0x20, 0x6e, 0x75, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x20, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x20, 0x21, 0x3d,
-		0x20, 0x2b, 0x61, 0x20, 0x3f, 0x20, 0x62, 0x20, 0x21, 0x3d, 0x20, 0x2b,
-		0x62, 0x20, 0x3a, 0x20, 0x28, 0x61, 0x20, 0x3d, 0x3d, 0x20, 0x30, 0x20,
-		0x3f, 0x20, 0x31, 0x20, 0x2f, 0x20, 0x61, 0x20, 0x3d, 0x3d, 0x20, 0x31,
-		0x20, 0x2f, 0x20, 0x62, 0x20, 0x3a, 0x20, 0x61, 0x20, 0x3d, 0x3d, 0x20,
-		0x2b, 0x62, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63,
-		0x61, 0x73, 0x65, 0x20, 0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x20, 0x44, 0x61, 0x74, 0x65, 0x5d, 0x27, 0x3a, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20, 0x27, 0x5b, 0x6f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x20, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e,
-		0x5d, 0x27, 0x3a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x65, 0x72, 0x63, 0x65, 0x20, 0x64, 0x61,
-		0x74, 0x65, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x62, 0x6f, 0x6f, 0x6c,
-		0x65, 0x61, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x6e, 0x75, 0x6d, 0x65,
-		0x72, 0x69, 0x63, 0x20, 0x70, 0x72, 0x69, 0x6d, 0x69, 0x74, 0x69, 0x76,
-		0x65, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x2e, 0x20, 0x44, 0x61,
-		0x74, 0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70,
-		0x61, 0x72, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x69,
-		0x72, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
-		0x20, 0x72, 0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x61, 0x74,
-		0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x20, 0x4e, 0x6f, 0x74, 0x65, 0x20, 0x74,
-		0x68, 0x61, 0x74, 0x20, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x20,
-		0x64, 0x61, 0x74, 0x65, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x6d,
-		0x69, 0x6c, 0x6c, 0x69, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x20, 0x72,
-		0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
-		0x6e, 0x73, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x6f, 0x66, 0x20, 0x60, 0x4e, 0x61, 0x4e, 0x60, 0x20, 0x61,
-		0x72, 0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x71, 0x75, 0x69, 0x76,
-		0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x2b, 0x61,
-		0x20, 0x3d, 0x3d, 0x20, 0x2b, 0x62, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x67, 0x45, 0x78, 0x70, 0x73,
-		0x20, 0x61, 0x72, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65,
-		0x64, 0x20, 0x62, 0x79, 0x20, 0x74, 0x68, 0x65, 0x69, 0x72, 0x20, 0x73,
-		0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
-		0x6e, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63, 0x61, 0x73, 0x65,
-		0x20, 0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x52, 0x65,
-		0x67, 0x45, 0x78, 0x70, 0x5d, 0x27, 0x3a, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61,
-		0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x62,
-		0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x26, 0x26, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x61, 0x2e, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20, 0x3d,
-		0x3d, 0x20, 0x62, 0x2e, 0x67, 0x6c, 0x6f, 0x62, 0x61, 0x6c, 0x20, 0x26,
-		0x26, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-		0x6c, 0x69, 0x6e, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x62, 0x2e, 0x6d, 0x75,
-		0x6c, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x26, 0x26, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x61, 0x2e, 0x69, 0x67, 0x6e, 0x6f, 0x72, 0x65, 0x43, 0x61,
-		0x73, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x62, 0x2e, 0x69, 0x67, 0x6e, 0x6f,
-		0x72, 0x65, 0x43, 0x61, 0x73, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x79,
-		0x70, 0x65, 0x6f, 0x66, 0x20, 0x61, 0x20, 0x21, 0x3d, 0x20, 0x27, 0x6f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x27, 0x20, 0x7c, 0x7c, 0x20, 0x74, 0x79,
-		0x70, 0x65, 0x6f, 0x66, 0x20, 0x62, 0x20, 0x21, 0x3d, 0x20, 0x27, 0x6f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x27, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x73, 0x73, 0x75, 0x6d, 0x65, 0x20,
-		0x65, 0x71, 0x75, 0x61, 0x6c, 0x69, 0x74, 0x79, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x63, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x20, 0x73, 0x74, 0x72, 0x75,
-		0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x2e, 0x20, 0x54, 0x68, 0x65, 0x20,
-		0x61, 0x6c, 0x67, 0x6f, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x20, 0x66, 0x6f,
-		0x72, 0x20, 0x64, 0x65, 0x74, 0x65, 0x63, 0x74, 0x69, 0x6e, 0x67, 0x20,
-		0x63, 0x79, 0x63, 0x6c, 0x69, 0x63, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73,
-		0x20, 0x69, 0x73, 0x20, 0x61, 0x64, 0x61, 0x70, 0x74, 0x65, 0x64, 0x20,
-		0x66, 0x72, 0x6f, 0x6d, 0x20, 0x45, 0x53, 0x20, 0x35, 0x2e, 0x31, 0x20,
-		0x73, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x35, 0x2e, 0x31,
-		0x32, 0x2e, 0x33, 0x2c, 0x20, 0x61, 0x62, 0x73, 0x74, 0x72, 0x61, 0x63,
-		0x74, 0x20, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20,
-		0x60, 0x4a, 0x4f, 0x60, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61,
-		0x72, 0x20, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x20, 0x61,
-		0x53, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20,
-		0x28, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x2d, 0x2d, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4c, 0x69,
-		0x6e, 0x65, 0x61, 0x72, 0x20, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x2e,
-		0x20, 0x50, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x6e, 0x63, 0x65,
-		0x20, 0x69, 0x73, 0x20, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x73, 0x65, 0x6c,
-		0x79, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x6f, 0x72, 0x74, 0x69, 0x6f, 0x6e,
-		0x61, 0x6c, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6e, 0x75,
-		0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x20,
-		0x6e, 0x65, 0x73, 0x74, 0x65, 0x64, 0x20, 0x73, 0x74, 0x72, 0x75, 0x63,
-		0x74, 0x75, 0x72, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x61, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x5b,
-		0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5d, 0x20, 0x3d, 0x3d, 0x20, 0x61,
-		0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x62, 0x53, 0x74,
-		0x61, 0x63, 0x6b, 0x5b, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x5d, 0x20,
-		0x3d, 0x3d, 0x20, 0x62, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x64, 0x64, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73,
-		0x74, 0x61, 0x63, 0x6b, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x72, 0x61, 0x76,
-		0x65, 0x72, 0x73, 0x65, 0x64, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x53, 0x74, 0x61, 0x63,
-		0x6b, 0x2e, 0x70, 0x75, 0x73, 0x68, 0x28, 0x61, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x62, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x70, 0x75,
-		0x73, 0x68, 0x28, 0x62, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x20, 0x30, 0x2c,
-		0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x74, 0x72,
-		0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52,
-		0x65, 0x63, 0x75, 0x72, 0x73, 0x69, 0x76, 0x65, 0x6c, 0x79, 0x20, 0x63,
-		0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x61, 0x72, 0x72, 0x61, 0x79,
-		0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x63,
-		0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x3d, 0x20,
-		0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x41, 0x72, 0x72,
-		0x61, 0x79, 0x5d, 0x27, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65,
-		0x20, 0x61, 0x72, 0x72, 0x61, 0x79, 0x20, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-		0x68, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x64, 0x65, 0x74, 0x65, 0x72, 0x6d,
-		0x69, 0x6e, 0x65, 0x20, 0x69, 0x66, 0x20, 0x61, 0x20, 0x64, 0x65, 0x65,
-		0x70, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e,
-		0x20, 0x69, 0x73, 0x20, 0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72,
-		0x79, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x69, 0x7a,
-		0x65, 0x20, 0x3d, 0x20, 0x61, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x20, 0x3d, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x20, 0x3d, 0x3d,
-		0x20, 0x62, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x73,
-		0x75, 0x6c, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x65, 0x70, 0x20, 0x63,
-		0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20, 0x63,
-		0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x20, 0x69, 0x67, 0x6e,
-		0x6f, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x6e, 0x6f, 0x6e, 0x2d, 0x6e, 0x75,
-		0x6d, 0x65, 0x72, 0x69, 0x63, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72,
-		0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x20, 0x28, 0x73, 0x69, 0x7a,
-		0x65, 0x2d, 0x2d, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x21, 0x28, 0x72,
-		0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x65, 0x71, 0x28, 0x61,
-		0x5b, 0x73, 0x69, 0x7a, 0x65, 0x5d, 0x2c, 0x20, 0x62, 0x5b, 0x73, 0x69,
-		0x7a, 0x65, 0x5d, 0x2c, 0x20, 0x61, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x2c,
-		0x20, 0x62, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x29, 0x29, 0x29, 0x20, 0x62,
-		0x72, 0x65, 0x61, 0x6b, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x65, 0x6c, 0x73, 0x65, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x73, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x64,
-		0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x63, 0x6f, 0x6e,
-		0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x20, 0x61, 0x72,
-		0x65, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x71, 0x75, 0x69, 0x76, 0x61,
-		0x6c, 0x65, 0x6e, 0x74, 0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x60, 0x4f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x60, 0x73, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x64, 0x69,
-		0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x20, 0x66, 0x72, 0x61, 0x6d,
-		0x65, 0x73, 0x20, 0x61, 0x72, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x43, 0x74, 0x6f, 0x72, 0x20,
-		0x3d, 0x20, 0x61, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63,
-		0x74, 0x6f, 0x72, 0x2c, 0x20, 0x62, 0x43, 0x74, 0x6f, 0x72, 0x20, 0x3d,
-		0x20, 0x62, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74,
-		0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x61, 0x43, 0x74, 0x6f, 0x72, 0x20, 0x21, 0x3d, 0x3d, 0x20,
-		0x62, 0x43, 0x74, 0x6f, 0x72, 0x20, 0x26, 0x26, 0x20, 0x21, 0x28, 0x5f,
-		0x2e, 0x69, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x61, 0x43, 0x74, 0x6f, 0x72, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x61,
-		0x43, 0x74, 0x6f, 0x72, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63,
-		0x65, 0x6f, 0x66, 0x20, 0x61, 0x43, 0x74, 0x6f, 0x72, 0x29, 0x20, 0x26,
-		0x26, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x2e, 0x69,
-		0x73, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x62, 0x43,
-		0x74, 0x6f, 0x72, 0x29, 0x20, 0x26, 0x26, 0x20, 0x28, 0x62, 0x43, 0x74,
-		0x6f, 0x72, 0x20, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x6f,
-		0x66, 0x20, 0x62, 0x43, 0x74, 0x6f, 0x72, 0x29, 0x29, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x65, 0x70, 0x20, 0x63, 0x6f, 0x6d,
-		0x70, 0x61, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20,
-		0x28, 0x76, 0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20,
-		0x61, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28, 0x61,
-		0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43,
-		0x6f, 0x75, 0x6e, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x78, 0x70,
-		0x65, 0x63, 0x74, 0x65, 0x64, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-		0x20, 0x6f, 0x66, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69,
-		0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x73, 0x69, 0x7a, 0x65, 0x2b, 0x2b, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44,
-		0x65, 0x65, 0x70, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x20, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2e,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x21, 0x28, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20,
-		0x3d, 0x20, 0x5f, 0x2e, 0x68, 0x61, 0x73, 0x28, 0x62, 0x2c, 0x20, 0x6b,
-		0x65, 0x79, 0x29, 0x20, 0x26, 0x26, 0x20, 0x65, 0x71, 0x28, 0x61, 0x5b,
-		0x6b, 0x65, 0x79, 0x5d, 0x2c, 0x20, 0x62, 0x5b, 0x6b, 0x65, 0x79, 0x5d,
-		0x2c, 0x20, 0x61, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x2c, 0x20, 0x62, 0x53,
-		0x74, 0x61, 0x63, 0x6b, 0x29, 0x29, 0x29, 0x20, 0x62, 0x72, 0x65, 0x61,
-		0x6b, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x45, 0x6e, 0x73, 0x75, 0x72, 0x65,
-		0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x62, 0x6f, 0x74, 0x68, 0x20, 0x6f,
-		0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-		0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20,
-		0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x70, 0x72,
-		0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73, 0x2e, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x6b, 0x65, 0x79, 0x20, 0x69,
-		0x6e, 0x20, 0x62, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68,
-		0x61, 0x73, 0x28, 0x62, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x26,
-		0x26, 0x20, 0x21, 0x28, 0x73, 0x69, 0x7a, 0x65, 0x2d, 0x2d, 0x29, 0x29,
-		0x20, 0x62, 0x72, 0x65, 0x61, 0x6b, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x3d, 0x20, 0x21,
-		0x73, 0x69, 0x7a, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x66, 0x69, 0x72, 0x73, 0x74, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x20, 0x74, 0x68, 0x65, 0x20,
-		0x73, 0x74, 0x61, 0x63, 0x6b, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x72, 0x61,
-		0x76, 0x65, 0x72, 0x73, 0x65, 0x64, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x61, 0x53, 0x74, 0x61,
-		0x63, 0x6b, 0x2e, 0x70, 0x6f, 0x70, 0x28, 0x29, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x62, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x2e, 0x70, 0x6f, 0x70,
-		0x28, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x50, 0x65,
-		0x72, 0x66, 0x6f, 0x72, 0x6d, 0x20, 0x61, 0x20, 0x64, 0x65, 0x65, 0x70,
-		0x20, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x69, 0x73, 0x6f, 0x6e, 0x20,
-		0x74, 0x6f, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x20, 0x69, 0x66, 0x20,
-		0x74, 0x77, 0x6f, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x73, 0x20,
-		0x61, 0x72, 0x65, 0x20, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x69, 0x73, 0x45, 0x71, 0x75, 0x61, 0x6c, 0x20, 0x3d,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x61, 0x2c,
-		0x20, 0x62, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
-		0x74, 0x75, 0x72, 0x6e, 0x20, 0x65, 0x71, 0x28, 0x61, 0x2c, 0x20, 0x62,
-		0x2c, 0x20, 0x5b, 0x5d, 0x2c, 0x20, 0x5b, 0x5d, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73,
-		0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x61, 0x72, 0x72,
-		0x61, 0x79, 0x2c, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2c, 0x20,
-		0x6f, 0x72, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x65, 0x6d,
-		0x70, 0x74, 0x79, 0x3f, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x6e,
-		0x20, 0x22, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x20, 0x68, 0x61, 0x73, 0x20, 0x6e, 0x6f, 0x20, 0x65,
-		0x6e, 0x75, 0x6d, 0x65, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x20, 0x6f, 0x77,
-		0x6e, 0x2d, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x69, 0x65, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x45, 0x6d, 0x70, 0x74,
-		0x79, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x5f, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28,
-		0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7c, 0x7c, 0x20, 0x5f, 0x2e, 0x69, 0x73,
-		0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x29,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x2e,
-		0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x30,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76,
-		0x61, 0x72, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x69, 0x6e, 0x20, 0x6f, 0x62,
-		0x6a, 0x29, 0x20, 0x69, 0x66, 0x20, 0x28, 0x5f, 0x2e, 0x68, 0x61, 0x73,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x29, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x66, 0x61, 0x6c, 0x73, 0x65,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x74, 0x72, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67,
-		0x69, 0x76, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x61,
-		0x20, 0x44, 0x4f, 0x4d, 0x20, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-		0x3f, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x45, 0x6c, 0x65, 0x6d,
-		0x65, 0x6e, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x21, 0x21, 0x28,
-		0x6f, 0x62, 0x6a, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x6e,
-		0x6f, 0x64, 0x65, 0x54, 0x79, 0x70, 0x65, 0x20, 0x3d, 0x3d, 0x3d, 0x20,
-		0x31, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65,
-		0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x61, 0x6e, 0x20, 0x61,
-		0x72, 0x72, 0x61, 0x79, 0x3f, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44,
-		0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x20, 0x74, 0x6f, 0x20,
-		0x45, 0x43, 0x4d, 0x41, 0x35, 0x27, 0x73, 0x20, 0x6e, 0x61, 0x74, 0x69,
-		0x76, 0x65, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x2e, 0x69, 0x73, 0x41,
-		0x72, 0x72, 0x61, 0x79, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x41,
-		0x72, 0x72, 0x61, 0x79, 0x20, 0x3d, 0x20, 0x6e, 0x61, 0x74, 0x69, 0x76,
-		0x65, 0x49, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x20, 0x7c, 0x7c, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x74, 0x6f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e,
-		0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x3d, 0x3d,
-		0x20, 0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x41, 0x72,
-		0x72, 0x61, 0x79, 0x5d, 0x27, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67,
-		0x69, 0x76, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-		0x65, 0x20, 0x61, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3f,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x4f, 0x62, 0x6a, 0x65, 0x63,
-		0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x3d,
-		0x3d, 0x3d, 0x20, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x28, 0x6f, 0x62,
-		0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x41, 0x64, 0x64, 0x20, 0x73, 0x6f, 0x6d, 0x65, 0x20,
-		0x69, 0x73, 0x54, 0x79, 0x70, 0x65, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-		0x64, 0x73, 0x3a, 0x20, 0x69, 0x73, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65,
-		0x6e, 0x74, 0x73, 0x2c, 0x20, 0x69, 0x73, 0x46, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x69, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e,
-		0x67, 0x2c, 0x20, 0x69, 0x73, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x2c,
-		0x20, 0x69, 0x73, 0x44, 0x61, 0x74, 0x65, 0x2c, 0x20, 0x69, 0x73, 0x52,
-		0x65, 0x67, 0x45, 0x78, 0x70, 0x2e, 0x0a, 0x20, 0x20, 0x65, 0x61, 0x63,
-		0x68, 0x28, 0x5b, 0x27, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x27, 0x2c, 0x20, 0x27, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x27, 0x2c, 0x20, 0x27, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x27,
-		0x2c, 0x20, 0x27, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x27, 0x2c, 0x20,
-		0x27, 0x44, 0x61, 0x74, 0x65, 0x27, 0x2c, 0x20, 0x27, 0x52, 0x65, 0x67,
-		0x45, 0x78, 0x70, 0x27, 0x5d, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x5f, 0x5b, 0x27, 0x69, 0x73, 0x27, 0x20, 0x2b,
-		0x20, 0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x74, 0x6f, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x3d, 0x3d, 0x20,
-		0x27, 0x5b, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x27, 0x20, 0x2b,
-		0x20, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x2b, 0x20, 0x27, 0x5d, 0x27, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x29,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x44, 0x65, 0x66, 0x69,
-		0x6e, 0x65, 0x20, 0x61, 0x20, 0x66, 0x61, 0x6c, 0x6c, 0x62, 0x61, 0x63,
-		0x6b, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20,
-		0x69, 0x6e, 0x20, 0x62, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x73, 0x20,
-		0x28, 0x61, 0x68, 0x65, 0x6d, 0x2c, 0x20, 0x49, 0x45, 0x29, 0x2c, 0x20,
-		0x77, 0x68, 0x65, 0x72, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x74,
-		0x68, 0x65, 0x72, 0x65, 0x20, 0x69, 0x73, 0x6e, 0x27, 0x74, 0x20, 0x61,
-		0x6e, 0x79, 0x20, 0x69, 0x6e, 0x73, 0x70, 0x65, 0x63, 0x74, 0x61, 0x62,
-		0x6c, 0x65, 0x20, 0x22, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x21, 0x5f, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x67, 0x75,
-		0x6d, 0x65, 0x6e, 0x74, 0x73, 0x28, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
-		0x6e, 0x74, 0x73, 0x29, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x5f, 0x2e, 0x69, 0x73, 0x41, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x21, 0x21, 0x28,
-		0x6f, 0x62, 0x6a, 0x20, 0x26, 0x26, 0x20, 0x5f, 0x2e, 0x68, 0x61, 0x73,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x27, 0x63, 0x61, 0x6c, 0x6c, 0x65,
-		0x65, 0x27, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4f,
-		0x70, 0x74, 0x69, 0x6d, 0x69, 0x7a, 0x65, 0x20, 0x60, 0x69, 0x73, 0x46,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x60, 0x20, 0x69, 0x66, 0x20,
-		0x61, 0x70, 0x70, 0x72, 0x6f, 0x70, 0x72, 0x69, 0x61, 0x74, 0x65, 0x2e,
-		0x0a, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x74, 0x79, 0x70, 0x65, 0x6f,
-		0x66, 0x20, 0x28, 0x2f, 0x2e, 0x2f, 0x29, 0x20, 0x21, 0x3d, 0x3d, 0x20,
-		0x27, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x27, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x46, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x74, 0x79, 0x70, 0x65, 0x6f, 0x66, 0x20, 0x6f, 0x62, 0x6a,
-		0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x27, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x27, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73,
-		0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x65,
-		0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x3f, 0x0a, 0x20, 0x20, 0x5f,
-		0x2e, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x69, 0x73, 0x46, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x28,
-		0x6f, 0x62, 0x6a, 0x29, 0x20, 0x26, 0x26, 0x20, 0x21, 0x69, 0x73, 0x4e,
-		0x61, 0x4e, 0x28, 0x70, 0x61, 0x72, 0x73, 0x65, 0x46, 0x6c, 0x6f, 0x61,
-		0x74, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x76, 0x61, 0x6c,
-		0x75, 0x65, 0x20, 0x60, 0x4e, 0x61, 0x4e, 0x60, 0x3f, 0x20, 0x28, 0x4e,
-		0x61, 0x4e, 0x20, 0x69, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x6f, 0x6e,
-		0x6c, 0x79, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x77, 0x68,
-		0x69, 0x63, 0x68, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74,
-		0x20, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x20, 0x69, 0x74, 0x73, 0x65, 0x6c,
-		0x66, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x4e, 0x61,
-		0x4e, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x4e,
-		0x75, 0x6d, 0x62, 0x65, 0x72, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x26,
-		0x26, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x21, 0x3d, 0x20, 0x2b, 0x6f, 0x62,
-		0x6a, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65, 0x6e,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x61, 0x20, 0x62, 0x6f, 0x6f,
-		0x6c, 0x65, 0x61, 0x6e, 0x3f, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x73,
-		0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x74, 0x72, 0x75,
-		0x65, 0x20, 0x7c, 0x7c, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x3d,
-		0x20, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x20, 0x7c, 0x7c, 0x20, 0x74, 0x6f,
-		0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x6f, 0x62, 0x6a, 0x29, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x5b, 0x6f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x20, 0x42, 0x6f, 0x6f, 0x6c, 0x65, 0x61, 0x6e,
-		0x5d, 0x27, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76, 0x65,
-		0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x65, 0x71, 0x75, 0x61,
-		0x6c, 0x20, 0x74, 0x6f, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x3f, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x69, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x6e,
-		0x75, 0x6c, 0x6c, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x49, 0x73, 0x20, 0x61, 0x20, 0x67, 0x69, 0x76,
-		0x65, 0x6e, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x20,
-		0x75, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x64, 0x3f, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x69, 0x73, 0x55, 0x6e, 0x64, 0x65, 0x66, 0x69, 0x6e,
-		0x65, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6f, 0x62, 0x6a, 0x20,
-		0x3d, 0x3d, 0x3d, 0x20, 0x76, 0x6f, 0x69, 0x64, 0x20, 0x30, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x53,
-		0x68, 0x6f, 0x72, 0x74, 0x63, 0x75, 0x74, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x63, 0x68, 0x65,
-		0x63, 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x66, 0x20, 0x61, 0x6e, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61,
-		0x20, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x20, 0x70, 0x72, 0x6f, 0x70, 0x65,
-		0x72, 0x74, 0x79, 0x20, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x6e, 0x20, 0x69, 0x74, 0x73,
-		0x65, 0x6c, 0x66, 0x20, 0x28, 0x69, 0x6e, 0x20, 0x6f, 0x74, 0x68, 0x65,
-		0x72, 0x20, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x2c, 0x20, 0x6e, 0x6f, 0x74,
-		0x20, 0x6f, 0x6e, 0x20, 0x61, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74,
-		0x79, 0x70, 0x65, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x68, 0x61,
-		0x73, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x2c, 0x20, 0x6b, 0x65, 0x79, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x68, 0x61, 0x73, 0x4f, 0x77, 0x6e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
-		0x74, 0x79, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x6f, 0x62, 0x6a, 0x2c,
-		0x20, 0x6b, 0x65, 0x79, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x55, 0x74, 0x69, 0x6c, 0x69, 0x74,
-		0x79, 0x20, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x75, 0x6e, 0x20, 0x55, 0x6e, 0x64,
-		0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x73, 0x20, 0x69,
-		0x6e, 0x20, 0x2a, 0x6e, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x6c, 0x69, 0x63,
-		0x74, 0x2a, 0x20, 0x6d, 0x6f, 0x64, 0x65, 0x2c, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x60,
-		0x5f, 0x60, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x20,
-		0x74, 0x6f, 0x20, 0x69, 0x74, 0x73, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x20, 0x6f, 0x77, 0x6e,
-		0x65, 0x72, 0x2e, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20,
-		0x61, 0x20, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x20,
-		0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x72,
-		0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-		0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6e, 0x6f, 0x43, 0x6f, 0x6e, 0x66,
-		0x6c, 0x69, 0x63, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x6f, 0x6f, 0x74, 0x2e, 0x5f, 0x20, 0x3d, 0x20, 0x70, 0x72, 0x65,
-		0x76, 0x69, 0x6f, 0x75, 0x73, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63,
-		0x6f, 0x72, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3b, 0x0a, 0x20, 0x20,
-		0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4b, 0x65, 0x65,
-		0x70, 0x20, 0x74, 0x68, 0x65, 0x20, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
-		0x74, 0x79, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20,
-		0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x64,
-		0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61,
-		0x74, 0x6f, 0x72, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x69, 0x64,
-		0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x75, 0x6e, 0x20,
-		0x61, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x2a,
-		0x2a, 0x6e, 0x2a, 0x2a, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6e, 0x2c, 0x20,
-		0x69, 0x74, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x2c, 0x20, 0x63, 0x6f,
-		0x6e, 0x74, 0x65, 0x78, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x63, 0x63, 0x75, 0x6d, 0x20, 0x3d,
-		0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x28, 0x6e, 0x29, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x28, 0x76, 0x61, 0x72, 0x20,
-		0x69, 0x20, 0x3d, 0x20, 0x30, 0x3b, 0x20, 0x69, 0x20, 0x3c, 0x20, 0x6e,
-		0x3b, 0x20, 0x69, 0x2b, 0x2b, 0x29, 0x20, 0x61, 0x63, 0x63, 0x75, 0x6d,
-		0x5b, 0x69, 0x5d, 0x20, 0x3d, 0x20, 0x69, 0x74, 0x65, 0x72, 0x61, 0x74,
-		0x6f, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x63, 0x6f, 0x6e, 0x74,
-		0x65, 0x78, 0x74, 0x2c, 0x20, 0x69, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x63, 0x63, 0x75,
-		0x6d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x61, 0x20, 0x72,
-		0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65,
-		0x72, 0x20, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x20, 0x6d, 0x69,
-		0x6e, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6d, 0x61, 0x78, 0x20, 0x28, 0x69,
-		0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x29, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x20, 0x3d, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6d, 0x69, 0x6e,
-		0x2c, 0x20, 0x6d, 0x61, 0x78, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6d, 0x61, 0x78, 0x20, 0x3d, 0x3d, 0x20,
-		0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x6d, 0x61, 0x78, 0x20, 0x3d, 0x20, 0x6d, 0x69, 0x6e, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x69, 0x6e, 0x20, 0x3d,
-		0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x6d, 0x69, 0x6e,
-		0x20, 0x2b, 0x20, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x66, 0x6c, 0x6f, 0x6f,
-		0x72, 0x28, 0x4d, 0x61, 0x74, 0x68, 0x2e, 0x72, 0x61, 0x6e, 0x64, 0x6f,
-		0x6d, 0x28, 0x29, 0x20, 0x2a, 0x20, 0x28, 0x6d, 0x61, 0x78, 0x20, 0x2d,
-		0x20, 0x6d, 0x69, 0x6e, 0x20, 0x2b, 0x20, 0x31, 0x29, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4c,
-		0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x48, 0x54, 0x4d, 0x4c, 0x20,
-		0x65, 0x6e, 0x74, 0x69, 0x74, 0x69, 0x65, 0x73, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x0a, 0x20,
-		0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4d,
-		0x61, 0x70, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65,
-		0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x27, 0x26, 0x27, 0x3a, 0x20, 0x27, 0x26, 0x61, 0x6d,
-		0x70, 0x3b, 0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x27,
-		0x3c, 0x27, 0x3a, 0x20, 0x27, 0x26, 0x6c, 0x74, 0x3b, 0x27, 0x2c, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x27, 0x3e, 0x27, 0x3a, 0x20, 0x27,
-		0x26, 0x67, 0x74, 0x3b, 0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x27, 0x22, 0x27, 0x3a, 0x20, 0x27, 0x26, 0x71, 0x75, 0x6f, 0x74,
-		0x3b, 0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x22, 0x27,
-		0x22, 0x3a, 0x20, 0x27, 0x26, 0x23, 0x78, 0x32, 0x37, 0x3b, 0x27, 0x2c,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x27, 0x2f, 0x27, 0x3a, 0x20,
-		0x27, 0x26, 0x23, 0x78, 0x32, 0x46, 0x3b, 0x27, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x7d, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x65, 0x6e,
-		0x74, 0x69, 0x74, 0x79, 0x4d, 0x61, 0x70, 0x2e, 0x75, 0x6e, 0x65, 0x73,
-		0x63, 0x61, 0x70, 0x65, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x69, 0x6e, 0x76,
-		0x65, 0x72, 0x74, 0x28, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4d, 0x61,
-		0x70, 0x2e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x29, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x52, 0x65, 0x67, 0x65, 0x78, 0x65, 0x73,
-		0x20, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x6b, 0x65, 0x79, 0x73, 0x20, 0x61, 0x6e, 0x64,
-		0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x73, 0x74,
-		0x65, 0x64, 0x20, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
-		0x6c, 0x79, 0x20, 0x61, 0x62, 0x6f, 0x76, 0x65, 0x2e, 0x0a, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65,
-		0x67, 0x65, 0x78, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x3a, 0x20, 0x20, 0x20,
-		0x6e, 0x65, 0x77, 0x20, 0x52, 0x65, 0x67, 0x45, 0x78, 0x70, 0x28, 0x27,
-		0x5b, 0x27, 0x20, 0x2b, 0x20, 0x5f, 0x2e, 0x6b, 0x65, 0x79, 0x73, 0x28,
-		0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4d, 0x61, 0x70, 0x2e, 0x65, 0x73,
-		0x63, 0x61, 0x70, 0x65, 0x29, 0x2e, 0x6a, 0x6f, 0x69, 0x6e, 0x28, 0x27,
-		0x27, 0x29, 0x20, 0x2b, 0x20, 0x27, 0x5d, 0x27, 0x2c, 0x20, 0x27, 0x67,
-		0x27, 0x29, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x75, 0x6e, 0x65, 0x73,
-		0x63, 0x61, 0x70, 0x65, 0x3a, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x52, 0x65,
-		0x67, 0x45, 0x78, 0x70, 0x28, 0x27, 0x28, 0x27, 0x20, 0x2b, 0x20, 0x5f,
-		0x2e, 0x6b, 0x65, 0x79, 0x73, 0x28, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79,
-		0x4d, 0x61, 0x70, 0x2e, 0x75, 0x6e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65,
-		0x29, 0x2e, 0x6a, 0x6f, 0x69, 0x6e, 0x28, 0x27, 0x7c, 0x27, 0x29, 0x20,
-		0x2b, 0x20, 0x27, 0x29, 0x27, 0x2c, 0x20, 0x27, 0x67, 0x27, 0x29, 0x0a,
-		0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x46,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x6e,
-		0x64, 0x20, 0x75, 0x6e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x69, 0x6e, 0x67,
-		0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x73, 0x20, 0x74, 0x6f, 0x2f,
-		0x66, 0x72, 0x6f, 0x6d, 0x20, 0x48, 0x54, 0x4d, 0x4c, 0x20, 0x69, 0x6e,
-		0x74, 0x65, 0x72, 0x70, 0x6f, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-		0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x65, 0x61, 0x63, 0x68, 0x28, 0x5b, 0x27,
-		0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x27, 0x2c, 0x20, 0x27, 0x75, 0x6e,
-		0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x27, 0x5d, 0x2c, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6d, 0x65, 0x74, 0x68, 0x6f,
-		0x64, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x5b, 0x6d,
-		0x65, 0x74, 0x68, 0x6f, 0x64, 0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-		0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x3d, 0x3d, 0x20,
-		0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e,
-		0x20, 0x27, 0x27, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x28, 0x27, 0x27, 0x20, 0x2b, 0x20,
-		0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x29, 0x2e, 0x72, 0x65, 0x70, 0x6c,
-		0x61, 0x63, 0x65, 0x28, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x52, 0x65,
-		0x67, 0x65, 0x78, 0x65, 0x73, 0x5b, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
-		0x5d, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x6d, 0x61, 0x74, 0x63, 0x68, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x4d, 0x61, 0x70, 0x5b, 0x6d, 0x65,
-		0x74, 0x68, 0x6f, 0x64, 0x5d, 0x5b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5d,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x29, 0x3b,
-		0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x66, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x64, 0x20, 0x70, 0x72, 0x6f,
-		0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x6e,
-		0x20, 0x69, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x20, 0x69, 0x74, 0x3b, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x77, 0x69,
-		0x73, 0x65, 0x2c, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x69,
-		0x74, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x72, 0x65, 0x73, 0x75, 0x6c,
-		0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x70, 0x72, 0x6f,
-		0x70, 0x65, 0x72, 0x74, 0x79, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x69, 0x66, 0x20, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20,
-		0x3d, 0x3d, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x29, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x6e, 0x75, 0x6c, 0x6c, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x20,
-		0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x5b, 0x70, 0x72, 0x6f,
-		0x70, 0x65, 0x72, 0x74, 0x79, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x2e, 0x69, 0x73, 0x46,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x76, 0x61, 0x6c, 0x75,
-		0x65, 0x29, 0x20, 0x3f, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x29, 0x20,
-		0x3a, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x64, 0x64, 0x20,
-		0x79, 0x6f, 0x75, 0x72, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x63, 0x75, 0x73,
-		0x74, 0x6f, 0x6d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x73, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x55, 0x6e, 0x64,
-		0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d, 0x69, 0x78, 0x69,
-		0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x61, 0x63, 0x68, 0x28, 0x5f, 0x2e, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x73, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x2c, 0x20, 0x66,
-		0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6e, 0x61, 0x6d, 0x65,
-		0x29, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x20, 0x3d, 0x20, 0x5f, 0x5b, 0x6e, 0x61,
-		0x6d, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x6e, 0x61,
-		0x6d, 0x65, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f,
-		0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x5b, 0x6e,
-		0x61, 0x6d, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x61, 0x72, 0x67, 0x73,
-		0x20, 0x3d, 0x20, 0x5b, 0x74, 0x68, 0x69, 0x73, 0x2e, 0x5f, 0x77, 0x72,
-		0x61, 0x70, 0x70, 0x65, 0x64, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x70, 0x75, 0x73, 0x68, 0x2e, 0x61, 0x70, 0x70,
-		0x6c, 0x79, 0x28, 0x61, 0x72, 0x67, 0x73, 0x2c, 0x20, 0x61, 0x72, 0x67,
-		0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20,
-		0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28,
-		0x74, 0x68, 0x69, 0x73, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x2e, 0x61,
-		0x70, 0x70, 0x6c, 0x79, 0x28, 0x5f, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x73,
-		0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x47, 0x65, 0x6e, 0x65,
-		0x72, 0x61, 0x74, 0x65, 0x20, 0x61, 0x20, 0x75, 0x6e, 0x69, 0x71, 0x75,
-		0x65, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x65, 0x72, 0x20, 0x69, 0x64,
-		0x20, 0x28, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x20, 0x77, 0x69, 0x74,
-		0x68, 0x69, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x65, 0x6e, 0x74, 0x69,
-		0x72, 0x65, 0x20, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x73, 0x65,
-		0x73, 0x73, 0x69, 0x6f, 0x6e, 0x29, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x55, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x20, 0x66, 0x6f, 0x72, 0x20,
-		0x74, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0x79, 0x20, 0x44, 0x4f,
-		0x4d, 0x20, 0x69, 0x64, 0x73, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x69, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x3d,
-		0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x75, 0x6e, 0x69, 0x71,
-		0x75, 0x65, 0x49, 0x64, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x29, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x64,
-		0x20, 0x3d, 0x20, 0x2b, 0x2b, 0x69, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74,
-		0x65, 0x72, 0x20, 0x2b, 0x20, 0x27, 0x27, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x70, 0x72, 0x65, 0x66,
-		0x69, 0x78, 0x20, 0x3f, 0x20, 0x70, 0x72, 0x65, 0x66, 0x69, 0x78, 0x20,
-		0x2b, 0x20, 0x69, 0x64, 0x20, 0x3a, 0x20, 0x69, 0x64, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x42, 0x79,
-		0x20, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2c, 0x20, 0x55, 0x6e,
-		0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x75, 0x73, 0x65,
-		0x73, 0x20, 0x45, 0x52, 0x42, 0x2d, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x20,
-		0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x64, 0x65, 0x6c,
-		0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x73, 0x2c, 0x20, 0x63, 0x68, 0x61,
-		0x6e, 0x67, 0x65, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x69, 0x6e, 0x67, 0x20, 0x74,
-		0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x73, 0x65, 0x74, 0x74,
-		0x69, 0x6e, 0x67, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x75, 0x73, 0x65, 0x20,
-		0x61, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x20,
-		0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x0a,
-		0x20, 0x20, 0x5f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
-		0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74,
-		0x65, 0x20, 0x20, 0x20, 0x20, 0x3a, 0x20, 0x2f, 0x3c, 0x25, 0x28, 0x5b,
-		0x5c, 0x73, 0x5c, 0x53, 0x5d, 0x2b, 0x3f, 0x29, 0x25, 0x3e, 0x2f, 0x67,
-		0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
-		0x6f, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x3a, 0x20, 0x2f, 0x3c, 0x25, 0x3d,
-		0x28, 0x5b, 0x5c, 0x73, 0x5c, 0x53, 0x5d, 0x2b, 0x3f, 0x29, 0x25, 0x3e,
-		0x2f, 0x67, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x65, 0x73, 0x63, 0x61,
-		0x70, 0x65, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x3a, 0x20, 0x2f, 0x3c,
-		0x25, 0x2d, 0x28, 0x5b, 0x5c, 0x73, 0x5c, 0x53, 0x5d, 0x2b, 0x3f, 0x29,
-		0x25, 0x3e, 0x2f, 0x67, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x57, 0x68, 0x65, 0x6e, 0x20, 0x63, 0x75, 0x73,
-		0x74, 0x6f, 0x6d, 0x69, 0x7a, 0x69, 0x6e, 0x67, 0x20, 0x60, 0x74, 0x65,
-		0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e,
-		0x67, 0x73, 0x60, 0x2c, 0x20, 0x69, 0x66, 0x20, 0x79, 0x6f, 0x75, 0x20,
-		0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x77, 0x61, 0x6e, 0x74, 0x20, 0x74,
-		0x6f, 0x20, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x65, 0x20, 0x61, 0x6e, 0x0a,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x6f,
-		0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x65, 0x76, 0x61, 0x6c,
-		0x75, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x72, 0x20, 0x65, 0x73,
-		0x63, 0x61, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x72, 0x65, 0x67, 0x65, 0x78,
-		0x2c, 0x20, 0x77, 0x65, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x6f, 0x6e,
-		0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x69, 0x73, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65,
-		0x64, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x74, 0x6f, 0x20, 0x6d, 0x61, 0x74,
-		0x63, 0x68, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6e, 0x6f,
-		0x4d, 0x61, 0x74, 0x63, 0x68, 0x20, 0x3d, 0x20, 0x2f, 0x28, 0x2e, 0x29,
-		0x5e, 0x2f, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x43, 0x65,
-		0x72, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63,
-		0x74, 0x65, 0x72, 0x73, 0x20, 0x6e, 0x65, 0x65, 0x64, 0x20, 0x74, 0x6f,
-		0x20, 0x62, 0x65, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x64, 0x20,
-		0x73, 0x6f, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65, 0x79,
-		0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x70, 0x75, 0x74, 0x20,
-		0x69, 0x6e, 0x74, 0x6f, 0x20, 0x61, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x6c, 0x69, 0x74, 0x65, 0x72,
-		0x61, 0x6c, 0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x73,
-		0x63, 0x61, 0x70, 0x65, 0x73, 0x20, 0x3d, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x22, 0x27, 0x22, 0x3a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x22, 0x27, 0x22, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x27, 0x5c, 0x5c,
-		0x27, 0x3a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x27, 0x5c, 0x5c, 0x27, 0x2c,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x27, 0x5c, 0x72, 0x27, 0x3a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x27, 0x72, 0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x27, 0x5c, 0x6e, 0x27, 0x3a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x27, 0x6e,
-		0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x27, 0x5c, 0x74, 0x27, 0x3a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x27, 0x74, 0x27, 0x2c, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x27, 0x5c, 0x75, 0x32, 0x30, 0x32, 0x38, 0x27, 0x3a, 0x20,
-		0x27, 0x75, 0x32, 0x30, 0x32, 0x38, 0x27, 0x2c, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x27, 0x5c, 0x75, 0x32, 0x30, 0x32, 0x39, 0x27, 0x3a, 0x20, 0x27,
-		0x75, 0x32, 0x30, 0x32, 0x39, 0x27, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70,
-		0x65, 0x72, 0x20, 0x3d, 0x20, 0x2f, 0x5c, 0x5c, 0x7c, 0x27, 0x7c, 0x5c,
-		0x72, 0x7c, 0x5c, 0x6e, 0x7c, 0x5c, 0x74, 0x7c, 0x5c, 0x75, 0x32, 0x30,
-		0x32, 0x38, 0x7c, 0x5c, 0x75, 0x32, 0x30, 0x32, 0x39, 0x2f, 0x67, 0x3b,
-		0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x4a, 0x61, 0x76, 0x61, 0x53,
-		0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2d,
-		0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x2c, 0x20,
-		0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x20, 0x74, 0x6f, 0x20, 0x4a,
-		0x6f, 0x68, 0x6e, 0x20, 0x52, 0x65, 0x73, 0x69, 0x67, 0x27, 0x73, 0x20,
-		0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69,
-		0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x55, 0x6e, 0x64,
-		0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x74, 0x65, 0x6d, 0x70,
-		0x6c, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x20, 0x68, 0x61, 0x6e, 0x64, 0x6c,
-		0x65, 0x73, 0x20, 0x61, 0x72, 0x62, 0x69, 0x74, 0x72, 0x61, 0x72, 0x79,
-		0x20, 0x64, 0x65, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x72, 0x73, 0x2c,
-		0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x73, 0x20, 0x77,
-		0x68, 0x69, 0x74, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2c, 0x0a, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x63, 0x6f, 0x72, 0x72,
-		0x65, 0x63, 0x74, 0x6c, 0x79, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65,
-		0x73, 0x20, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x73, 0x20, 0x77, 0x69, 0x74,
-		0x68, 0x69, 0x6e, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x6f, 0x6c,
-		0x61, 0x74, 0x65, 0x64, 0x20, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x0a, 0x20,
-		0x20, 0x5f, 0x2e, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x74,
-		0x65, 0x78, 0x74, 0x2c, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2c, 0x20, 0x73,
-		0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x29, 0x20, 0x7b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x6e, 0x64, 0x65,
-		0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x65, 0x74, 0x74, 0x69,
-		0x6e, 0x67, 0x73, 0x20, 0x3d, 0x20, 0x5f, 0x2e, 0x64, 0x65, 0x66, 0x61,
-		0x75, 0x6c, 0x74, 0x73, 0x28, 0x7b, 0x7d, 0x2c, 0x20, 0x73, 0x65, 0x74,
-		0x74, 0x69, 0x6e, 0x67, 0x73, 0x2c, 0x20, 0x5f, 0x2e, 0x74, 0x65, 0x6d,
-		0x70, 0x6c, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-		0x73, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x43, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x20, 0x64, 0x65, 0x6c, 0x69,
-		0x6d, 0x69, 0x74, 0x65, 0x72, 0x73, 0x20, 0x69, 0x6e, 0x74, 0x6f, 0x20,
-		0x6f, 0x6e, 0x65, 0x20, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x20,
-		0x65, 0x78, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x76,
-		0x69, 0x61, 0x20, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69,
-		0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20,
-		0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x65,
-		0x77, 0x20, 0x52, 0x65, 0x67, 0x45, 0x78, 0x70, 0x28, 0x5b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x28, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-		0x67, 0x73, 0x2e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20, 0x7c, 0x7c,
-		0x20, 0x6e, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x29, 0x2e, 0x73, 0x6f,
-		0x75, 0x72, 0x63, 0x65, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x28, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2e, 0x69, 0x6e,
-		0x74, 0x65, 0x72, 0x70, 0x6f, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x7c, 0x7c,
-		0x20, 0x6e, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x29, 0x2e, 0x73, 0x6f,
-		0x75, 0x72, 0x63, 0x65, 0x2c, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x28, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2e, 0x65, 0x76,
-		0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x20, 0x7c, 0x7c, 0x20, 0x6e, 0x6f,
-		0x4d, 0x61, 0x74, 0x63, 0x68, 0x29, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63,
-		0x65, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5d, 0x2e, 0x6a, 0x6f, 0x69, 0x6e,
-		0x28, 0x27, 0x7c, 0x27, 0x29, 0x20, 0x2b, 0x20, 0x27, 0x7c, 0x24, 0x27,
-		0x2c, 0x20, 0x27, 0x67, 0x27, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x2f, 0x2f, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x20,
-		0x74, 0x68, 0x65, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65,
-		0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2c, 0x20, 0x65, 0x73, 0x63,
-		0x61, 0x70, 0x69, 0x6e, 0x67, 0x20, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
-		0x20, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x73, 0x20, 0x61, 0x70,
-		0x70, 0x72, 0x6f, 0x70, 0x72, 0x69, 0x61, 0x74, 0x65, 0x6c, 0x79, 0x2e,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x69, 0x6e, 0x64,
-		0x65, 0x78, 0x20, 0x3d, 0x20, 0x30, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3d,
-		0x20, 0x22, 0x5f, 0x5f, 0x70, 0x2b, 0x3d, 0x27, 0x22, 0x3b, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x72, 0x65, 0x70, 0x6c,
-		0x61, 0x63, 0x65, 0x28, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x72, 0x2c,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6d, 0x61,
-		0x74, 0x63, 0x68, 0x2c, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x2c,
-		0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x6f, 0x6c, 0x61, 0x74, 0x65,
-		0x2c, 0x20, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x2c, 0x20,
-		0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x2b,
-		0x3d, 0x20, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x73, 0x6c, 0x69, 0x63, 0x65,
-		0x28, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2c, 0x20, 0x6f, 0x66, 0x66, 0x73,
-		0x65, 0x74, 0x29, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x2e, 0x72, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x28, 0x65, 0x73, 0x63,
-		0x61, 0x70, 0x65, 0x72, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
-		0x6f, 0x6e, 0x28, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x29, 0x20, 0x7b, 0x20,
-		0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x27, 0x5c, 0x5c, 0x27, 0x20,
-		0x2b, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x73, 0x5b, 0x6d, 0x61,
-		0x74, 0x63, 0x68, 0x5d, 0x3b, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x0a, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x65, 0x73, 0x63,
-		0x61, 0x70, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x2b, 0x3d,
-		0x20, 0x22, 0x27, 0x2b, 0x5c, 0x6e, 0x28, 0x28, 0x5f, 0x5f, 0x74, 0x3d,
-		0x28, 0x22, 0x20, 0x2b, 0x20, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x20,
-		0x2b, 0x20, 0x22, 0x29, 0x29, 0x3d, 0x3d, 0x6e, 0x75, 0x6c, 0x6c, 0x3f,
-		0x27, 0x27, 0x3a, 0x5f, 0x2e, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x28,
-		0x5f, 0x5f, 0x74, 0x29, 0x29, 0x2b, 0x5c, 0x6e, 0x27, 0x22, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x69, 0x66, 0x20, 0x28, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x70,
-		0x6f, 0x6c, 0x61, 0x74, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20,
-		0x2b, 0x3d, 0x20, 0x22, 0x27, 0x2b, 0x5c, 0x6e, 0x28, 0x28, 0x5f, 0x5f,
-		0x74, 0x3d, 0x28, 0x22, 0x20, 0x2b, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72,
-		0x70, 0x6f, 0x6c, 0x61, 0x74, 0x65, 0x20, 0x2b, 0x20, 0x22, 0x29, 0x29,
-		0x3d, 0x3d, 0x6e, 0x75, 0x6c, 0x6c, 0x3f, 0x27, 0x27, 0x3a, 0x5f, 0x5f,
-		0x74, 0x29, 0x2b, 0x5c, 0x6e, 0x27, 0x22, 0x3b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x7d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
-		0x66, 0x20, 0x28, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61, 0x74, 0x65, 0x29,
-		0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
-		0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x2b, 0x3d, 0x20, 0x22, 0x27, 0x3b,
-		0x5c, 0x6e, 0x22, 0x20, 0x2b, 0x20, 0x65, 0x76, 0x61, 0x6c, 0x75, 0x61,
-		0x74, 0x65, 0x20, 0x2b, 0x20, 0x22, 0x5c, 0x6e, 0x5f, 0x5f, 0x70, 0x2b,
-		0x3d, 0x27, 0x22, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x7d,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x6e, 0x64, 0x65, 0x78,
-		0x20, 0x3d, 0x20, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x20, 0x2b, 0x20,
-		0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,
-		0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75,
-		0x72, 0x6e, 0x20, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x73, 0x6f,
-		0x75, 0x72, 0x63, 0x65, 0x20, 0x2b, 0x3d, 0x20, 0x22, 0x27, 0x3b, 0x5c,
-		0x6e, 0x22, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f, 0x20,
-		0x49, 0x66, 0x20, 0x61, 0x20, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
-		0x65, 0x20, 0x69, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x73, 0x70, 0x65,
-		0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x2c, 0x20, 0x70, 0x6c, 0x61, 0x63,
-		0x65, 0x20, 0x64, 0x61, 0x74, 0x61, 0x20, 0x76, 0x61, 0x6c, 0x75, 0x65,
-		0x73, 0x20, 0x69, 0x6e, 0x20, 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x20, 0x73,
-		0x63, 0x6f, 0x70, 0x65, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66,
-		0x20, 0x28, 0x21, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2e,
-		0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x29, 0x20, 0x73, 0x6f,
-		0x75, 0x72, 0x63, 0x65, 0x20, 0x3d, 0x20, 0x27, 0x77, 0x69, 0x74, 0x68,
-		0x28, 0x6f, 0x62, 0x6a, 0x7c, 0x7c, 0x7b, 0x7d, 0x29, 0x7b, 0x5c, 0x6e,
-		0x27, 0x20, 0x2b, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x2b,
-		0x20, 0x27, 0x7d, 0x5c, 0x6e, 0x27, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3d, 0x20, 0x22, 0x76,
-		0x61, 0x72, 0x20, 0x5f, 0x5f, 0x74, 0x2c, 0x5f, 0x5f, 0x70, 0x3d, 0x27,
-		0x27, 0x2c, 0x5f, 0x5f, 0x6a, 0x3d, 0x41, 0x72, 0x72, 0x61, 0x79, 0x2e,
-		0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x2e, 0x6a, 0x6f,
-		0x69, 0x6e, 0x2c, 0x22, 0x20, 0x2b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x22, 0x70, 0x72, 0x69, 0x6e, 0x74, 0x3d, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x7b, 0x5f, 0x5f, 0x70, 0x2b, 0x3d,
-		0x5f, 0x5f, 0x6a, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x61, 0x72, 0x67,
-		0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2c, 0x27, 0x27, 0x29, 0x3b, 0x7d,
-		0x3b, 0x5c, 0x6e, 0x22, 0x20, 0x2b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x2b, 0x20, 0x22, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f, 0x5f, 0x70, 0x3b, 0x5c, 0x6e,
-		0x22, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x72, 0x79, 0x20,
-		0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x6e, 0x64,
-		0x65, 0x72, 0x20, 0x3d, 0x20, 0x6e, 0x65, 0x77, 0x20, 0x46, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-		0x67, 0x73, 0x2e, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x20,
-		0x7c, 0x7c, 0x20, 0x27, 0x6f, 0x62, 0x6a, 0x27, 0x2c, 0x20, 0x27, 0x5f,
-		0x27, 0x2c, 0x20, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x20, 0x63, 0x61, 0x74, 0x63, 0x68, 0x20,
-		0x28, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x65, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x3d, 0x20, 0x73,
-		0x6f, 0x75, 0x72, 0x63, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x74, 0x68, 0x72, 0x6f, 0x77, 0x20, 0x65, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x64, 0x61, 0x74, 0x61, 0x29, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72,
-		0x6e, 0x20, 0x72, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x28, 0x64, 0x61, 0x74,
-		0x61, 0x2c, 0x20, 0x5f, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76,
-		0x61, 0x72, 0x20, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x20,
-		0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x64,
-		0x61, 0x74, 0x61, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x6e, 0x64,
-		0x65, 0x72, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x74, 0x68, 0x69, 0x73,
-		0x2c, 0x20, 0x64, 0x61, 0x74, 0x61, 0x2c, 0x20, 0x5f, 0x29, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x64, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x73, 0x6f, 0x75,
-		0x72, 0x63, 0x65, 0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x63, 0x6f, 0x6e,
-		0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x63, 0x65, 0x20, 0x66, 0x6f, 0x72,
-		0x20, 0x70, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x61, 0x74,
-		0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x74, 0x65, 0x6d,
-		0x70, 0x6c, 0x61, 0x74, 0x65, 0x2e, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-		0x20, 0x3d, 0x20, 0x27, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x27, 0x20, 0x2b, 0x20, 0x28, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e,
-		0x67, 0x73, 0x2e, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x20,
-		0x7c, 0x7c, 0x20, 0x27, 0x6f, 0x62, 0x6a, 0x27, 0x29, 0x20, 0x2b, 0x20,
-		0x27, 0x29, 0x7b, 0x5c, 0x6e, 0x27, 0x20, 0x2b, 0x20, 0x73, 0x6f, 0x75,
-		0x72, 0x63, 0x65, 0x20, 0x2b, 0x20, 0x27, 0x7d, 0x27, 0x3b, 0x0a, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74,
-		0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x3b, 0x0a, 0x20, 0x20, 0x7d,
-		0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x64, 0x64, 0x20,
-		0x61, 0x20, 0x22, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x22, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x77, 0x68, 0x69, 0x63,
-		0x68, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x67,
-		0x61, 0x74, 0x65, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x77,
-		0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e,
-		0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63,
-		0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x5f,
-		0x28, 0x6f, 0x62, 0x6a, 0x29, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x28,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x4f, 0x4f, 0x50, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x2d,
-		0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
-		0x2d, 0x2d, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x49, 0x66, 0x20, 0x55,
-		0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x69, 0x73,
-		0x20, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x20, 0x61, 0x73, 0x20, 0x61,
-		0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c, 0x20, 0x69,
-		0x74, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61, 0x20,
-		0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x20, 0x6f, 0x62, 0x6a, 0x65,
-		0x63, 0x74, 0x20, 0x74, 0x68, 0x61, 0x74, 0x0a, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x63, 0x61, 0x6e, 0x20, 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x64,
-		0x20, 0x4f, 0x4f, 0x2d, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x2e, 0x20, 0x54,
-		0x68, 0x69, 0x73, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x20,
-		0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x65,
-		0x64, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x6f,
-		0x66, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72,
-		0x65, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
-		0x20, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x20, 0x6f, 0x62, 0x6a,
-		0x65, 0x63, 0x74, 0x73, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x62, 0x65, 0x20,
-		0x63, 0x68, 0x61, 0x69, 0x6e, 0x65, 0x64, 0x2e, 0x0a, 0x0a, 0x20, 0x20,
-		0x2f, 0x2f, 0x20, 0x48, 0x65, 0x6c, 0x70, 0x65, 0x72, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x63, 0x6f,
-		0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e,
-		0x69, 0x6e, 0x67, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64,
-		0x69, 0x61, 0x74, 0x65, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73,
-		0x2e, 0x0a, 0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x72, 0x65, 0x73, 0x75,
-		0x6c, 0x74, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f,
-		0x6e, 0x28, 0x6f, 0x62, 0x6a, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20,
-		0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x69, 0x73,
-		0x2e, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x3f, 0x20, 0x5f, 0x28,
-		0x6f, 0x62, 0x6a, 0x29, 0x2e, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x28, 0x29,
-		0x20, 0x3a, 0x20, 0x6f, 0x62, 0x6a, 0x3b, 0x0a, 0x20, 0x20, 0x7d, 0x3b,
-		0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41, 0x64, 0x64, 0x20, 0x61,
-		0x6c, 0x6c, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x55, 0x6e,
-		0x64, 0x65, 0x72, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x20, 0x66, 0x75, 0x6e,
-		0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x20, 0x6f, 0x62,
-		0x6a, 0x65, 0x63, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x6d, 0x69,
-		0x78, 0x69, 0x6e, 0x28, 0x5f, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f,
-		0x2f, 0x20, 0x41, 0x64, 0x64, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x6d, 0x75,
-		0x74, 0x61, 0x74, 0x6f, 0x72, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f,
-		0x20, 0x74, 0x68, 0x65, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72,
-		0x2e, 0x0a, 0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x5b, 0x27, 0x70,
-		0x6f, 0x70, 0x27, 0x2c, 0x20, 0x27, 0x70, 0x75, 0x73, 0x68, 0x27, 0x2c,
-		0x20, 0x27, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x27, 0x2c, 0x20,
-		0x27, 0x73, 0x68, 0x69, 0x66, 0x74, 0x27, 0x2c, 0x20, 0x27, 0x73, 0x6f,
-		0x72, 0x74, 0x27, 0x2c, 0x20, 0x27, 0x73, 0x70, 0x6c, 0x69, 0x63, 0x65,
-		0x27, 0x2c, 0x20, 0x27, 0x75, 0x6e, 0x73, 0x68, 0x69, 0x66, 0x74, 0x27,
-		0x5d, 0x2c, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28,
-		0x6e, 0x61, 0x6d, 0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x72, 0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x3d,
-		0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5b,
-		0x6e, 0x61, 0x6d, 0x65, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5f,
-		0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x5b, 0x6e,
-		0x61, 0x6d, 0x65, 0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x76, 0x61, 0x72, 0x20, 0x6f, 0x62, 0x6a, 0x20, 0x3d, 0x20,
-		0x74, 0x68, 0x69, 0x73, 0x2e, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65,
-		0x64, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d, 0x65, 0x74,
-		0x68, 0x6f, 0x64, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x28, 0x6f, 0x62,
-		0x6a, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73,
-		0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x66, 0x20,
-		0x28, 0x28, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73,
-		0x68, 0x69, 0x66, 0x74, 0x27, 0x20, 0x7c, 0x7c, 0x20, 0x6e, 0x61, 0x6d,
-		0x65, 0x20, 0x3d, 0x3d, 0x20, 0x27, 0x73, 0x70, 0x6c, 0x69, 0x63, 0x65,
-		0x27, 0x29, 0x20, 0x26, 0x26, 0x20, 0x6f, 0x62, 0x6a, 0x2e, 0x6c, 0x65,
-		0x6e, 0x67, 0x74, 0x68, 0x20, 0x3d, 0x3d, 0x3d, 0x20, 0x30, 0x29, 0x20,
-		0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x5b, 0x30,
-		0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2e, 0x63,
-		0x61, 0x6c, 0x6c, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20, 0x6f, 0x62,
-		0x6a, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a, 0x20,
-		0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x2f, 0x2f, 0x20, 0x41,
-		0x64, 0x64, 0x20, 0x61, 0x6c, 0x6c, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73,
-		0x73, 0x6f, 0x72, 0x20, 0x41, 0x72, 0x72, 0x61, 0x79, 0x20, 0x66, 0x75,
-		0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x74,
-		0x68, 0x65, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x72, 0x2e, 0x0a,
-		0x20, 0x20, 0x65, 0x61, 0x63, 0x68, 0x28, 0x5b, 0x27, 0x63, 0x6f, 0x6e,
-		0x63, 0x61, 0x74, 0x27, 0x2c, 0x20, 0x27, 0x6a, 0x6f, 0x69, 0x6e, 0x27,
-		0x2c, 0x20, 0x27, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x27, 0x5d, 0x2c, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x6e, 0x61, 0x6d,
-		0x65, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x76, 0x61, 0x72,
-		0x20, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x20, 0x3d, 0x20, 0x41, 0x72,
-		0x72, 0x61, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x5b, 0x6e, 0x61, 0x6d,
-		0x65, 0x5d, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x2e, 0x70, 0x72,
-		0x6f, 0x74, 0x6f, 0x74, 0x79, 0x70, 0x65, 0x5b, 0x6e, 0x61, 0x6d, 0x65,
-		0x5d, 0x20, 0x3d, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-		0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72,
-		0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-		0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x74, 0x68, 0x69, 0x73, 0x2c, 0x20,
-		0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x79,
-		0x28, 0x74, 0x68, 0x69, 0x73, 0x2e, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x70,
-		0x65, 0x64, 0x2c, 0x20, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-		0x73, 0x29, 0x29, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x7d, 0x3b, 0x0a,
-		0x20, 0x20, 0x7d, 0x29, 0x3b, 0x0a, 0x0a, 0x20, 0x20, 0x5f, 0x2e, 0x65,
-		0x78, 0x74, 0x65, 0x6e, 0x64, 0x28, 0x5f, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-		0x6f, 0x74, 0x79, 0x70, 0x65, 0x2c, 0x20, 0x7b, 0x0a, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x2f, 0x2f, 0x20, 0x53, 0x74, 0x61, 0x72, 0x74, 0x20, 0x63,
-		0x68, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x20, 0x77, 0x72,
-		0x61, 0x70, 0x70, 0x65, 0x64, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x73,
-		0x63, 0x6f, 0x72, 0x65, 0x20, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x3a, 0x20,
-		0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b,
-		0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x74, 0x68, 0x69, 0x73, 0x2e,
-		0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x20, 0x3d, 0x20, 0x74, 0x72, 0x75,
-		0x65, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65, 0x74,
-		0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x69, 0x73, 0x3b, 0x0a, 0x20, 0x20,
-		0x20, 0x20, 0x7d, 0x2c, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2f, 0x2f,
-		0x20, 0x45, 0x78, 0x74, 0x72, 0x61, 0x63, 0x74, 0x73, 0x20, 0x74, 0x68,
-		0x65, 0x20, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x20, 0x66, 0x72, 0x6f,
-		0x6d, 0x20, 0x61, 0x20, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x20,
-		0x61, 0x6e, 0x64, 0x20, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x65, 0x64, 0x20,
-		0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x20, 0x66, 0x75, 0x6e, 0x63, 0x74,
-		0x69, 0x6f, 0x6e, 0x28, 0x29, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x20, 0x74, 0x68, 0x69,
-		0x73, 0x2e, 0x5f, 0x77, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x3b, 0x0a,
-		0x20, 0x20, 0x20, 0x20, 0x7d, 0x0a, 0x0a, 0x20, 0x20, 0x7d, 0x29, 0x3b,
-		0x0a, 0x0a, 0x7d, 0x29, 0x2e, 0x63, 0x61, 0x6c, 0x6c, 0x28, 0x74, 0x68,
-		0x69, 0x73, 0x29, 0x3b, 0x0a,
-	}
-}
-//     Underscore.js 1.4.4
-//     http://underscorejs.org
-//     (c) 2009-2013 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
diff --git a/vendor/github.com/robertkrimen/otto/underscore/testify b/vendor/github.com/robertkrimen/otto/underscore/testify
deleted file mode 100644
index 4ec27b34a..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore/testify
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $underscore_test = shift @ARGV || "";
-if (!-d $underscore_test) {
-    print <<_END_;
-Usage:
-
-    testify ./underscore/test
-
-    # Should look something like:
-    arrays.js
-    chaining.js
-    collections.js
-    functions.js
-    index.html
-    objects.js
-    speed.js
-    utility.js
-    vendor
-
-_END_
-    if ($underscore_test) {
-        die "!: Not a directory: $underscore_test\n"
-    }
-    exit;
-}
-
-chdir $underscore_test or die "!: $!";
-
-my @js = <*.js>;
-
-for my $file (@js) {
-    open my $fh, '<', $file or die "!: $!";
-    my $tests = join "", <$fh>;
-    my @tests = $tests =~ m/
-        ^(\s{2}test\(.*?
-        ^\s{2}}\);)$
-    /mgxs;
-    close $fh;
-    next unless @tests;
-    print "$file: ", scalar(@tests), "\n";
-    my $underscore_name = "underscore_$file";
-    $underscore_name =~ s/.js$//;
-    my $go_file = "${underscore_name}_test.go";
-    $go_file =~ s/.js$/.go/;
-    open $fh, '>', $go_file or die "!: $!";
-
-    $fh->print(<<_END_);
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-_END_
-
-    my $count = 0;
-    for my $test (@tests) {
-        $test =~ s/`([^`]+)`/<$1>/g;
-        my ($name) = $test =~ m/^\s*test\(['"]([^'"]+)['"]/;
-        $fh->print(<<_END_);
-// $name
-func Test_${underscore_name}_$count(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-$test
-    `)
-}
-
-_END_
-        $count++;
-    }
-}
-
-#  test('#779 - delimeters are applied to unescaped text.', 1, function() {
-#    var template = _.template('<<\nx\n>>', null, {evaluate: /<<(.*?)>>/g});
-#    strictEqual(template(), '<<\nx\n>>');
-#  });
diff --git a/vendor/github.com/robertkrimen/otto/underscore/underscore.go b/vendor/github.com/robertkrimen/otto/underscore/underscore.go
deleted file mode 100644
index 714b8f3cf..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore/underscore.go
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Package underscore contains the source for the JavaScript utility-belt library.
-
-	import (
-		_ "github.com/robertkrimen/otto/underscore"
-	)
-	// Every Otto runtime will now include underscore
-
-http://underscorejs.org
-
-https://github.com/documentcloud/underscore
-
-By importing this package, you'll automatically load underscore every time you create a new Otto runtime.
-
-To prevent this behavior, you can do the following:
-
-	import (
-		"github.com/robertkrimen/otto/underscore"
-	)
-
-	func init() {
-		underscore.Disable()
-	}
-
-*/
-package underscore
-
-import (
-	"github.com/robertkrimen/otto/registry"
-)
-
-var entry *registry.Entry = registry.Register(func() string {
-	return Source()
-})
-
-// Enable underscore runtime inclusion.
-func Enable() {
-	entry.Enable()
-}
-
-// Disable underscore runtime inclusion.
-func Disable() {
-	entry.Disable()
-}
-
-// Source returns the underscore source.
-func Source() string {
-	return string(underscore())
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_arrays_test.go b/vendor/github.com/robertkrimen/otto/underscore_arrays_test.go
deleted file mode 100644
index d105b731a..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_arrays_test.go
+++ /dev/null
@@ -1,345 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// first
-func Test_underscore_arrays_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("first", function() {
-    equal(_.first([1,2,3]), 1, 'can pull out the first element of an array');
-    equal(_([1, 2, 3]).first(), 1, 'can perform OO-style "first()"');
-    equal(_.first([1,2,3], 0).join(', '), "", 'can pass an index to first');
-    equal(_.first([1,2,3], 2).join(', '), '1, 2', 'can pass an index to first');
-    equal(_.first([1,2,3], 5).join(', '), '1, 2, 3', 'can pass an index to first');
-    var result = (function(){ return _.first(arguments); })(4, 3, 2, 1);
-    equal(result, 4, 'works on an arguments object.');
-    result = _.map([[1,2,3],[1,2,3]], _.first);
-    equal(result.join(','), '1,1', 'works well with _.map');
-    result = (function() { return _.take([1,2,3], 2); })();
-    equal(result.join(','), '1,2', 'aliased as take');
-
-    equal(_.first(null), undefined, 'handles nulls');
-  });
-    `)
-}
-
-// rest
-func Test_underscore_arrays_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("rest", function() {
-    var numbers = [1, 2, 3, 4];
-    equal(_.rest(numbers).join(", "), "2, 3, 4", 'working rest()');
-    equal(_.rest(numbers, 0).join(", "), "1, 2, 3, 4", 'working rest(0)');
-    equal(_.rest(numbers, 2).join(', '), '3, 4', 'rest can take an index');
-    var result = (function(){ return _(arguments).tail(); })(1, 2, 3, 4);
-    equal(result.join(', '), '2, 3, 4', 'aliased as tail and works on arguments object');
-    result = _.map([[1,2,3],[1,2,3]], _.rest);
-    equal(_.flatten(result).join(','), '2,3,2,3', 'works well with _.map');
-    result = (function(){ return _(arguments).drop(); })(1, 2, 3, 4);
-    equal(result.join(', '), '2, 3, 4', 'aliased as drop and works on arguments object');
-  });
-    `)
-}
-
-// initial
-func Test_underscore_arrays_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("initial", function() {
-    equal(_.initial([1,2,3,4,5]).join(", "), "1, 2, 3, 4", 'working initial()');
-    equal(_.initial([1,2,3,4],2).join(", "), "1, 2", 'initial can take an index');
-    var result = (function(){ return _(arguments).initial(); })(1, 2, 3, 4);
-    equal(result.join(", "), "1, 2, 3", 'initial works on arguments object');
-    result = _.map([[1,2,3],[1,2,3]], _.initial);
-    equal(_.flatten(result).join(','), '1,2,1,2', 'initial works with _.map');
-  });
-    `)
-}
-
-// last
-func Test_underscore_arrays_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("last", function() {
-    equal(_.last([1,2,3]), 3, 'can pull out the last element of an array');
-    equal(_.last([1,2,3], 0).join(', '), "", 'can pass an index to last');
-    equal(_.last([1,2,3], 2).join(', '), '2, 3', 'can pass an index to last');
-    equal(_.last([1,2,3], 5).join(', '), '1, 2, 3', 'can pass an index to last');
-    var result = (function(){ return _(arguments).last(); })(1, 2, 3, 4);
-    equal(result, 4, 'works on an arguments object');
-    result = _.map([[1,2,3],[1,2,3]], _.last);
-    equal(result.join(','), '3,3', 'works well with _.map');
-
-    equal(_.last(null), undefined, 'handles nulls');
-  });
-    `)
-}
-
-// compact
-func Test_underscore_arrays_4(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("compact", function() {
-    equal(_.compact([0, 1, false, 2, false, 3]).length, 3, 'can trim out all falsy values');
-    var result = (function(){ return _.compact(arguments).length; })(0, 1, false, 2, false, 3);
-    equal(result, 3, 'works on an arguments object');
-  });
-    `)
-}
-
-// flatten
-func Test_underscore_arrays_5(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("flatten", function() {
-    var list = [1, [2], [3, [[[4]]]]];
-    deepEqual(_.flatten(list), [1,2,3,4], 'can flatten nested arrays');
-    deepEqual(_.flatten(list, true), [1,2,3,[[[4]]]], 'can shallowly flatten nested arrays');
-    var result = (function(){ return _.flatten(arguments); })(1, [2], [3, [[[4]]]]);
-    deepEqual(result, [1,2,3,4], 'works on an arguments object');
-  });
-    `)
-}
-
-// without
-func Test_underscore_arrays_6(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("without", function() {
-    var list = [1, 2, 1, 0, 3, 1, 4];
-    equal(_.without(list, 0, 1).join(', '), '2, 3, 4', 'can remove all instances of an object');
-    var result = (function(){ return _.without(arguments, 0, 1); })(1, 2, 1, 0, 3, 1, 4);
-    equal(result.join(', '), '2, 3, 4', 'works on an arguments object');
-
-    var list = [{one : 1}, {two : 2}];
-    ok(_.without(list, {one : 1}).length == 2, 'uses real object identity for comparisons.');
-    ok(_.without(list, list[0]).length == 1, 'ditto.');
-  });
-    `)
-}
-
-// uniq
-func Test_underscore_arrays_7(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("uniq", function() {
-    var list = [1, 2, 1, 3, 1, 4];
-    equal(_.uniq(list).join(', '), '1, 2, 3, 4', 'can find the unique values of an unsorted array');
-
-    var list = [1, 1, 1, 2, 2, 3];
-    equal(_.uniq(list, true).join(', '), '1, 2, 3', 'can find the unique values of a sorted array faster');
-
-    var list = [{name:'moe'}, {name:'curly'}, {name:'larry'}, {name:'curly'}];
-    var iterator = function(value) { return value.name; };
-    equal(_.map(_.uniq(list, false, iterator), iterator).join(', '), 'moe, curly, larry', 'can find the unique values of an array using a custom iterator');
-
-    equal(_.map(_.uniq(list, iterator), iterator).join(', '), 'moe, curly, larry', 'can find the unique values of an array using a custom iterator without specifying whether array is sorted');
-
-    var iterator = function(value) { return value +1; };
-    var list = [1, 2, 2, 3, 4, 4];
-    equal(_.uniq(list, true, iterator).join(', '), '1, 2, 3, 4', 'iterator works with sorted array');
-
-    var result = (function(){ return _.uniq(arguments); })(1, 2, 1, 3, 1, 4);
-    equal(result.join(', '), '1, 2, 3, 4', 'works on an arguments object');
-  });
-    `)
-}
-
-// intersection
-func Test_underscore_arrays_8(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("intersection", function() {
-    var stooges = ['moe', 'curly', 'larry'], leaders = ['moe', 'groucho'];
-    equal(_.intersection(stooges, leaders).join(''), 'moe', 'can take the set intersection of two arrays');
-    equal(_(stooges).intersection(leaders).join(''), 'moe', 'can perform an OO-style intersection');
-    var result = (function(){ return _.intersection(arguments, leaders); })('moe', 'curly', 'larry');
-    equal(result.join(''), 'moe', 'works on an arguments object');
-  });
-    `)
-}
-
-// union
-func Test_underscore_arrays_9(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("union", function() {
-    var result = _.union([1, 2, 3], [2, 30, 1], [1, 40]);
-    equal(result.join(' '), '1 2 3 30 40', 'takes the union of a list of arrays');
-
-    var result = _.union([1, 2, 3], [2, 30, 1], [1, 40, [1]]);
-    equal(result.join(' '), '1 2 3 30 40 1', 'takes the union of a list of nested arrays');
-  });
-    `)
-}
-
-// difference
-func Test_underscore_arrays_10(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("difference", function() {
-    var result = _.difference([1, 2, 3], [2, 30, 40]);
-    equal(result.join(' '), '1 3', 'takes the difference of two arrays');
-
-    var result = _.difference([1, 2, 3, 4], [2, 30, 40], [1, 11, 111]);
-    equal(result.join(' '), '3 4', 'takes the difference of three arrays');
-  });
-    `)
-}
-
-// zip
-func Test_underscore_arrays_11(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('zip', function() {
-    var names = ['moe', 'larry', 'curly'], ages = [30, 40, 50], leaders = [true];
-    var stooges = _.zip(names, ages, leaders);
-    equal(String(stooges), 'moe,30,true,larry,40,,curly,50,', 'zipped together arrays of different lengths');
-  });
-    `)
-}
-
-// object
-func Test_underscore_arrays_12(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('object', function() {
-    var result = _.object(['moe', 'larry', 'curly'], [30, 40, 50]);
-    var shouldBe = {moe: 30, larry: 40, curly: 50};
-    ok(_.isEqual(result, shouldBe), 'two arrays zipped together into an object');
-
-    result = _.object([['one', 1], ['two', 2], ['three', 3]]);
-    shouldBe = {one: 1, two: 2, three: 3};
-    ok(_.isEqual(result, shouldBe), 'an array of pairs zipped together into an object');
-
-    var stooges = {moe: 30, larry: 40, curly: 50};
-    ok(_.isEqual(_.object(_.pairs(stooges)), stooges), 'an object converted to pairs and back to an object');
-
-    ok(_.isEqual(_.object(null), {}), 'handles nulls');
-  });
-    `)
-}
-
-// indexOf
-func Test_underscore_arrays_13(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("indexOf", function() {
-    var numbers = [1, 2, 3];
-    numbers.indexOf = null;
-    equal(_.indexOf(numbers, 2), 1, 'can compute indexOf, even without the native function');
-    var result = (function(){ return _.indexOf(arguments, 2); })(1, 2, 3);
-    equal(result, 1, 'works on an arguments object');
-    equal(_.indexOf(null, 2), -1, 'handles nulls properly');
-
-    var numbers = [10, 20, 30, 40, 50], num = 35;
-    var index = _.indexOf(numbers, num, true);
-    equal(index, -1, '35 is not in the list');
-
-    numbers = [10, 20, 30, 40, 50]; num = 40;
-    index = _.indexOf(numbers, num, true);
-    equal(index, 3, '40 is in the list');
-
-    numbers = [1, 40, 40, 40, 40, 40, 40, 40, 50, 60, 70]; num = 40;
-    index = _.indexOf(numbers, num, true);
-    equal(index, 1, '40 is in the list');
-
-    numbers = [1, 2, 3, 1, 2, 3, 1, 2, 3];
-    index = _.indexOf(numbers, 2, 5);
-    equal(index, 7, 'supports the fromIndex argument');
-  });
-    `)
-}
-
-// lastIndexOf
-func Test_underscore_arrays_14(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("lastIndexOf", function() {
-    var numbers = [1, 0, 1];
-    equal(_.lastIndexOf(numbers, 1), 2);
-
-    numbers = [1, 0, 1, 0, 0, 1, 0, 0, 0];
-    numbers.lastIndexOf = null;
-    equal(_.lastIndexOf(numbers, 1), 5, 'can compute lastIndexOf, even without the native function');
-    equal(_.lastIndexOf(numbers, 0), 8, 'lastIndexOf the other element');
-    var result = (function(){ return _.lastIndexOf(arguments, 1); })(1, 0, 1, 0, 0, 1, 0, 0, 0);
-    equal(result, 5, 'works on an arguments object');
-    equal(_.indexOf(null, 2), -1, 'handles nulls properly');
-
-    numbers = [1, 2, 3, 1, 2, 3, 1, 2, 3];
-    var index = _.lastIndexOf(numbers, 2, 2);
-    equal(index, 1, 'supports the fromIndex argument');
-  });
-    `)
-}
-
-// range
-func Test_underscore_arrays_15(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("range", function() {
-    equal(_.range(0).join(''), '', 'range with 0 as a first argument generates an empty array');
-    equal(_.range(4).join(' '), '0 1 2 3', 'range with a single positive argument generates an array of elements 0,1,2,...,n-1');
-    equal(_.range(5, 8).join(' '), '5 6 7', 'range with two arguments a &amp; b, a&lt;b generates an array of elements a,a+1,a+2,...,b-2,b-1');
-    equal(_.range(8, 5).join(''), '', 'range with two arguments a &amp; b, b&lt;a generates an empty array');
-    equal(_.range(3, 10, 3).join(' '), '3 6 9', 'range with three arguments a &amp; b &amp; c, c &lt; b-a, a &lt; b generates an array of elements a,a+c,a+2c,...,b - (multiplier of a) &lt; c');
-    equal(_.range(3, 10, 15).join(''), '3', 'range with three arguments a &amp; b &amp; c, c &gt; b-a, a &lt; b generates an array with a single element, equal to a');
-    equal(_.range(12, 7, -2).join(' '), '12 10 8', 'range with three arguments a &amp; b &amp; c, a &gt; b, c &lt; 0 generates an array of elements a,a-c,a-2c and ends with the number not less than b');
-    equal(_.range(0, -10, -1).join(' '), '0 -1 -2 -3 -4 -5 -6 -7 -8 -9', 'final example in the Python docs');
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_chaining_test.go b/vendor/github.com/robertkrimen/otto/underscore_chaining_test.go
deleted file mode 100644
index ee241c53d..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_chaining_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// map/flatten/reduce
-func Test_underscore_chaining_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("map/flatten/reduce", function() {
-    var lyrics = [
-      "I'm a lumberjack and I'm okay",
-      "I sleep all night and I work all day",
-      "He's a lumberjack and he's okay",
-      "He sleeps all night and he works all day"
-    ];
-    var counts = _(lyrics).chain()
-      .map(function(line) { return line.split(''); })
-      .flatten()
-      .reduce(function(hash, l) {
-        hash[l] = hash[l] || 0;
-        hash[l]++;
-        return hash;
-    }, {}).value();
-    ok(counts['a'] == 16 && counts['e'] == 10, 'counted all the letters in the song');
-  });
-    `)
-}
-
-// select/reject/sortBy
-func Test_underscore_chaining_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("select/reject/sortBy", function() {
-    var numbers = [1,2,3,4,5,6,7,8,9,10];
-    numbers = _(numbers).chain().select(function(n) {
-      return n % 2 == 0;
-    }).reject(function(n) {
-      return n % 4 == 0;
-    }).sortBy(function(n) {
-      return -n;
-    }).value();
-    equal(numbers.join(', '), "10, 6, 2", "filtered and reversed the numbers");
-  });
-    `)
-}
-
-// select/reject/sortBy in functional style
-func Test_underscore_chaining_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("select/reject/sortBy in functional style", function() {
-    var numbers = [1,2,3,4,5,6,7,8,9,10];
-    numbers = _.chain(numbers).select(function(n) {
-      return n % 2 == 0;
-    }).reject(function(n) {
-      return n % 4 == 0;
-    }).sortBy(function(n) {
-      return -n;
-    }).value();
-    equal(numbers.join(', '), "10, 6, 2", "filtered and reversed the numbers");
-  });
-    `)
-}
-
-// reverse/concat/unshift/pop/map
-func Test_underscore_chaining_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("reverse/concat/unshift/pop/map", function() {
-    var numbers = [1,2,3,4,5];
-    numbers = _(numbers).chain()
-      .reverse()
-      .concat([5, 5, 5])
-      .unshift(17)
-      .pop()
-      .map(function(n){ return n * 2; })
-      .value();
-    equal(numbers.join(', '), "34, 10, 8, 6, 4, 2, 10, 10", 'can chain together array functions.');
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_collections_test.go b/vendor/github.com/robertkrimen/otto/underscore_collections_test.go
deleted file mode 100644
index c8fd08198..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_collections_test.go
+++ /dev/null
@@ -1,694 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// each
-func Test_underscore_collections_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("each", function() {
-    _.each([1, 2, 3], function(num, i) {
-      equal(num, i + 1, 'each iterators provide value and iteration count');
-    });
-
-    var answers = [];
-    _.each([1, 2, 3], function(num){ answers.push(num * this.multiplier);}, {multiplier : 5});
-    equal(answers.join(', '), '5, 10, 15', 'context object property accessed');
-
-    answers = [];
-    _.forEach([1, 2, 3], function(num){ answers.push(num); });
-    equal(answers.join(', '), '1, 2, 3', 'aliased as "forEach"');
-
-    answers = [];
-    var obj = {one : 1, two : 2, three : 3};
-    obj.constructor.prototype.four = 4;
-    _.each(obj, function(value, key){ answers.push(key); });
-    // TODO: Property ordering unreliable
-    //equal(answers.join(", "), 'one, two, three', 'iterating over objects works, and ignores the object prototype.');
-    delete obj.constructor.prototype.four;
-
-    var answer = null;
-    _.each([1, 2, 3], function(num, index, arr){ if (_.include(arr, num)) answer = true; });
-    ok(answer, 'can reference the original collection from inside the iterator');
-
-    answers = 0;
-    _.each(null, function(){ ++answers; });
-    equal(answers, 0, 'handles a null properly');
-  });
-    `)
-}
-
-// map
-func Test_underscore_collections_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('map', function() {
-    var doubled = _.map([1, 2, 3], function(num){ return num * 2; });
-    equal(doubled.join(', '), '2, 4, 6', 'doubled numbers');
-
-    doubled = _.collect([1, 2, 3], function(num){ return num * 2; });
-    equal(doubled.join(', '), '2, 4, 6', 'aliased as "collect"');
-
-    var tripled = _.map([1, 2, 3], function(num){ return num * this.multiplier; }, {multiplier : 3});
-    equal(tripled.join(', '), '3, 6, 9', 'tripled numbers with context');
-
-    var doubled = _([1, 2, 3]).map(function(num){ return num * 2; });
-    equal(doubled.join(', '), '2, 4, 6', 'OO-style doubled numbers');
-
-    //if (document.querySelectorAll) {
-    //  var ids = _.map(document.querySelectorAll('#map-test *'), function(n){ return n.id; });
-    //  deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on NodeLists.');
-    //}
-
-    //var ids = _.map($('#map-test').children(), function(n){ return n.id; });
-    //deepEqual(ids, ['id1', 'id2'], 'Can use collection methods on jQuery Array-likes.');
-
-    //var ids = _.map(document.images, function(n){ return n.id; });
-    //ok(ids[0] == 'chart_image', 'can use collection methods on HTMLCollections');
-
-    var ifnull = _.map(null, function(){});
-    ok(_.isArray(ifnull) && ifnull.length === 0, 'handles a null properly');
-  });
-    `)
-}
-
-// reduce
-func Test_underscore_collections_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('reduce', function() {
-    var sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; }, 0);
-    equal(sum, 6, 'can sum up an array');
-
-    var context = {multiplier : 3};
-    sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num * this.multiplier; }, 0, context);
-    equal(sum, 18, 'can reduce with a context object');
-
-    sum = _.inject([1, 2, 3], function(sum, num){ return sum + num; }, 0);
-    equal(sum, 6, 'aliased as "inject"');
-
-    sum = _([1, 2, 3]).reduce(function(sum, num){ return sum + num; }, 0);
-    equal(sum, 6, 'OO-style reduce');
-
-    var sum = _.reduce([1, 2, 3], function(sum, num){ return sum + num; });
-    equal(sum, 6, 'default initial value');
-
-    var ifnull;
-    try {
-      _.reduce(null, function(){});
-    } catch (ex) {
-      ifnull = ex;
-    }
-    ok(ifnull instanceof TypeError, 'handles a null (without inital value) properly');
-
-    ok(_.reduce(null, function(){}, 138) === 138, 'handles a null (with initial value) properly');
-    equal(_.reduce([], function(){}, undefined), undefined, 'undefined can be passed as a special case');
-    raises(function() { _.reduce([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
-  });
-    `)
-}
-
-// reduceRight
-func Test_underscore_collections_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('reduceRight', function() {
-    var list = _.reduceRight(["foo", "bar", "baz"], function(memo, str){ return memo + str; }, '');
-    equal(list, 'bazbarfoo', 'can perform right folds');
-
-    var list = _.foldr(["foo", "bar", "baz"], function(memo, str){ return memo + str; }, '');
-    equal(list, 'bazbarfoo', 'aliased as "foldr"');
-
-    var list = _.foldr(["foo", "bar", "baz"], function(memo, str){ return memo + str; });
-    equal(list, 'bazbarfoo', 'default initial value');
-
-    var ifnull;
-    try {
-      _.reduceRight(null, function(){});
-    } catch (ex) {
-      ifnull = ex;
-    }
-    ok(ifnull instanceof TypeError, 'handles a null (without inital value) properly');
-
-    var sum = _.reduceRight({a: 1, b: 2, c: 3}, function(sum, num){ return sum + num; });
-    equal(sum, 6, 'default initial value on object');
-
-    ok(_.reduceRight(null, function(){}, 138) === 138, 'handles a null (with initial value) properly');
-
-    equal(_.reduceRight([], function(){}, undefined), undefined, 'undefined can be passed as a special case');
-    raises(function() { _.reduceRight([], function(){}); }, TypeError, 'throws an error for empty arrays with no initial value');
-
-    // Assert that the correct arguments are being passed.
-
-    // TODO: Property ordering unreliable
-    return;
-
-    var args,
-        memo = {},
-        object = {a: 1, b: 2},
-        lastKey = _.keys(object).pop();
-
-    var expected = lastKey == 'a'
-      ? [memo, 1, 'a', object]
-      : [memo, 2, 'b', object];
-
-    _.reduceRight(object, function() {
-      args || (args = _.toArray(arguments));
-    }, memo);
-
-    deepEqual(args, expected);
-
-    // And again, with numeric keys.
-
-    object = {'2': 'a', '1': 'b'};
-    lastKey = _.keys(object).pop();
-    args = null;
-
-    expected = lastKey == '2'
-      ? [memo, 'a', '2', object]
-      : [memo, 'b', '1', object];
-
-    _.reduceRight(object, function() {
-      args || (args = _.toArray(arguments));
-    }, memo);
-
-    deepEqual(args, expected);
-  });
-    `)
-}
-
-// find
-func Test_underscore_collections_4(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('find', function() {
-    var array = [1, 2, 3, 4];
-    strictEqual(_.find(array, function(n) { return n > 2; }), 3, 'should return first found <value>');
-    strictEqual(_.find(array, function() { return false; }), void 0, 'should return <undefined> if <value> is not found');
-  });
-    `)
-}
-
-// detect
-func Test_underscore_collections_5(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('detect', function() {
-    var result = _.detect([1, 2, 3], function(num){ return num * 2 == 4; });
-    equal(result, 2, 'found the first "2" and broke the loop');
-  });
-    `)
-}
-
-// select
-func Test_underscore_collections_6(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('select', function() {
-    var evens = _.select([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
-    equal(evens.join(', '), '2, 4, 6', 'selected each even number');
-
-    evens = _.filter([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
-    equal(evens.join(', '), '2, 4, 6', 'aliased as "filter"');
-  });
-    `)
-}
-
-// reject
-func Test_underscore_collections_7(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('reject', function() {
-    var odds = _.reject([1, 2, 3, 4, 5, 6], function(num){ return num % 2 == 0; });
-    equal(odds.join(', '), '1, 3, 5', 'rejected each even number');
-
-    var context = "obj";
-
-    var evens = _.reject([1, 2, 3, 4, 5, 6], function(num){
-      equal(context, "obj");
-      return num % 2 != 0;
-    }, context);
-    equal(evens.join(', '), '2, 4, 6', 'rejected each odd number');
-  });
-    `)
-}
-
-// all
-func Test_underscore_collections_8(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('all', function() {
-    ok(_.all([], _.identity), 'the empty set');
-    ok(_.all([true, true, true], _.identity), 'all true values');
-    ok(!_.all([true, false, true], _.identity), 'one false value');
-    ok(_.all([0, 10, 28], function(num){ return num % 2 == 0; }), 'even numbers');
-    ok(!_.all([0, 11, 28], function(num){ return num % 2 == 0; }), 'an odd number');
-    ok(_.all([1], _.identity) === true, 'cast to boolean - true');
-    ok(_.all([0], _.identity) === false, 'cast to boolean - false');
-    ok(_.every([true, true, true], _.identity), 'aliased as "every"');
-    ok(!_.all([undefined, undefined, undefined], _.identity), 'works with arrays of undefined');
-  });
-    `)
-}
-
-// any
-func Test_underscore_collections_9(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('any', function() {
-    var nativeSome = Array.prototype.some;
-    Array.prototype.some = null;
-    ok(!_.any([]), 'the empty set');
-    ok(!_.any([false, false, false]), 'all false values');
-    ok(_.any([false, false, true]), 'one true value');
-    ok(_.any([null, 0, 'yes', false]), 'a string');
-    ok(!_.any([null, 0, '', false]), 'falsy values');
-    ok(!_.any([1, 11, 29], function(num){ return num % 2 == 0; }), 'all odd numbers');
-    ok(_.any([1, 10, 29], function(num){ return num % 2 == 0; }), 'an even number');
-    ok(_.any([1], _.identity) === true, 'cast to boolean - true');
-    ok(_.any([0], _.identity) === false, 'cast to boolean - false');
-    ok(_.some([false, false, true]), 'aliased as "some"');
-    Array.prototype.some = nativeSome;
-  });
-    `)
-}
-
-// include
-func Test_underscore_collections_10(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('include', function() {
-    ok(_.include([1,2,3], 2), 'two is in the array');
-    ok(!_.include([1,3,9], 2), 'two is not in the array');
-    ok(_.contains({moe:1, larry:3, curly:9}, 3) === true, '_.include on objects checks their values');
-    ok(_([1,2,3]).include(2), 'OO-style include');
-  });
-    `)
-}
-
-// invoke
-func Test_underscore_collections_11(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('invoke', function() {
-    var list = [[5, 1, 7], [3, 2, 1]];
-    var result = _.invoke(list, 'sort');
-    equal(result[0].join(', '), '1, 5, 7', 'first array sorted');
-    equal(result[1].join(', '), '1, 2, 3', 'second array sorted');
-  });
-    `)
-}
-
-// invoke w/ function reference
-func Test_underscore_collections_12(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('invoke w/ function reference', function() {
-    var list = [[5, 1, 7], [3, 2, 1]];
-    var result = _.invoke(list, Array.prototype.sort);
-    equal(result[0].join(', '), '1, 5, 7', 'first array sorted');
-    equal(result[1].join(', '), '1, 2, 3', 'second array sorted');
-  });
-    `)
-}
-
-// invoke when strings have a call method
-func Test_underscore_collections_13(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('invoke when strings have a call method', function() {
-    String.prototype.call = function() {
-      return 42;
-    };
-    var list = [[5, 1, 7], [3, 2, 1]];
-    var s = "foo";
-    equal(s.call(), 42, "call function exists");
-    var result = _.invoke(list, 'sort');
-    equal(result[0].join(', '), '1, 5, 7', 'first array sorted');
-    equal(result[1].join(', '), '1, 2, 3', 'second array sorted');
-    delete String.prototype.call;
-    equal(s.call, undefined, "call function removed");
-  });
-    `)
-}
-
-// pluck
-func Test_underscore_collections_14(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('pluck', function() {
-    var people = [{name : 'moe', age : 30}, {name : 'curly', age : 50}];
-    equal(_.pluck(people, 'name').join(', '), 'moe, curly', 'pulls names out of objects');
-  });
-    `)
-}
-
-// where
-func Test_underscore_collections_15(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('where', function() {
-    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}];
-    var result = _.where(list, {a: 1});
-    equal(result.length, 3);
-    equal(result[result.length - 1].b, 4);
-    result = _.where(list, {b: 2});
-    equal(result.length, 2);
-    equal(result[0].a, 1);
-  });
-    `)
-}
-
-// findWhere
-func Test_underscore_collections_16(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('findWhere', function() {
-    var list = [{a: 1, b: 2}, {a: 2, b: 2}, {a: 1, b: 3}, {a: 1, b: 4}, {a: 2, b: 4}];
-    var result = _.findWhere(list, {a: 1});
-    deepEqual(result, {a: 1, b: 2});
-    result = _.findWhere(list, {b: 4});
-    deepEqual(result, {a: 1, b: 4});
-  });
-    `)
-}
-
-// max
-func Test_underscore_collections_17(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('max', function() {
-    equal(3, _.max([1, 2, 3]), 'can perform a regular Math.max');
-
-    var neg = _.max([1, 2, 3], function(num){ return -num; });
-    equal(neg, 1, 'can perform a computation-based max');
-
-    equal(-Infinity, _.max({}), 'Maximum value of an empty object');
-    equal(-Infinity, _.max([]), 'Maximum value of an empty array');
-    equal(_.max({'a': 'a'}), -Infinity, 'Maximum value of a non-numeric collection');
-
-    //equal(299999, _.max(_.range(1,300000)), "Maximum value of a too-big array");
-  });
-    `)
-}
-
-// min
-func Test_underscore_collections_18(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('min', function() {
-    equal(1, _.min([1, 2, 3]), 'can perform a regular Math.min');
-
-    var neg = _.min([1, 2, 3], function(num){ return -num; });
-    equal(neg, 3, 'can perform a computation-based min');
-
-    equal(Infinity, _.min({}), 'Minimum value of an empty object');
-    equal(Infinity, _.min([]), 'Minimum value of an empty array');
-    equal(_.min({'a': 'a'}), Infinity, 'Minimum value of a non-numeric collection');
-
-    var now = new Date(9999999999);
-    var then = new Date(0);
-    equal(_.min([now, then]), then);
-
-    //equal(1, _.min(_.range(1,300000)), "Minimum value of a too-big array");
-  });
-    `)
-}
-
-// sortBy
-func Test_underscore_collections_19(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('sortBy', function() {
-    var people = [{name : 'curly', age : 50}, {name : 'moe', age : 30}];
-    people = _.sortBy(people, function(person){ return person.age; });
-    equal(_.pluck(people, 'name').join(', '), 'moe, curly', 'stooges sorted by age');
-
-    var list = [undefined, 4, 1, undefined, 3, 2];
-    equal(_.sortBy(list, _.identity).join(','), '1,2,3,4,,', 'sortBy with undefined values');
-
-    var list = ["one", "two", "three", "four", "five"];
-    var sorted = _.sortBy(list, 'length');
-    equal(sorted.join(' '), 'one two four five three', 'sorted by length');
-
-    function Pair(x, y) {
-      this.x = x;
-      this.y = y;
-    }
-
-    var collection = [
-      new Pair(1, 1), new Pair(1, 2),
-      new Pair(1, 3), new Pair(1, 4),
-      new Pair(1, 5), new Pair(1, 6),
-      new Pair(2, 1), new Pair(2, 2),
-      new Pair(2, 3), new Pair(2, 4),
-      new Pair(2, 5), new Pair(2, 6),
-      new Pair(undefined, 1), new Pair(undefined, 2),
-      new Pair(undefined, 3), new Pair(undefined, 4),
-      new Pair(undefined, 5), new Pair(undefined, 6)
-    ];
-
-    var actual = _.sortBy(collection, function(pair) {
-      return pair.x;
-    });
-
-    deepEqual(actual, collection, 'sortBy should be stable');
-  });
-    `)
-}
-
-// groupBy
-func Test_underscore_collections_20(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('groupBy', function() {
-    var parity = _.groupBy([1, 2, 3, 4, 5, 6], function(num){ return num % 2; });
-    ok('0' in parity && '1' in parity, 'created a group for each value');
-    equal(parity[0].join(', '), '2, 4, 6', 'put each even number in the right group');
-
-    var list = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"];
-    var grouped = _.groupBy(list, 'length');
-    equal(grouped['3'].join(' '), 'one two six ten');
-    equal(grouped['4'].join(' '), 'four five nine');
-    equal(grouped['5'].join(' '), 'three seven eight');
-
-    var context = {};
-    _.groupBy([{}], function(){ ok(this === context); }, context);
-
-    grouped = _.groupBy([4.2, 6.1, 6.4], function(num) {
-      return Math.floor(num) > 4 ? 'hasOwnProperty' : 'constructor';
-    });
-    equal(grouped.constructor.length, 1);
-    equal(grouped.hasOwnProperty.length, 2);
-
-    var array = [{}];
-    _.groupBy(array, function(value, index, obj){ ok(obj === array); });
-
-    var array = [1, 2, 1, 2, 3];
-    var grouped = _.groupBy(array);
-    equal(grouped['1'].length, 2);
-    equal(grouped['3'].length, 1);
-  });
-    `)
-}
-
-// countBy
-func Test_underscore_collections_21(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('countBy', function() {
-    var parity = _.countBy([1, 2, 3, 4, 5], function(num){ return num % 2 == 0; });
-    equal(parity['true'], 2);
-    equal(parity['false'], 3);
-
-    var list = ["one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten"];
-    var grouped = _.countBy(list, 'length');
-    equal(grouped['3'], 4);
-    equal(grouped['4'], 3);
-    equal(grouped['5'], 3);
-
-    var context = {};
-    _.countBy([{}], function(){ ok(this === context); }, context);
-
-    grouped = _.countBy([4.2, 6.1, 6.4], function(num) {
-      return Math.floor(num) > 4 ? 'hasOwnProperty' : 'constructor';
-    });
-    equal(grouped.constructor, 1);
-    equal(grouped.hasOwnProperty, 2);
-
-    var array = [{}];
-    _.countBy(array, function(value, index, obj){ ok(obj === array); });
-
-    var array = [1, 2, 1, 2, 3];
-    var grouped = _.countBy(array);
-    equal(grouped['1'], 2);
-    equal(grouped['3'], 1);
-  });
-    `)
-}
-
-// sortedIndex
-func Test_underscore_collections_22(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('sortedIndex', function() {
-    var numbers = [10, 20, 30, 40, 50], num = 35;
-    var indexForNum = _.sortedIndex(numbers, num);
-    equal(indexForNum, 3, '35 should be inserted at index 3');
-
-    var indexFor30 = _.sortedIndex(numbers, 30);
-    equal(indexFor30, 2, '30 should be inserted at index 2');
-
-    var objects = [{x: 10}, {x: 20}, {x: 30}, {x: 40}];
-    var iterator = function(obj){ return obj.x; };
-    strictEqual(_.sortedIndex(objects, {x: 25}, iterator), 2);
-    strictEqual(_.sortedIndex(objects, {x: 35}, 'x'), 3);
-
-    var context = {1: 2, 2: 3, 3: 4};
-    iterator = function(obj){ return this[obj]; };
-    strictEqual(_.sortedIndex([1, 3], 2, iterator, context), 1);
-  });
-    `)
-}
-
-// shuffle
-func Test_underscore_collections_23(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('shuffle', function() {
-    var numbers = _.range(10);
-    var shuffled = _.shuffle(numbers).sort();
-    notStrictEqual(numbers, shuffled, 'original object is unmodified');
-    equal(shuffled.join(','), numbers.join(','), 'contains the same members before and after shuffle');
-  });
-    `)
-}
-
-// toArray
-func Test_underscore_collections_24(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('toArray', function() {
-    ok(!_.isArray(arguments), 'arguments object is not an array');
-    ok(_.isArray(_.toArray(arguments)), 'arguments object converted into array');
-    var a = [1,2,3];
-    ok(_.toArray(a) !== a, 'array is cloned');
-    equal(_.toArray(a).join(', '), '1, 2, 3', 'cloned array contains same elements');
-
-    // TODO: Property ordering unreliable
-    return;
-
-    var numbers = _.toArray({one : 1, two : 2, three : 3});
-    equal(numbers.join(', '), '1, 2, 3', 'object flattened into array');
-
-    // test in IE < 9
-    try {
-      var actual = _.toArray(document.childNodes);
-    } catch(ex) { }
-
-    ok(_.isArray(actual), 'should not throw converting a node list');
-  });
-    `)
-}
-
-// size
-func Test_underscore_collections_25(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('size', function() {
-    equal(_.size({one : 1, two : 2, three : 3}), 3, 'can compute the size of an object');
-    equal(_.size([1, 2, 3]), 3, 'can compute the size of an array');
-
-    var func = function() {
-      return _.size(arguments);
-    };
-
-    equal(func(1, 2, 3, 4), 4, 'can test the size of the arguments object');
-
-    equal(_.size('hello'), 5, 'can compute the size of a string');
-
-    equal(_.size(null), 0, 'handles nulls');
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_functions_test.go b/vendor/github.com/robertkrimen/otto/underscore_functions_test.go
deleted file mode 100644
index 483380769..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_functions_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// bind
-func Test_underscore_functions_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("bind", function() {
-    var context = {name : 'moe'};
-    var func = function(arg) { return "name: " + (this.name || arg); };
-    var bound = _.bind(func, context);
-    equal(bound(), 'name: moe', 'can bind a function to a context');
-
-    bound = _(func).bind(context);
-    equal(bound(), 'name: moe', 'can do OO-style binding');
-
-    bound = _.bind(func, null, 'curly');
-    equal(bound(), 'name: curly', 'can bind without specifying a context');
-
-    func = function(salutation, name) { return salutation + ': ' + name; };
-    func = _.bind(func, this, 'hello');
-    equal(func('moe'), 'hello: moe', 'the function was partially applied in advance');
-
-    func = _.bind(func, this, 'curly');
-    equal(func(), 'hello: curly', 'the function was completely applied in advance');
-
-    func = function(salutation, firstname, lastname) { return salutation + ': ' + firstname + ' ' + lastname; };
-    func = _.bind(func, this, 'hello', 'moe', 'curly');
-    equal(func(), 'hello: moe curly', 'the function was partially applied in advance and can accept multiple arguments');
-
-    func = function(context, message) { equal(this, context, message); };
-    _.bind(func, 0, 0, 'can bind a function to <0>')();
-    _.bind(func, '', '', 'can bind a function to an empty string')();
-    _.bind(func, false, false, 'can bind a function to <false>')();
-
-    // These tests are only meaningful when using a browser without a native bind function
-    // To test this with a modern browser, set underscore's nativeBind to undefined
-    var F = function () { return this; };
-    var Boundf = _.bind(F, {hello: "moe curly"});
-    equal(Boundf().hello, "moe curly", "When called without the new operator, it's OK to be bound to the context");
-  });
-    `)
-}
-
-// partial
-func Test_underscore_functions_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("partial", function() {
-    var obj = {name: 'moe'};
-    var func = function() { return this.name + ' ' + _.toArray(arguments).join(' '); };
-
-    obj.func = _.partial(func, 'a', 'b');
-    equal(obj.func('c', 'd'), 'moe a b c d', 'can partially apply');
-  });
-    `)
-}
-
-// bindAll
-func Test_underscore_functions_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("bindAll", function() {
-    var curly = {name : 'curly'}, moe = {
-      name    : 'moe',
-      getName : function() { return 'name: ' + this.name; },
-      sayHi   : function() { return 'hi: ' + this.name; }
-    };
-    curly.getName = moe.getName;
-    _.bindAll(moe, 'getName', 'sayHi');
-    curly.sayHi = moe.sayHi;
-    equal(curly.getName(), 'name: curly', 'unbound function is bound to current object');
-    equal(curly.sayHi(), 'hi: moe', 'bound function is still bound to original object');
-
-    curly = {name : 'curly'};
-    moe = {
-      name    : 'moe',
-      getName : function() { return 'name: ' + this.name; },
-      sayHi   : function() { return 'hi: ' + this.name; }
-    };
-
-    // FIXME: This functionality is being changed in the underscore master right now
-    //raises(function() { _.bindAll(moe); }, Error, 'throws an error for bindAll with no functions named');
-
-    _.bindAll(moe, 'sayHi');
-    curly.sayHi = moe.sayHi;
-    equal(curly.sayHi(), 'hi: moe');
-  });
-    `)
-}
-
-// memoize
-func Test_underscore_functions_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("memoize", function() {
-    var fib = function(n) {
-      return n < 2 ? n : fib(n - 1) + fib(n - 2);
-    };
-    var fastFib = _.memoize(fib);
-    equal(fib(10), 55, 'a memoized version of fibonacci produces identical results');
-    equal(fastFib(10), 55, 'a memoized version of fibonacci produces identical results');
-
-    var o = function(str) {
-      return str;
-    };
-    var fastO = _.memoize(o);
-    equal(o('toString'), 'toString', 'checks hasOwnProperty');
-    equal(fastO('toString'), 'toString', 'checks hasOwnProperty');
-  });
-    `)
-}
-
-// once
-func Test_underscore_functions_4(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("once", function() {
-    var num = 0;
-    var increment = _.once(function(){ num++; });
-    increment();
-    increment();
-    equal(num, 1);
-  });
-    `)
-}
-
-// wrap
-func Test_underscore_functions_5(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("wrap", function() {
-    var greet = function(name){ return "hi: " + name; };
-    var backwards = _.wrap(greet, function(func, name){ return func(name) + ' ' + name.split('').reverse().join(''); });
-    equal(backwards('moe'), 'hi: moe eom', 'wrapped the saluation function');
-
-    var inner = function(){ return "Hello "; };
-    var obj   = {name : "Moe"};
-    obj.hi    = _.wrap(inner, function(fn){ return fn() + this.name; });
-    equal(obj.hi(), "Hello Moe");
-
-    var noop    = function(){};
-    var wrapped = _.wrap(noop, function(fn){ return Array.prototype.slice.call(arguments, 0); });
-    var ret     = wrapped(['whats', 'your'], 'vector', 'victor');
-    deepEqual(ret, [noop, ['whats', 'your'], 'vector', 'victor']);
-  });
-    `)
-}
-
-// compose
-func Test_underscore_functions_6(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("compose", function() {
-    var greet = function(name){ return "hi: " + name; };
-    var exclaim = function(sentence){ return sentence + '!'; };
-    var composed = _.compose(exclaim, greet);
-    equal(composed('moe'), 'hi: moe!', 'can compose a function that takes another');
-
-    composed = _.compose(greet, exclaim);
-    equal(composed('moe'), 'hi: moe!', 'in this case, the functions are also commutative');
-  });
-    `)
-}
-
-// after
-func Test_underscore_functions_7(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("after", function() {
-    var testAfter = function(afterAmount, timesCalled) {
-      var afterCalled = 0;
-      var after = _.after(afterAmount, function() {
-        afterCalled++;
-      });
-      while (timesCalled--) after();
-      return afterCalled;
-    };
-
-    equal(testAfter(5, 5), 1, "after(N) should fire after being called N times");
-    equal(testAfter(5, 4), 0, "after(N) should not fire unless called N times");
-    equal(testAfter(0, 0), 1, "after(0) should fire immediately");
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_objects_test.go b/vendor/github.com/robertkrimen/otto/underscore_objects_test.go
deleted file mode 100644
index 55354552f..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_objects_test.go
+++ /dev/null
@@ -1,778 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// keys
-func Test_underscore_objects_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("keys", function() {
-    equal(_.keys({one : 1, two : 2}).sort().join(', '), 'one, two', 'can extract the keys from an object');
-    // the test above is not safe because it relies on for-in enumeration order
-    var a = []; a[1] = 0;
-    equal(_.keys(a).join(', '), '1', 'is not fooled by sparse arrays; see issue #95');
-    raises(function() { _.keys(null); }, TypeError, 'throws an error for <null> values');
-    raises(function() { _.keys(void 0); }, TypeError, 'throws an error for <undefined> values');
-    raises(function() { _.keys(1); }, TypeError, 'throws an error for number primitives');
-    raises(function() { _.keys('a'); }, TypeError, 'throws an error for string primitives');
-    raises(function() { _.keys(true); }, TypeError, 'throws an error for boolean primitives');
-  });
-    `)
-}
-
-// values
-func Test_underscore_objects_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("values", function() {
-    equal(_.values({one: 1, two: 2}).sort().join(', '), '1, 2', 'can extract the values from an object');
-    equal(_.values({one: 1, two: 2, length: 3}).sort().join(', '), '1, 2, 3', '... even when one of them is "length"');
-  });
-    `)
-}
-
-// pairs
-func Test_underscore_objects_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("pairs", function() {
-    // TODO: Property ordering unreliable
-    return;
-    deepEqual(_.pairs({one: 1, two: 2}), [['one', 1], ['two', 2]], 'can convert an object into pairs');
-    deepEqual(_.pairs({one: 1, two: 2, length: 3}), [['one', 1], ['two', 2], ['length', 3]], '... even when one of them is "length"');
-  });
-    `)
-}
-
-// invert
-func Test_underscore_objects_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("invert", function() {
-    var obj = {first: 'Moe', second: 'Larry', third: 'Curly'};
-    // TODO: Property ordering unreliable
-    //equal(_.keys(_.invert(obj)).join(' '), 'Moe Larry Curly', 'can invert an object');
-    ok(_.isEqual(_.invert(_.invert(obj)), obj), 'two inverts gets you back where you started');
-
-    var obj = {length: 3};
-    ok(_.invert(obj)['3'] == 'length', 'can invert an object with "length"')
-  });
-    `)
-}
-
-// functions
-func Test_underscore_objects_4(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("functions", function() {
-    var obj = {a : 'dash', b : _.map, c : (/yo/), d : _.reduce};
-    ok(_.isEqual(['b', 'd'], _.functions(obj)), 'can grab the function names of any passed-in object');
-
-    var Animal = function(){};
-    Animal.prototype.run = function(){};
-    equal(_.functions(new Animal).join(''), 'run', 'also looks up functions on the prototype');
-  });
-    `)
-}
-
-// extend
-func Test_underscore_objects_5(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("extend", function() {
-    var result;
-    equal(_.extend({}, {a:'b'}).a, 'b', 'can extend an object with the attributes of another');
-    equal(_.extend({a:'x'}, {a:'b'}).a, 'b', 'properties in source override destination');
-    equal(_.extend({x:'x'}, {a:'b'}).x, 'x', 'properties not in source dont get overriden');
-    result = _.extend({x:'x'}, {a:'a'}, {b:'b'});
-    ok(_.isEqual(result, {x:'x', a:'a', b:'b'}), 'can extend from multiple source objects');
-    result = _.extend({x:'x'}, {a:'a', x:2}, {a:'b'});
-    ok(_.isEqual(result, {x:2, a:'b'}), 'extending from multiple source objects last property trumps');
-    result = _.extend({}, {a: void 0, b: null});
-    // TODO: Property ordering unreliable
-    //equal(_.keys(result).join(''), 'ab', 'extend does not copy undefined values');
-
-    try {
-      result = {};
-      _.extend(result, null, undefined, {a:1});
-    } catch(ex) {}
-
-    equal(result.a, 1, 'should not error on <null> or <undefined> sources');
-  });
-    `)
-}
-
-// pick
-func Test_underscore_objects_6(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("pick", function() {
-    var result;
-    result = _.pick({a:1, b:2, c:3}, 'a', 'c');
-    ok(_.isEqual(result, {a:1, c:3}), 'can restrict properties to those named');
-    result = _.pick({a:1, b:2, c:3}, ['b', 'c']);
-    ok(_.isEqual(result, {b:2, c:3}), 'can restrict properties to those named in an array');
-    result = _.pick({a:1, b:2, c:3}, ['a'], 'b');
-    ok(_.isEqual(result, {a:1, b:2}), 'can restrict properties to those named in mixed args');
-
-    var Obj = function(){};
-    Obj.prototype = {a: 1, b: 2, c: 3};
-    ok(_.isEqual(_.pick(new Obj, 'a', 'c'), {a:1, c: 3}), 'include prototype props');
-  });
-    `)
-}
-
-// omit
-func Test_underscore_objects_7(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("omit", function() {
-    var result;
-    result = _.omit({a:1, b:2, c:3}, 'b');
-    ok(_.isEqual(result, {a:1, c:3}), 'can omit a single named property');
-    result = _.omit({a:1, b:2, c:3}, 'a', 'c');
-    ok(_.isEqual(result, {b:2}), 'can omit several named properties');
-    result = _.omit({a:1, b:2, c:3}, ['b', 'c']);
-    ok(_.isEqual(result, {a:1}), 'can omit properties named in an array');
-
-    var Obj = function(){};
-    Obj.prototype = {a: 1, b: 2, c: 3};
-    ok(_.isEqual(_.omit(new Obj, 'b'), {a:1, c: 3}), 'include prototype props');
-  });
-    `)
-}
-
-// defaults
-func Test_underscore_objects_8(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("defaults", function() {
-    var result;
-    var options = {zero: 0, one: 1, empty: "", nan: NaN, string: "string"};
-
-    _.defaults(options, {zero: 1, one: 10, twenty: 20});
-    equal(options.zero, 0, 'value exists');
-    equal(options.one, 1, 'value exists');
-    equal(options.twenty, 20, 'default applied');
-
-    _.defaults(options, {empty: "full"}, {nan: "nan"}, {word: "word"}, {word: "dog"});
-    equal(options.empty, "", 'value exists');
-    ok(_.isNaN(options.nan), "NaN isn't overridden");
-    equal(options.word, "word", 'new value is added, first one wins');
-
-    try {
-      options = {};
-      _.defaults(options, null, undefined, {a:1});
-    } catch(ex) {}
-
-    equal(options.a, 1, 'should not error on <null> or <undefined> sources');
-  });
-    `)
-}
-
-// clone
-func Test_underscore_objects_9(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("clone", function() {
-    var moe = {name : 'moe', lucky : [13, 27, 34]};
-    var clone = _.clone(moe);
-    equal(clone.name, 'moe', 'the clone as the attributes of the original');
-
-    clone.name = 'curly';
-    ok(clone.name == 'curly' && moe.name == 'moe', 'clones can change shallow attributes without affecting the original');
-
-    clone.lucky.push(101);
-    equal(_.last(moe.lucky), 101, 'changes to deep attributes are shared with the original');
-
-    equal(_.clone(undefined), void 0, 'non objects should not be changed by clone');
-    equal(_.clone(1), 1, 'non objects should not be changed by clone');
-    equal(_.clone(null), null, 'non objects should not be changed by clone');
-  });
-    `)
-}
-
-// isEqual
-func Test_underscore_objects_10(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isEqual", function() {
-    function First() {
-      this.value = 1;
-    }
-    First.prototype.value = 1;
-    function Second() {
-      this.value = 1;
-    }
-    Second.prototype.value = 2;
-
-    // Basic equality and identity comparisons.
-    ok(_.isEqual(null, null), "<null> is equal to <null>");
-    ok(_.isEqual(), "<undefined> is equal to <undefined>");
-
-    ok(!_.isEqual(0, -0), "<0> is not equal to <-0>");
-    ok(!_.isEqual(-0, 0), "Commutative equality is implemented for <0> and <-0>");
-    ok(!_.isEqual(null, undefined), "<null> is not equal to <undefined>");
-    ok(!_.isEqual(undefined, null), "Commutative equality is implemented for <null> and <undefined>");
-
-    // String object and primitive comparisons.
-    ok(_.isEqual("Curly", "Curly"), "Identical string primitives are equal");
-    ok(_.isEqual(new String("Curly"), new String("Curly")), "String objects with identical primitive values are equal");
-    ok(_.isEqual(new String("Curly"), "Curly"), "String primitives and their corresponding object wrappers are equal");
-    ok(_.isEqual("Curly", new String("Curly")), "Commutative equality is implemented for string objects and primitives");
-
-    ok(!_.isEqual("Curly", "Larry"), "String primitives with different values are not equal");
-    ok(!_.isEqual(new String("Curly"), new String("Larry")), "String objects with different primitive values are not equal");
-    ok(!_.isEqual(new String("Curly"), {toString: function(){ return "Curly"; }}), "String objects and objects with a custom <toString> method are not equal");
-
-    // Number object and primitive comparisons.
-    ok(_.isEqual(75, 75), "Identical number primitives are equal");
-    ok(_.isEqual(new Number(75), new Number(75)), "Number objects with identical primitive values are equal");
-    ok(_.isEqual(75, new Number(75)), "Number primitives and their corresponding object wrappers are equal");
-    ok(_.isEqual(new Number(75), 75), "Commutative equality is implemented for number objects and primitives");
-    ok(!_.isEqual(new Number(0), -0), "<new Number(0)> and <-0> are not equal");
-    ok(!_.isEqual(0, new Number(-0)), "Commutative equality is implemented for <new Number(0)> and <-0>");
-
-    ok(!_.isEqual(new Number(75), new Number(63)), "Number objects with different primitive values are not equal");
-    ok(!_.isEqual(new Number(63), {valueOf: function(){ return 63; }}), "Number objects and objects with a <valueOf> method are not equal");
-
-    // Comparisons involving <NaN>.
-    ok(_.isEqual(NaN, NaN), "<NaN> is equal to <NaN>");
-    ok(!_.isEqual(61, NaN), "A number primitive is not equal to <NaN>");
-    ok(!_.isEqual(new Number(79), NaN), "A number object is not equal to <NaN>");
-    ok(!_.isEqual(Infinity, NaN), "<Infinity> is not equal to <NaN>");
-
-    // Boolean object and primitive comparisons.
-    ok(_.isEqual(true, true), "Identical boolean primitives are equal");
-    ok(_.isEqual(new Boolean, new Boolean), "Boolean objects with identical primitive values are equal");
-    ok(_.isEqual(true, new Boolean(true)), "Boolean primitives and their corresponding object wrappers are equal");
-    ok(_.isEqual(new Boolean(true), true), "Commutative equality is implemented for booleans");
-    ok(!_.isEqual(new Boolean(true), new Boolean), "Boolean objects with different primitive values are not equal");
-
-    // Common type coercions.
-    ok(!_.isEqual(true, new Boolean(false)), "Boolean objects are not equal to the boolean primitive <true>");
-    ok(!_.isEqual("75", 75), "String and number primitives with like values are not equal");
-    ok(!_.isEqual(new Number(63), new String(63)), "String and number objects with like values are not equal");
-    ok(!_.isEqual(75, "75"), "Commutative equality is implemented for like string and number values");
-    ok(!_.isEqual(0, ""), "Number and string primitives with like values are not equal");
-    ok(!_.isEqual(1, true), "Number and boolean primitives with like values are not equal");
-    ok(!_.isEqual(new Boolean(false), new Number(0)), "Boolean and number objects with like values are not equal");
-    ok(!_.isEqual(false, new String("")), "Boolean primitives and string objects with like values are not equal");
-    ok(!_.isEqual(12564504e5, new Date(2009, 9, 25)), "Dates and their corresponding numeric primitive values are not equal");
-
-    // Dates.
-    ok(_.isEqual(new Date(2009, 9, 25), new Date(2009, 9, 25)), "Date objects referencing identical times are equal");
-    ok(!_.isEqual(new Date(2009, 9, 25), new Date(2009, 11, 13)), "Date objects referencing different times are not equal");
-    ok(!_.isEqual(new Date(2009, 11, 13), {
-      getTime: function(){
-        return 12606876e5;
-      }
-    }), "Date objects and objects with a <getTime> method are not equal");
-    ok(!_.isEqual(new Date("Curly"), new Date("Curly")), "Invalid dates are not equal");
-
-    // Functions.
-    ok(!_.isEqual(First, Second), "Different functions with identical bodies and source code representations are not equal");
-
-    // RegExps.
-    ok(_.isEqual(/(?:)/gim, /(?:)/gim), "RegExps with equivalent patterns and flags are equal");
-    ok(!_.isEqual(/(?:)/g, /(?:)/gi), "RegExps with equivalent patterns and different flags are not equal");
-    ok(!_.isEqual(/Moe/gim, /Curly/gim), "RegExps with different patterns and equivalent flags are not equal");
-    ok(!_.isEqual(/(?:)/gi, /(?:)/g), "Commutative equality is implemented for RegExps");
-    ok(!_.isEqual(/Curly/g, {source: "Larry", global: true, ignoreCase: false, multiline: false}), "RegExps and RegExp-like objects are not equal");
-
-    // Empty arrays, array-like objects, and object literals.
-    ok(_.isEqual({}, {}), "Empty object literals are equal");
-    ok(_.isEqual([], []), "Empty array literals are equal");
-    ok(_.isEqual([{}], [{}]), "Empty nested arrays and objects are equal");
-    ok(!_.isEqual({length: 0}, []), "Array-like objects and arrays are not equal.");
-    ok(!_.isEqual([], {length: 0}), "Commutative equality is implemented for array-like objects");
-
-    ok(!_.isEqual({}, []), "Object literals and array literals are not equal");
-    ok(!_.isEqual([], {}), "Commutative equality is implemented for objects and arrays");
-
-    // Arrays with primitive and object values.
-    ok(_.isEqual([1, "Larry", true], [1, "Larry", true]), "Arrays containing identical primitives are equal");
-    ok(_.isEqual([(/Moe/g), new Date(2009, 9, 25)], [(/Moe/g), new Date(2009, 9, 25)]), "Arrays containing equivalent elements are equal");
-
-    // Multi-dimensional arrays.
-    var a = [new Number(47), false, "Larry", /Moe/, new Date(2009, 11, 13), ['running', 'biking', new String('programming')], {a: 47}];
-    var b = [new Number(47), false, "Larry", /Moe/, new Date(2009, 11, 13), ['running', 'biking', new String('programming')], {a: 47}];
-    ok(_.isEqual(a, b), "Arrays containing nested arrays and objects are recursively compared");
-
-    // Overwrite the methods defined in ES 5.1 section 15.4.4.
-    a.forEach = a.map = a.filter = a.every = a.indexOf = a.lastIndexOf = a.some = a.reduce = a.reduceRight = null;
-    b.join = b.pop = b.reverse = b.shift = b.slice = b.splice = b.concat = b.sort = b.unshift = null;
-
-    // Array elements and properties.
-    ok(_.isEqual(a, b), "Arrays containing equivalent elements and different non-numeric properties are equal");
-    a.push("White Rocks");
-    ok(!_.isEqual(a, b), "Arrays of different lengths are not equal");
-    a.push("East Boulder");
-    b.push("Gunbarrel Ranch", "Teller Farm");
-    ok(!_.isEqual(a, b), "Arrays of identical lengths containing different elements are not equal");
-
-    // Sparse arrays.
-    ok(_.isEqual(Array(3), Array(3)), "Sparse arrays of identical lengths are equal");
-    ok(!_.isEqual(Array(3), Array(6)), "Sparse arrays of different lengths are not equal when both are empty");
-
-    // Simple objects.
-    ok(_.isEqual({a: "Curly", b: 1, c: true}, {a: "Curly", b: 1, c: true}), "Objects containing identical primitives are equal");
-    ok(_.isEqual({a: /Curly/g, b: new Date(2009, 11, 13)}, {a: /Curly/g, b: new Date(2009, 11, 13)}), "Objects containing equivalent members are equal");
-    ok(!_.isEqual({a: 63, b: 75}, {a: 61, b: 55}), "Objects of identical sizes with different values are not equal");
-    ok(!_.isEqual({a: 63, b: 75}, {a: 61, c: 55}), "Objects of identical sizes with different property names are not equal");
-    ok(!_.isEqual({a: 1, b: 2}, {a: 1}), "Objects of different sizes are not equal");
-    ok(!_.isEqual({a: 1}, {a: 1, b: 2}), "Commutative equality is implemented for objects");
-    ok(!_.isEqual({x: 1, y: undefined}, {x: 1, z: 2}), "Objects with identical keys and different values are not equivalent");
-
-    // <A> contains nested objects and arrays.
-    a = {
-      name: new String("Moe Howard"),
-      age: new Number(77),
-      stooge: true,
-      hobbies: ["acting"],
-      film: {
-        name: "Sing a Song of Six Pants",
-        release: new Date(1947, 9, 30),
-        stars: [new String("Larry Fine"), "Shemp Howard"],
-        minutes: new Number(16),
-        seconds: 54
-      }
-    };
-
-    // <B> contains equivalent nested objects and arrays.
-    b = {
-      name: new String("Moe Howard"),
-      age: new Number(77),
-      stooge: true,
-      hobbies: ["acting"],
-      film: {
-        name: "Sing a Song of Six Pants",
-        release: new Date(1947, 9, 30),
-        stars: [new String("Larry Fine"), "Shemp Howard"],
-        minutes: new Number(16),
-        seconds: 54
-      }
-    };
-    ok(_.isEqual(a, b), "Objects with nested equivalent members are recursively compared");
-
-    // Instances.
-    ok(_.isEqual(new First, new First), "Object instances are equal");
-    ok(!_.isEqual(new First, new Second), "Objects with different constructors and identical own properties are not equal");
-    ok(!_.isEqual({value: 1}, new First), "Object instances and objects sharing equivalent properties are not equal");
-    ok(!_.isEqual({value: 2}, new Second), "The prototype chain of objects should not be examined");
-
-    // Circular Arrays.
-    (a = []).push(a);
-    (b = []).push(b);
-    ok(_.isEqual(a, b), "Arrays containing circular references are equal");
-    a.push(new String("Larry"));
-    b.push(new String("Larry"));
-    ok(_.isEqual(a, b), "Arrays containing circular references and equivalent properties are equal");
-    a.push("Shemp");
-    b.push("Curly");
-    ok(!_.isEqual(a, b), "Arrays containing circular references and different properties are not equal");
-
-    // More circular arrays #767.
-    a = ["everything is checked but", "this", "is not"];
-    a[1] = a;
-    b = ["everything is checked but", ["this", "array"], "is not"];
-    ok(!_.isEqual(a, b), "Comparison of circular references with non-circular references are not equal");
-
-    // Circular Objects.
-    a = {abc: null};
-    b = {abc: null};
-    a.abc = a;
-    b.abc = b;
-    ok(_.isEqual(a, b), "Objects containing circular references are equal");
-    a.def = 75;
-    b.def = 75;
-    ok(_.isEqual(a, b), "Objects containing circular references and equivalent properties are equal");
-    a.def = new Number(75);
-    b.def = new Number(63);
-    ok(!_.isEqual(a, b), "Objects containing circular references and different properties are not equal");
-
-    // More circular objects #767.
-    a = {everything: "is checked", but: "this", is: "not"};
-    a.but = a;
-    b = {everything: "is checked", but: {that:"object"}, is: "not"};
-    ok(!_.isEqual(a, b), "Comparison of circular references with non-circular object references are not equal");
-
-    // Cyclic Structures.
-    a = [{abc: null}];
-    b = [{abc: null}];
-    (a[0].abc = a).push(a);
-    (b[0].abc = b).push(b);
-    ok(_.isEqual(a, b), "Cyclic structures are equal");
-    a[0].def = "Larry";
-    b[0].def = "Larry";
-    ok(_.isEqual(a, b), "Cyclic structures containing equivalent properties are equal");
-    a[0].def = new String("Larry");
-    b[0].def = new String("Curly");
-    ok(!_.isEqual(a, b), "Cyclic structures containing different properties are not equal");
-
-    // Complex Circular References.
-    a = {foo: {b: {foo: {c: {foo: null}}}}};
-    b = {foo: {b: {foo: {c: {foo: null}}}}};
-    a.foo.b.foo.c.foo = a;
-    b.foo.b.foo.c.foo = b;
-    ok(_.isEqual(a, b), "Cyclic structures with nested and identically-named properties are equal");
-
-    // Chaining.
-    ok(!_.isEqual(_({x: 1, y: undefined}).chain(), _({x: 1, z: 2}).chain()), 'Chained objects containing different values are not equal');
-
-    a = _({x: 1, y: 2}).chain();
-    b = _({x: 1, y: 2}).chain();
-    equal(_.isEqual(a.isEqual(b), _(true)), true, '<isEqual> can be chained');
-
-    //// Objects from another frame.
-    //ok(_.isEqual({}, iObject));
-  });
-    `)
-}
-
-// isEmpty
-func Test_underscore_objects_11(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isEmpty", function() {
-    ok(!_([1]).isEmpty(), '[1] is not empty');
-    ok(_.isEmpty([]), '[] is empty');
-    ok(!_.isEmpty({one : 1}), '{one : 1} is not empty');
-    ok(_.isEmpty({}), '{} is empty');
-    ok(_.isEmpty(new RegExp('')), 'objects with prototype properties are empty');
-    ok(_.isEmpty(null), 'null is empty');
-    ok(_.isEmpty(), 'undefined is empty');
-    ok(_.isEmpty(''), 'the empty string is empty');
-    ok(!_.isEmpty('moe'), 'but other strings are not');
-
-    var obj = {one : 1};
-    delete obj.one;
-    ok(_.isEmpty(obj), 'deleting all the keys from an object empties it');
-  });
-    `)
-}
-
-// isArguments
-func Test_underscore_objects_13(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isArguments", function() {
-    var args = (function(){ return arguments; })(1, 2, 3);
-    ok(!_.isArguments('string'), 'a string is not an arguments object');
-    ok(!_.isArguments(_.isArguments), 'a function is not an arguments object');
-    ok(_.isArguments(args), 'but the arguments object is an arguments object');
-    ok(!_.isArguments(_.toArray(args)), 'but not when it\'s converted into an array');
-    ok(!_.isArguments([1,2,3]), 'and not vanilla arrays.');
-    //ok(_.isArguments(iArguments), 'even from another frame');
-  });
-    `)
-}
-
-// isObject
-func Test_underscore_objects_14(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isObject", function() {
-    ok(_.isObject(arguments), 'the arguments object is object');
-    ok(_.isObject([1, 2, 3]), 'and arrays');
-    //ok(_.isObject($('html')[0]), 'and DOM element');
-    //ok(_.isObject(iElement), 'even from another frame');
-    ok(_.isObject(function () {}), 'and functions');
-    //ok(_.isObject(iFunction), 'even from another frame');
-    ok(!_.isObject(null), 'but not null');
-    ok(!_.isObject(undefined), 'and not undefined');
-    ok(!_.isObject('string'), 'and not string');
-    ok(!_.isObject(12), 'and not number');
-    ok(!_.isObject(true), 'and not boolean');
-    ok(_.isObject(new String('string')), 'but new String()');
-  });
-    `)
-}
-
-// isArray
-func Test_underscore_objects_15(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isArray", function() {
-    ok(!_.isArray(arguments), 'the arguments object is not an array');
-    ok(_.isArray([1, 2, 3]), 'but arrays are');
-    //ok(_.isArray(iArray), 'even from another frame');
-  });
-    `)
-}
-
-// isString
-func Test_underscore_objects_16(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isString", function() {
-    ok(!_.isString(document.body), 'the document body is not a string');
-    ok(_.isString([1, 2, 3].join(', ')), 'but strings are');
-    //ok(_.isString(iString), 'even from another frame');
-  });
-    `)
-}
-
-// isNumber
-func Test_underscore_objects_17(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isNumber", function() {
-    ok(!_.isNumber('string'), 'a string is not a number');
-    ok(!_.isNumber(arguments), 'the arguments object is not a number');
-    ok(!_.isNumber(undefined), 'undefined is not a number');
-    ok(_.isNumber(3 * 4 - 7 / 10), 'but numbers are');
-    ok(_.isNumber(NaN), 'NaN *is* a number');
-    ok(_.isNumber(Infinity), 'Infinity is a number');
-    //ok(_.isNumber(iNumber), 'even from another frame');
-    ok(!_.isNumber('1'), 'numeric strings are not numbers');
-  });
-    `)
-}
-
-// isBoolean
-func Test_underscore_objects_18(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isBoolean", function() {
-    ok(!_.isBoolean(2), 'a number is not a boolean');
-    ok(!_.isBoolean("string"), 'a string is not a boolean');
-    ok(!_.isBoolean("false"), 'the string "false" is not a boolean');
-    ok(!_.isBoolean("true"), 'the string "true" is not a boolean');
-    ok(!_.isBoolean(arguments), 'the arguments object is not a boolean');
-    ok(!_.isBoolean(undefined), 'undefined is not a boolean');
-    ok(!_.isBoolean(NaN), 'NaN is not a boolean');
-    ok(!_.isBoolean(null), 'null is not a boolean');
-    ok(_.isBoolean(true), 'but true is');
-    ok(_.isBoolean(false), 'and so is false');
-    //ok(_.isBoolean(iBoolean), 'even from another frame');
-  });
-    `)
-}
-
-// isFunction
-func Test_underscore_objects_19(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isFunction", function() {
-    ok(!_.isFunction([1, 2, 3]), 'arrays are not functions');
-    ok(!_.isFunction('moe'), 'strings are not functions');
-    ok(_.isFunction(_.isFunction), 'but functions are');
-    //ok(_.isFunction(iFunction), 'even from another frame');
-  });
-    `)
-}
-
-// isDate
-func Test_underscore_objects_20(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isDate", function() {
-    ok(!_.isDate(100), 'numbers are not dates');
-    ok(!_.isDate({}), 'objects are not dates');
-    ok(_.isDate(new Date()), 'but dates are');
-    //ok(_.isDate(iDate), 'even from another frame');
-  });
-    `)
-}
-
-// isRegExp
-func Test_underscore_objects_21(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isRegExp", function() {
-    ok(!_.isRegExp(_.identity), 'functions are not RegExps');
-    ok(_.isRegExp(/identity/), 'but RegExps are');
-    //ok(_.isRegExp(iRegExp), 'even from another frame');
-  });
-    `)
-}
-
-// isFinite
-func Test_underscore_objects_22(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isFinite", function() {
-    ok(!_.isFinite(undefined), 'undefined is not Finite');
-    ok(!_.isFinite(null), 'null is not Finite');
-    ok(!_.isFinite(NaN), 'NaN is not Finite');
-    ok(!_.isFinite(Infinity), 'Infinity is not Finite');
-    ok(!_.isFinite(-Infinity), '-Infinity is not Finite');
-    ok(_.isFinite('12'), 'Numeric strings are numbers');
-    ok(!_.isFinite('1a'), 'Non numeric strings are not numbers');
-    ok(!_.isFinite(''), 'Empty strings are not numbers');
-    var obj = new Number(5);
-    ok(_.isFinite(obj), 'Number instances can be finite');
-    ok(_.isFinite(0), '0 is Finite');
-    ok(_.isFinite(123), 'Ints are Finite');
-    ok(_.isFinite(-12.44), 'Floats are Finite');
-  });
-    `)
-}
-
-// isNaN
-func Test_underscore_objects_23(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isNaN", function() {
-    ok(!_.isNaN(undefined), 'undefined is not NaN');
-    ok(!_.isNaN(null), 'null is not NaN');
-    ok(!_.isNaN(0), '0 is not NaN');
-    ok(_.isNaN(NaN), 'but NaN is');
-    //ok(_.isNaN(iNaN), 'even from another frame');
-    ok(_.isNaN(new Number(NaN)), 'wrapped NaN is still NaN');
-  });
-    `)
-}
-
-// isNull
-func Test_underscore_objects_24(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isNull", function() {
-    ok(!_.isNull(undefined), 'undefined is not null');
-    ok(!_.isNull(NaN), 'NaN is not null');
-    ok(_.isNull(null), 'but null is');
-    //ok(_.isNull(iNull), 'even from another frame');
-  });
-    `)
-}
-
-// isUndefined
-func Test_underscore_objects_25(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("isUndefined", function() {
-    ok(!_.isUndefined(1), 'numbers are defined');
-    ok(!_.isUndefined(null), 'null is defined');
-    ok(!_.isUndefined(false), 'false is defined');
-    ok(!_.isUndefined(NaN), 'NaN is defined');
-    ok(_.isUndefined(), 'nothing is undefined');
-    ok(_.isUndefined(undefined), 'undefined is undefined');
-    //ok(_.isUndefined(iUndefined), 'even from another frame');
-  });
-    `)
-}
-
-// tap
-func Test_underscore_objects_26(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("tap", function() {
-    var intercepted = null;
-    var interceptor = function(obj) { intercepted = obj; };
-    var returned = _.tap(1, interceptor);
-    equal(intercepted, 1, "passes tapped object to interceptor");
-    equal(returned, 1, "returns tapped object");
-
-    returned = _([1,2,3]).chain().
-      map(function(n){ return n * 2; }).
-      max().
-      tap(interceptor).
-      value();
-    ok(returned == 6 && intercepted == 6, 'can use tapped objects in a chain');
-  });
-    `)
-}
-
-// has
-func Test_underscore_objects_27(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("has", function () {
-     var obj = {foo: "bar", func: function () {} };
-     ok (_.has(obj, "foo"), "has() checks that the object has a property.");
-     ok (_.has(obj, "baz") == false, "has() returns false if the object doesn't have the property.");
-     ok (_.has(obj, "func"), "has() works for functions too.");
-     obj.hasOwnProperty = null;
-     ok (_.has(obj, "foo"), "has() works even when the hasOwnProperty method is deleted.");
-     var child = {};
-     child.prototype = obj;
-     ok (_.has(child, "foo") == false, "has() does not check the prototype chain for a property.")
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/underscore_test.go b/vendor/github.com/robertkrimen/otto/underscore_test.go
deleted file mode 100644
index adc529772..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"github.com/robertkrimen/otto/underscore"
-	"testing"
-)
-
-func init() {
-	underscore.Disable()
-}
-
-var (
-	_underscoreTest = struct {
-		Otto *Otto
-		test func(string, ...interface{}) Value
-	}{}
-)
-
-func underscoreTest() func(string, ...interface{}) Value {
-	cache := &_underscoreTest
-	if cache.Otto == nil {
-		Otto, test := runTestWithOtto()
-		cache.Otto, cache.test = Otto, test
-		Otto.Run(underscore.Source())
-		Otto.Set("assert", func(call FunctionCall) Value {
-			if !toBoolean(call.Argument(0)) {
-				message := "Assertion failed"
-				if len(call.ArgumentList) > 1 {
-					message = toString(call.ArgumentList[1])
-				}
-				Fail(message)
-				return FalseValue()
-			}
-			return TrueValue()
-		})
-
-		Otto.Run(`
-
-            var templateSettings;
-
-            function _setup() {
-                templateSettings = _.clone(_.templateSettings);
-            }
-
-            function _teardown() {
-                _.templateSettings = templateSettings;
-            }
-
-            function module() {
-                /* Nothing happens. */
-            }
-        
-            function equals(a, b, emit) {
-                assert(a == b, emit + ", <" + a + "> != <" + b + ">");
-            }
-            var equal = equals;
-
-            function notStrictEqual(a, b, emit) {
-                assert(a !== b, emit);
-            }
-
-            function strictEqual(a, b, emit) {
-                assert(a === b, emit);
-            }
-
-            function ok(a, emit) {
-                assert(a, emit);
-            }
-
-            function raises(fn, want, emit) {
-                var have, _ok = false;
-                if (typeof want === "string") {
-                    emit = want;
-                    want = null;
-                }
-                
-                try {
-                    fn();
-                } catch(tmp) {
-                    have = tmp;
-                }
-                
-                if (have) {
-                    if (!want) {
-                        _ok = true;
-                    }
-                    else if (want instanceof RegExp) {
-                        _ok = want.test(have);
-                    }
-                    else if (have instanceof want) {
-                        _ok = true
-                    }
-                    else if (want.call({}, have) === true) {
-                        _ok = true;
-                    }
-                }
-                
-                ok(_ok, emit);
-            }
-
-            function test(name){
-                _setup()
-                try {
-                    templateSettings = _.clone(_.templateSettings);
-                    if (arguments.length == 3) {
-                        count = 0
-                        for (count = 0; count < arguments[1]; count++) {
-                            arguments[2]()
-                        }
-                    } else {
-                        // For now.
-                        arguments[1]()
-                    }
-                }
-                catch (tmp) {
-                }
-                _teardown()
-            }
-
-            function deepEqual(a, b, emit) {
-                // Also, for now.
-                assert(_.isEqual(a, b), emit)
-            }
-        `)
-	}
-	return cache.test
-}
-
-func Test_underscore(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-		_.map([1, 2, 3], function(value){
-			return value + 1
-		})
-	`, "2,3,4")
-
-	test(`
-		abc = _.find([1, 2, 3, -1], function(value) { return value == -1 })
-	`, "-1")
-
-	test(`_.isEqual(1, 1)`, "true")
-	test(`_.isEqual([], [])`, "true")
-	test(`_.isEqual(['b', 'd'], ['b', 'd'])`, "true")
-	test(`_.isEqual(['b', 'd', 'c'], ['b', 'd', 'e'])`, "false")
-	test(`_.isFunction(function(){})`, "true")
-
-	test(`_.template('<p>\u2028<%= "\\u2028\\u2029" %>\u2029</p>')()`, "<p>\u2028\u2028\u2029\u2029</p>")
-}
-
-// TODO Test: typeof An argument reference
-// TODO Test: abc = {}; abc == Object(abc)
diff --git a/vendor/github.com/robertkrimen/otto/underscore_utility_test.go b/vendor/github.com/robertkrimen/otto/underscore_utility_test.go
deleted file mode 100644
index 185c55b14..000000000
--- a/vendor/github.com/robertkrimen/otto/underscore_utility_test.go
+++ /dev/null
@@ -1,422 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"testing"
-)
-
-// #750 - Return _ instance.
-func Test_underscore_utility_0(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("#750 - Return _ instance.", 2, function() {
-    var instance = _([]);
-    ok(_(instance) === instance);
-    ok(new _(instance) === instance);
-  });
-    `)
-}
-
-// identity
-func Test_underscore_utility_1(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("identity", function() {
-    var moe = {name : 'moe'};
-    equal(_.identity(moe), moe, 'moe is the same as his identity');
-  });
-    `)
-}
-
-// random
-func Test_underscore_utility_2(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("random", function() {
-    var array = _.range(1000);
-    var min = Math.pow(2, 31);
-    var max = Math.pow(2, 62);
-
-    ok(_.every(array, function() {
-      return _.random(min, max) >= min;
-    }), "should produce a random number greater than or equal to the minimum number");
-
-    ok(_.some(array, function() {
-      return _.random(Number.MAX_VALUE) > 0;
-    }), "should produce a random number when passed <Number.MAX_VALUE>");
-  });
-    `)
-}
-
-// uniqueId
-func Test_underscore_utility_3(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("uniqueId", function() {
-    var ids = [], i = 0;
-    while(i++ < 100) ids.push(_.uniqueId());
-    equal(_.uniq(ids).length, ids.length, 'can generate a globally-unique stream of ids');
-  });
-    `)
-}
-
-// times
-func Test_underscore_utility_4(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("times", function() {
-    var vals = [];
-    _.times(3, function (i) { vals.push(i); });
-    ok(_.isEqual(vals, [0,1,2]), "is 0 indexed");
-    //
-    vals = [];
-    _(3).times(function(i) { vals.push(i); });
-    ok(_.isEqual(vals, [0,1,2]), "works as a wrapper");
-    // collects return values
-    ok(_.isEqual([0, 1, 2], _.times(3, function(i) { return i; })), "collects return values");
-  });
-    `)
-}
-
-// mixin
-func Test_underscore_utility_5(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("mixin", function() {
-    _.mixin({
-      myReverse: function(string) {
-        return string.split('').reverse().join('');
-      }
-    });
-    equal(_.myReverse('panacea'), 'aecanap', 'mixed in a function to _');
-    equal(_('champ').myReverse(), 'pmahc', 'mixed in a function to the OOP wrapper');
-  });
-    `)
-}
-
-// _.escape
-func Test_underscore_utility_6(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("_.escape", function() {
-    equal(_.escape("Curly & Moe"), "Curly &amp; Moe");
-    equal(_.escape("Curly &amp; Moe"), "Curly &amp;amp; Moe");
-    equal(_.escape(null), '');
-  });
-    `)
-}
-
-// _.unescape
-func Test_underscore_utility_7(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("_.unescape", function() {
-    var string = "Curly & Moe";
-    equal(_.unescape("Curly &amp; Moe"), string);
-    equal(_.unescape("Curly &amp;amp; Moe"), "Curly &amp; Moe");
-    equal(_.unescape(null), '');
-    equal(_.unescape(_.escape(string)), string);
-  });
-    `)
-}
-
-// template
-func Test_underscore_utility_8(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test("template", function() {
-    var basicTemplate = _.template("<%= thing %> is gettin' on my noives!");
-    var result = basicTemplate({thing : 'This'});
-    equal(result, "This is gettin' on my noives!", 'can do basic attribute interpolation');
-
-    var sansSemicolonTemplate = _.template("A <% this %> B");
-    equal(sansSemicolonTemplate(), "A  B");
-
-    var backslashTemplate = _.template("<%= thing %> is \\ridanculous");
-    equal(backslashTemplate({thing: 'This'}), "This is \\ridanculous");
-
-    var escapeTemplate = _.template('<%= a ? "checked=\\"checked\\"" : "" %>');
-    equal(escapeTemplate({a: true}), 'checked="checked"', 'can handle slash escapes in interpolations.');
-
-    var fancyTemplate = _.template("<ul><% \
-      for (var key in people) { \
-    %><li><%= people[key] %></li><% } %></ul>");
-    result = fancyTemplate({people : {moe : "Moe", larry : "Larry", curly : "Curly"}});
-    // TODO: Property ordering unreliable
-    //equal(result, "<ul><li>Moe</li><li>Larry</li><li>Curly</li></ul>", 'can run arbitrary javascript in templates');
-
-    var escapedCharsInJavascriptTemplate = _.template("<ul><% _.each(numbers.split('\\n'), function(item) { %><li><%= item %></li><% }) %></ul>");
-    result = escapedCharsInJavascriptTemplate({numbers: "one\ntwo\nthree\nfour"});
-    equal(result, "<ul><li>one</li><li>two</li><li>three</li><li>four</li></ul>", 'Can use escaped characters (e.g. \\n) in Javascript');
-
-    var namespaceCollisionTemplate = _.template("<%= pageCount %> <%= thumbnails[pageCount] %> <% _.each(thumbnails, function(p) { %><div class=\"thumbnail\" rel=\"<%= p %>\"></div><% }); %>");
-    result = namespaceCollisionTemplate({
-      pageCount: 3,
-      thumbnails: {
-        1: "p1-thumbnail.gif",
-        2: "p2-thumbnail.gif",
-        3: "p3-thumbnail.gif"
-      }
-    });
-    // TODO: Property ordering unreliable
-    //equal(result, "3 p3-thumbnail.gif <div class=\"thumbnail\" rel=\"p1-thumbnail.gif\"></div><div class=\"thumbnail\" rel=\"p2-thumbnail.gif\"></div><div class=\"thumbnail\" rel=\"p3-thumbnail.gif\"></div>");
-
-    var noInterpolateTemplate = _.template("<div><p>Just some text. Hey, I know this is silly but it aids consistency.</p></div>");
-    result = noInterpolateTemplate();
-    equal(result, "<div><p>Just some text. Hey, I know this is silly but it aids consistency.</p></div>");
-
-    var quoteTemplate = _.template("It's its, not it's");
-    equal(quoteTemplate({}), "It's its, not it's");
-
-    var quoteInStatementAndBody = _.template("<%\
-      if(foo == 'bar'){ \
-    %>Statement quotes and 'quotes'.<% } %>");
-    equal(quoteInStatementAndBody({foo: "bar"}), "Statement quotes and 'quotes'.");
-
-    var withNewlinesAndTabs = _.template('This\n\t\tis: <%= x %>.\n\tok.\nend.');
-    equal(withNewlinesAndTabs({x: 'that'}), 'This\n\t\tis: that.\n\tok.\nend.');
-
-    var template = _.template("<i><%- value %></i>");
-    var result = template({value: "<script>"});
-    equal(result, '<i>&lt;script&gt;</i>');
-
-    var stooge = {
-      name: "Moe",
-      template: _.template("I'm <%= this.name %>")
-    };
-    equal(stooge.template(), "I'm Moe");
-
-    //if (!$.browser.msie) {
-    //  var fromHTML = _.template($('#template').html());
-    //  equal(fromHTML({data : 12345}).replace(/\s/g, ''), '<li>24690</li>');
-    //}
-
-    _.templateSettings = {
-      evaluate    : /\{\{([\s\S]+?)\}\}/g,
-      interpolate : /\{\{=([\s\S]+?)\}\}/g
-    };
-
-    // TODO: Property ordering unreliable
-    //var custom = _.template("<ul>{{ for (var key in people) { }}<li>{{= people[key] }}</li>{{ } }}</ul>");
-    //result = custom({people : {moe : "Moe", larry : "Larry", curly : "Curly"}});
-    //equal(result, "<ul><li>Moe</li><li>Larry</li><li>Curly</li></ul>", 'can run arbitrary javascript in templates');
-
-    var customQuote = _.template("It's its, not it's");
-    equal(customQuote({}), "It's its, not it's");
-
-    var quoteInStatementAndBody = _.template("{{ if(foo == 'bar'){ }}Statement quotes and 'quotes'.{{ } }}");
-    equal(quoteInStatementAndBody({foo: "bar"}), "Statement quotes and 'quotes'.");
-
-    _.templateSettings = {
-      evaluate    : /<\?([\s\S]+?)\?>/g,
-      interpolate : /<\?=([\s\S]+?)\?>/g
-    };
-
-    // TODO: Property ordering unreliable
-    //var customWithSpecialChars = _.template("<ul><? for (var key in people) { ?><li><?= people[key] ?></li><? } ?></ul>");
-    //result = customWithSpecialChars({people : {moe : "Moe", larry : "Larry", curly : "Curly"}});
-    //equal(result, "<ul><li>Moe</li><li>Larry</li><li>Curly</li></ul>", 'can run arbitrary javascript in templates');
-
-    var customWithSpecialCharsQuote = _.template("It's its, not it's");
-    equal(customWithSpecialCharsQuote({}), "It's its, not it's");
-
-    var quoteInStatementAndBody = _.template("<? if(foo == 'bar'){ ?>Statement quotes and 'quotes'.<? } ?>");
-    equal(quoteInStatementAndBody({foo: "bar"}), "Statement quotes and 'quotes'.");
-
-    _.templateSettings = {
-      interpolate : /\{\{(.+?)\}\}/g
-    };
-
-    var mustache = _.template("Hello {{planet}}!");
-    equal(mustache({planet : "World"}), "Hello World!", "can mimic mustache.js");
-
-    var templateWithNull = _.template("a null undefined {{planet}}");
-    equal(templateWithNull({planet : "world"}), "a null undefined world", "can handle missing escape and evaluate settings");
-  });
-    `)
-}
-
-// _.template provides the generated function source, when a SyntaxError occurs
-func Test_underscore_utility_9(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('_.template provides the generated function source, when a SyntaxError occurs', function() {
-    try {
-      _.template('<b><%= if x %></b>');
-    } catch (ex) {
-      var source = ex.source;
-    }
-    ok(/__p/.test(source));
-  });
-    `)
-}
-
-// _.template handles \\u2028 & \\u2029
-func Test_underscore_utility_10(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('_.template handles \\u2028 & \\u2029', function() {
-    var tmpl = _.template('<p>\u2028<%= "\\u2028\\u2029" %>\u2029</p>');
-    strictEqual(tmpl(), '<p>\u2028\u2028\u2029\u2029</p>');
-  });
-    `)
-}
-
-// result calls functions and returns primitives
-func Test_underscore_utility_11(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('result calls functions and returns primitives', function() {
-    var obj = {w: '', x: 'x', y: function(){ return this.x; }};
-    strictEqual(_.result(obj, 'w'), '');
-    strictEqual(_.result(obj, 'x'), 'x');
-    strictEqual(_.result(obj, 'y'), 'x');
-    strictEqual(_.result(obj, 'z'), undefined);
-    // FIXME: This functionality is being changed in the underscore master right now
-    //strictEqual(_.result(null, 'x'), undefined);
-  });
-    `)
-}
-
-// _.templateSettings.variable
-func Test_underscore_utility_12(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('_.templateSettings.variable', function() {
-    var s = '<%=data.x%>';
-    var data = {x: 'x'};
-    strictEqual(_.template(s, data, {variable: 'data'}), 'x');
-    _.templateSettings.variable = 'data';
-    strictEqual(_.template(s)(data), 'x');
-  });
-    `)
-}
-
-// #547 - _.templateSettings is unchanged by custom settings.
-func Test_underscore_utility_13(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('#547 - _.templateSettings is unchanged by custom settings.', function() {
-    ok(!_.templateSettings.variable);
-    _.template('', {}, {variable: 'x'});
-    ok(!_.templateSettings.variable);
-  });
-    `)
-}
-
-// #556 - undefined template variables.
-func Test_underscore_utility_14(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('#556 - undefined template variables.', function() {
-    var template = _.template('<%=x%>');
-    strictEqual(template({x: null}), '');
-    strictEqual(template({x: undefined}), '');
-
-    var templateEscaped = _.template('<%-x%>');
-    strictEqual(templateEscaped({x: null}), '');
-    strictEqual(templateEscaped({x: undefined}), '');
-
-    var templateWithProperty = _.template('<%=x.foo%>');
-    strictEqual(templateWithProperty({x: {} }), '');
-    strictEqual(templateWithProperty({x: {} }), '');
-
-    var templateWithPropertyEscaped = _.template('<%-x.foo%>');
-    strictEqual(templateWithPropertyEscaped({x: {} }), '');
-    strictEqual(templateWithPropertyEscaped({x: {} }), '');
-  });
-    `)
-}
-
-// interpolate evaluates code only once.
-func Test_underscore_utility_15(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('interpolate evaluates code only once.', 2, function() {
-    var count = 0;
-    var template = _.template('<%= f() %>');
-    template({f: function(){ ok(!(count++)); }});
-
-    var countEscaped = 0;
-    var templateEscaped = _.template('<%- f() %>');
-    templateEscaped({f: function(){ ok(!(countEscaped++)); }});
-  });
-    `)
-}
-
-// #746 - _.template settings are not modified.
-func Test_underscore_utility_16(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('#746 - _.template settings are not modified.', 1, function() {
-    var settings = {};
-    _.template('', null, settings);
-    deepEqual(settings, {});
-  });
-    `)
-}
-
-// #779 - delimeters are applied to unescaped text.
-func Test_underscore_utility_17(t *testing.T) {
-	Terst(t)
-
-	test := underscoreTest()
-
-	test(`
-  test('#779 - delimeters are applied to unescaped text.', 1, function() {
-    var template = _.template('<<\nx\n>>', null, {evaluate: /<<(.*?)>>/g});
-    strictEqual(template(), '<<\nx\n>>');
-  });
-    `)
-}
diff --git a/vendor/github.com/robertkrimen/otto/value.go b/vendor/github.com/robertkrimen/otto/value.go
deleted file mode 100644
index 01f7e9aab..000000000
--- a/vendor/github.com/robertkrimen/otto/value.go
+++ /dev/null
@@ -1,922 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"strconv"
-	"unicode/utf16"
-)
-
-type _valueType int
-
-const (
-	valueEmpty _valueType = iota
-	valueNull
-	valueUndefined
-	valueNumber
-	valueString
-	valueBoolean
-	valueObject
-	valueResult
-	valueReference
-)
-
-// Value is the representation of a JavaScript value.
-type Value struct {
-	_valueType
-	value interface{}
-}
-
-// ToValue will convert an interface{} value to a value digestible by otto/JavaScript
-// This function will not work for advanced types (struct, map, slice/array, etc.) and
-// you probably should not use it.
-//
-// ToValue may be deprecated and removed in the near future.
-//
-// Try Otto.ToValue for a reaplcement.
-func ToValue(value interface{}) (Value, error) {
-	result := UndefinedValue()
-	err := catchPanic(func() {
-		result = toValue(value)
-	})
-	return result, err
-}
-
-// Empty
-
-func emptyValue() Value {
-	return Value{_valueType: valueEmpty}
-}
-
-func (value Value) isEmpty() bool {
-	return value._valueType == valueEmpty
-}
-
-// Undefined
-
-// UndefinedValue will return a Value representing undefined.
-func UndefinedValue() Value {
-	return Value{_valueType: valueUndefined}
-}
-
-// IsDefined will return false if the value is undefined, and true otherwise.
-func (value Value) IsDefined() bool {
-	return value._valueType != valueUndefined
-}
-
-// IsUndefined will return true if the value is undefined, and false otherwise.
-func (value Value) IsUndefined() bool {
-	return value._valueType == valueUndefined
-}
-
-// NullValue will return a Value representing null.
-func NullValue() Value {
-	return Value{_valueType: valueNull}
-}
-
-// IsNull will return true if the value is null, and false otherwise.
-func (value Value) IsNull() bool {
-	return value._valueType == valueNull
-}
-
-// ---
-
-func (value Value) isCallable() bool {
-	switch value := value.value.(type) {
-	case *_object:
-		return value.functionValue().call != nil
-	}
-	return false
-}
-
-func (value Value) isResult() bool {
-	return value._valueType == valueResult
-}
-
-func (value Value) isReference() bool {
-	return value._valueType == valueReference
-}
-
-// Call the value as a function with the given this value and argument list and
-// return the result of invocation. It is essentially equivalent to:
-//
-//		value.apply(thisValue, argumentList)
-//
-// An undefined value and an error will result if:
-//
-//		1. There is an error during conversion of the argument list
-//		2. The value is not actually a function
-//		3. An (uncaught) exception is thrown
-//
-func (value Value) Call(this Value, argumentList ...interface{}) (Value, error) {
-	result := UndefinedValue()
-	err := catchPanic(func() {
-		result = value.call(this, argumentList...)
-	})
-	return result, err
-}
-
-func (value Value) call(this Value, argumentList ...interface{}) Value {
-	switch function := value.value.(type) {
-	case *_object:
-		return function.Call(this, argumentList...)
-	}
-	panic(newTypeError())
-}
-
-func (value Value) constructSafe(this Value, argumentList ...interface{}) (Value, error) {
-	result := UndefinedValue()
-	err := catchPanic(func() {
-		result = value.construct(this, argumentList...)
-	})
-	return result, err
-}
-
-func (value Value) construct(this Value, argumentList ...interface{}) Value {
-	switch function := value.value.(type) {
-	case *_object:
-		return function.Construct(this, argumentList...)
-	}
-	panic(newTypeError())
-}
-
-// IsPrimitive will return true if value is a primitive (any kind of primitive).
-func (value Value) IsPrimitive() bool {
-	return !value.IsObject()
-}
-
-// IsBoolean will return true if value is a boolean (primitive).
-func (value Value) IsBoolean() bool {
-	return value._valueType == valueBoolean
-}
-
-// IsNumber will return true if value is a number (primitive).
-func (value Value) IsNumber() bool {
-	return value._valueType == valueNumber
-}
-
-// IsNaN will return true if value is NaN (or would convert to NaN).
-func (value Value) IsNaN() bool {
-	switch value := value.value.(type) {
-	case float64:
-		return math.IsNaN(value)
-	case float32:
-		return math.IsNaN(float64(value))
-	case int, int8, int32, int64:
-		return false
-	case uint, uint8, uint32, uint64:
-		return false
-	}
-
-	return math.IsNaN(toFloat(value))
-}
-
-// IsString will return true if value is a string (primitive).
-func (value Value) IsString() bool {
-	return value._valueType == valueString
-}
-
-// IsObject will return true if value is an object.
-func (value Value) IsObject() bool {
-	return value._valueType == valueObject
-}
-
-// IsFunction will return true if value is a function.
-func (value Value) IsFunction() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Function"
-}
-
-// Class will return the class string of the value or the empty string if value is not an object.
-//
-// The return value will (generally) be one of:
-//
-//		Object
-//		Function
-//		Array
-//		String
-//		Number
-//		Boolean
-//		Date
-//		RegExp
-//
-func (value Value) Class() string {
-	if value._valueType != valueObject {
-		return ""
-	}
-	return value.value.(*_object).class
-}
-
-func (value Value) isArray() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Array"
-}
-
-func (value Value) isStringObject() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "String"
-}
-
-func (value Value) isBooleanObject() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Boolean"
-}
-
-func (value Value) isNumberObject() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Number"
-}
-
-func (value Value) isDate() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Date"
-}
-
-func (value Value) isRegExp() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "RegExp"
-}
-
-func (value Value) isError() bool {
-	if value._valueType != valueObject {
-		return false
-	}
-	return value.value.(*_object).class == "Error"
-}
-
-// ---
-
-func toValue_reflectValuePanic(value interface{}, kind reflect.Kind) {
-	switch kind {
-	case reflect.Struct:
-		panic(newTypeError("Invalid value (struct): Missing runtime: %v (%T)", value, value))
-	case reflect.Map:
-		panic(newTypeError("Invalid value (map): Missing runtime: %v (%T)", value, value))
-	case reflect.Slice:
-		panic(newTypeError("Invalid value (slice): Missing runtime: %v (%T)", value, value))
-	}
-}
-
-func toValue(value interface{}) Value {
-	switch value := value.(type) {
-	case Value:
-		return value
-	case bool:
-		return Value{valueBoolean, value}
-	case int:
-		return Value{valueNumber, value}
-	case int8:
-		return Value{valueNumber, value}
-	case int16:
-		return Value{valueNumber, value}
-	case int32:
-		return Value{valueNumber, value}
-	case int64:
-		return Value{valueNumber, value}
-	case uint:
-		return Value{valueNumber, value}
-	case uint8:
-		return Value{valueNumber, value}
-	case uint16:
-		return Value{valueNumber, value}
-	case uint32:
-		return Value{valueNumber, value}
-	case uint64:
-		return Value{valueNumber, value}
-	case float32:
-		return Value{valueNumber, float64(value)}
-	case float64:
-		return Value{valueNumber, value}
-	case []uint16:
-		return Value{valueString, value}
-	case string:
-		return Value{valueString, value}
-	// A rune is actually an int32, which is handled above
-	case *_object:
-		return Value{valueObject, value}
-	case *Object:
-		return Value{valueObject, value.object}
-	case Object:
-		return Value{valueObject, value.object}
-	case _reference: // reference is an interface (already a pointer)
-		return Value{valueReference, value}
-	case _result:
-		return Value{valueResult, value}
-	case nil:
-		// TODO Ugh.
-		return UndefinedValue()
-	case reflect.Value:
-		value = reflect.Indirect(value)
-		switch value.Kind() {
-		case reflect.Bool:
-			return Value{valueBoolean, bool(value.Bool())}
-		case reflect.Int:
-			return Value{valueNumber, int(value.Int())}
-		case reflect.Int8:
-			return Value{valueNumber, int8(value.Int())}
-		case reflect.Int16:
-			return Value{valueNumber, int16(value.Int())}
-		case reflect.Int32:
-			return Value{valueNumber, int32(value.Int())}
-		case reflect.Int64:
-			return Value{valueNumber, int64(value.Int())}
-		case reflect.Uint:
-			return Value{valueNumber, uint(value.Uint())}
-		case reflect.Uint8:
-			return Value{valueNumber, uint8(value.Uint())}
-		case reflect.Uint16:
-			return Value{valueNumber, uint16(value.Uint())}
-		case reflect.Uint32:
-			return Value{valueNumber, uint32(value.Uint())}
-		case reflect.Uint64:
-			return Value{valueNumber, uint64(value.Uint())}
-		case reflect.Float32:
-			return Value{valueNumber, float32(value.Float())}
-		case reflect.Float64:
-			return Value{valueNumber, float64(value.Float())}
-		case reflect.String:
-			return Value{valueString, string(value.String())}
-		default:
-			toValue_reflectValuePanic(value.Interface(), value.Kind())
-		}
-	default:
-		{
-			value := reflect.Indirect(reflect.ValueOf(value))
-			toValue_reflectValuePanic(value.Interface(), value.Kind())
-		}
-	}
-	panic(newTypeError("Invalid value: Unsupported: %v (%T)", value, value))
-}
-
-// String will return the value as a string.
-//
-// This method will make return the empty string if there is an error.
-func (value Value) String() string {
-	result := ""
-	catchPanic(func() {
-		result = value.toString()
-	})
-	return result
-}
-
-func (value Value) toBoolean() bool {
-	return toBoolean(value)
-}
-
-func (value Value) isTrue() bool {
-	return toBoolean(value)
-}
-
-// ToBoolean will convert the value to a boolean (bool).
-//
-//		ToValue(0).ToBoolean() => false
-//		ToValue("").ToBoolean() => false
-//		ToValue(true).ToBoolean() => true
-//		ToValue(1).ToBoolean() => true
-//		ToValue("Nothing happens").ToBoolean() => true
-//
-// If there is an error during the conversion process (like an uncaught exception), then the result will be false and an error.
-func (value Value) ToBoolean() (bool, error) {
-	result := false
-	err := catchPanic(func() {
-		result = toBoolean(value)
-	})
-	return result, err
-}
-
-func (value Value) toNumber() Value {
-	return toNumber(value)
-}
-
-func (value Value) toFloat() float64 {
-	return toFloat(value)
-}
-
-// ToFloat will convert the value to a number (float64).
-//
-//		ToValue(0).ToFloat() => 0.
-//		ToValue(1.1).ToFloat() => 1.1
-//		ToValue("11").ToFloat() => 11.
-//
-// If there is an error during the conversion process (like an uncaught exception), then the result will be 0 and an error.
-func (value Value) ToFloat() (float64, error) {
-	result := float64(0)
-	err := catchPanic(func() {
-		result = toFloat(value)
-	})
-	return result, err
-}
-
-// ToInteger will convert the value to a number (int64).
-//
-//		ToValue(0).ToInteger() => 0
-//		ToValue(1.1).ToInteger() => 1
-//		ToValue("11").ToInteger() => 11
-//
-// If there is an error during the conversion process (like an uncaught exception), then the result will be 0 and an error.
-func (value Value) ToInteger() (int64, error) {
-	result := int64(0)
-	err := catchPanic(func() {
-		result = toInteger(value).value
-	})
-	return result, err
-}
-
-func (value Value) toString() string {
-	return toString(value)
-}
-
-// ToString will convert the value to a string (string).
-//
-//		ToValue(0).ToString() => "0"
-//		ToValue(false).ToString() => "false"
-//		ToValue(1.1).ToString() => "1.1"
-//		ToValue("11").ToString() => "11"
-//		ToValue('Nothing happens.').ToString() => "Nothing happens."
-//
-// If there is an error during the conversion process (like an uncaught exception), then the result will be the empty string ("") and an error.
-func (value Value) ToString() (string, error) {
-	result := ""
-	err := catchPanic(func() {
-		result = toString(value)
-	})
-	return result, err
-}
-
-func (value Value) _object() *_object {
-	switch value := value.value.(type) {
-	case *_object:
-		return value
-	}
-	return nil
-}
-
-// Object will return the object of the value, or nil if value is not an object.
-//
-// This method will not do any implicit conversion. For example, calling this method on a string primitive value will not return a String object.
-func (value Value) Object() *Object {
-	switch object := value.value.(type) {
-	case *_object:
-		return _newObject(object, value)
-	}
-	return nil
-}
-
-func (value Value) reference() _reference {
-	switch value := value.value.(type) {
-	case _reference:
-		return value
-	}
-	return nil
-}
-
-var (
-	__NaN__              float64 = math.NaN()
-	__PositiveInfinity__ float64 = math.Inf(+1)
-	__NegativeInfinity__ float64 = math.Inf(-1)
-	__PositiveZero__     float64 = 0
-	__NegativeZero__     float64 = math.Float64frombits(0 | (1 << 63))
-)
-
-func positiveInfinity() float64 {
-	return __PositiveInfinity__
-}
-
-func negativeInfinity() float64 {
-	return __NegativeInfinity__
-}
-
-func positiveZero() float64 {
-	return __PositiveZero__
-}
-
-func negativeZero() float64 {
-	return __NegativeZero__
-}
-
-// NaNValue will return a value representing NaN.
-//
-// It is equivalent to:
-//
-//		ToValue(math.NaN())
-//
-func NaNValue() Value {
-	return Value{valueNumber, __NaN__}
-}
-
-func positiveInfinityValue() Value {
-	return Value{valueNumber, __PositiveInfinity__}
-}
-
-func negativeInfinityValue() Value {
-	return Value{valueNumber, __NegativeInfinity__}
-}
-
-func positiveZeroValue() Value {
-	return Value{valueNumber, __PositiveZero__}
-}
-
-func negativeZeroValue() Value {
-	return Value{valueNumber, __NegativeZero__}
-}
-
-// TrueValue will return a value represting true.
-//
-// It is equivalent to:
-//
-//		ToValue(true)
-//
-func TrueValue() Value {
-	return Value{valueBoolean, true}
-}
-
-// FalseValue will return a value represting false.
-//
-// It is equivalent to:
-//
-//		ToValue(false)
-//
-func FalseValue() Value {
-	return Value{valueBoolean, false}
-}
-
-func sameValue(x Value, y Value) bool {
-	if x._valueType != y._valueType {
-		return false
-	}
-	result := false
-	switch x._valueType {
-	case valueUndefined, valueNull:
-		result = true
-	case valueNumber:
-		x := x.toFloat()
-		y := y.toFloat()
-		if math.IsNaN(x) && math.IsNaN(y) {
-			result = true
-		} else {
-			result = x == y
-			if result && x == 0 {
-				// Since +0 != -0
-				result = math.Signbit(x) == math.Signbit(y)
-			}
-		}
-	case valueString:
-		result = x.toString() == y.toString()
-	case valueBoolean:
-		result = x.toBoolean() == y.toBoolean()
-	case valueObject:
-		result = x._object() == y._object()
-	default:
-		panic(hereBeDragons())
-	}
-
-	return result
-}
-
-// Export will attempt to convert the value to a Go representation
-// and return it via an interface{} kind.
-//
-// WARNING: The interface function will be changing soon to:
-//
-//      Export() interface{}
-//
-// If a reasonable conversion is not possible, then the original
-// result is returned.
-//
-//      undefined   -> otto.Value (UndefinedValue())
-//      null        -> interface{}(nil)
-//      boolean     -> bool
-//      number      -> A number type (int, float32, uint64, ...)
-//      string      -> string
-//      Array       -> []interface{}
-//      Object      -> map[string]interface{}
-//
-func (self Value) Export() (interface{}, error) {
-	return self.export(), nil
-}
-
-func (self Value) export() interface{} {
-
-	switch self._valueType {
-	case valueUndefined:
-		return nil
-	case valueNull:
-		return nil
-	case valueNumber, valueBoolean:
-		return self.value
-	case valueString:
-		switch value := self.value.(type) {
-		case string:
-			return value
-		case []uint16:
-			return string(utf16.Decode(value))
-		}
-	case valueObject:
-		object := self._object()
-		switch value := object.value.(type) {
-		case *_goStructObject:
-			return value.value.Interface()
-		case *_goMapObject:
-			return value.value.Interface()
-		case *_goArrayObject:
-			return value.value.Interface()
-		case *_goSliceObject:
-			return value.value.Interface()
-		}
-		if object.class == "Array" {
-			result := make([]interface{}, 0)
-			lengthValue := object.get("length")
-			length := lengthValue.value.(uint32)
-			for index := uint32(0); index < length; index += 1 {
-				name := strconv.FormatInt(int64(index), 10)
-				if !object.hasProperty(name) {
-					continue
-				}
-				value := object.get(name)
-				result = append(result, value.export())
-			}
-			return result
-		} else {
-			result := make(map[string]interface{})
-			// TODO Should we export everything? Or just what is enumerable?
-			object.enumerate(false, func(name string) bool {
-				value := object.get(name)
-				if value.IsDefined() {
-					result[name] = value.export()
-				}
-				return true
-			})
-			return result
-		}
-	}
-
-	return self
-}
-
-func (self Value) evaluateBreakContinue(labelSet _labelSet) _resultKind {
-	if result, valid := self.value.(_result); valid {
-		switch result.kind {
-		case resultBreak, resultContinue:
-			if labelSet[result.target] {
-				return result.kind
-			}
-		}
-		return resultReturn
-	}
-	return resultNormal
-}
-
-func (self Value) evaluateBreak(labelSet _labelSet) _resultKind {
-	if result, valid := self.value.(_result); valid {
-		switch result.kind {
-		case resultBreak:
-			if labelSet[result.target] {
-				return result.kind
-			}
-		}
-		return resultReturn
-	}
-	return resultNormal
-}
-
-func (self Value) exportNative() interface{} {
-
-	switch self._valueType {
-	case valueUndefined:
-		return self
-	case valueNull:
-		return nil
-	case valueNumber, valueBoolean:
-		return self.value
-	case valueString:
-		switch value := self.value.(type) {
-		case string:
-			return value
-		case []uint16:
-			return string(utf16.Decode(value))
-		}
-	case valueObject:
-		object := self._object()
-		switch value := object.value.(type) {
-		case *_goStructObject:
-			return value.value.Interface()
-		case *_goMapObject:
-			return value.value.Interface()
-		case *_goArrayObject:
-			return value.value.Interface()
-		case *_goSliceObject:
-			return value.value.Interface()
-		}
-	}
-
-	return self
-}
-
-func (value Value) toReflectValue(kind reflect.Kind) (reflect.Value, error) {
-	switch kind {
-	case reflect.Bool:
-		return reflect.ValueOf(value.toBoolean()), nil
-	case reflect.Int:
-		// We convert to float64 here because converting to int64 will not tell us
-		// if a value is outside the range of int64
-		tmp := toIntegerFloat(value)
-		if tmp < float_minInt || tmp > float_maxInt {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to int", tmp, value)
-		} else {
-			return reflect.ValueOf(int(tmp)), nil
-		}
-	case reflect.Int8:
-		tmp := toInteger(value).value
-		if tmp < int64_minInt8 || tmp > int64_maxInt8 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to int8", tmp, value)
-		} else {
-			return reflect.ValueOf(int8(tmp)), nil
-		}
-	case reflect.Int16:
-		tmp := toInteger(value).value
-		if tmp < int64_minInt16 || tmp > int64_maxInt16 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to int16", tmp, value)
-		} else {
-			return reflect.ValueOf(int16(tmp)), nil
-		}
-	case reflect.Int32:
-		tmp := toInteger(value).value
-		if tmp < int64_minInt32 || tmp > int64_maxInt32 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to int32", tmp, value)
-		} else {
-			return reflect.ValueOf(int32(tmp)), nil
-		}
-	case reflect.Int64:
-		// We convert to float64 here because converting to int64 will not tell us
-		// if a value is outside the range of int64
-		tmp := toIntegerFloat(value)
-		if tmp < float_minInt64 || tmp > float_maxInt64 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to int", tmp, value)
-		} else {
-			return reflect.ValueOf(int64(tmp)), nil
-		}
-	case reflect.Uint:
-		// We convert to float64 here because converting to int64 will not tell us
-		// if a value is outside the range of uint
-		tmp := toIntegerFloat(value)
-		if tmp < 0 || tmp > float_maxUint {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to uint", tmp, value)
-		} else {
-			return reflect.ValueOf(uint(tmp)), nil
-		}
-	case reflect.Uint8:
-		tmp := toInteger(value).value
-		if tmp < 0 || tmp > int64_maxUint8 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to uint8", tmp, value)
-		} else {
-			return reflect.ValueOf(uint8(tmp)), nil
-		}
-	case reflect.Uint16:
-		tmp := toInteger(value).value
-		if tmp < 0 || tmp > int64_maxUint16 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to uint16", tmp, value)
-		} else {
-			return reflect.ValueOf(uint16(tmp)), nil
-		}
-	case reflect.Uint32:
-		tmp := toInteger(value).value
-		if tmp < 0 || tmp > int64_maxUint32 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %d (%v) to uint32", tmp, value)
-		} else {
-			return reflect.ValueOf(uint32(tmp)), nil
-		}
-	case reflect.Uint64:
-		// We convert to float64 here because converting to int64 will not tell us
-		// if a value is outside the range of uint64
-		tmp := toIntegerFloat(value)
-		if tmp < 0 || tmp > float_maxUint64 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %f (%v) to uint64", tmp, value)
-		} else {
-			return reflect.ValueOf(uint64(tmp)), nil
-		}
-	case reflect.Float32:
-		tmp := toFloat(value)
-		tmp1 := tmp
-		if 0 > tmp1 {
-			tmp1 = -tmp1
-		}
-		if tmp1 < math.SmallestNonzeroFloat32 || tmp1 > math.MaxFloat32 {
-			return reflect.Value{}, fmt.Errorf("RangeError: %f (%v) to float32", tmp, value)
-		} else {
-			return reflect.ValueOf(float32(tmp)), nil
-		}
-	case reflect.Float64:
-		value := toFloat(value)
-		return reflect.ValueOf(float64(value)), nil
-	case reflect.String:
-		return reflect.ValueOf(value.toString()), nil
-	case reflect.Interface:
-		return reflect.ValueOf(value.exportNative()), nil
-	}
-
-	dbgf("%/panic//%@: Invalid: (%v) to reflect.Kind: %v", value, kind)
-	panic("")
-}
-
-func stringToReflectValue(value string, kind reflect.Kind) (reflect.Value, error) {
-	switch kind {
-	case reflect.Bool:
-		value, err := strconv.ParseBool(value)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(value), nil
-	case reflect.Int:
-		value, err := strconv.ParseInt(value, 0, 0)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(int(value)), nil
-	case reflect.Int8:
-		value, err := strconv.ParseInt(value, 0, 8)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(int8(value)), nil
-	case reflect.Int16:
-		value, err := strconv.ParseInt(value, 0, 16)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(int16(value)), nil
-	case reflect.Int32:
-		value, err := strconv.ParseInt(value, 0, 32)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(int32(value)), nil
-	case reflect.Int64:
-		value, err := strconv.ParseInt(value, 0, 64)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(int64(value)), nil
-	case reflect.Uint:
-		value, err := strconv.ParseUint(value, 0, 0)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(uint(value)), nil
-	case reflect.Uint8:
-		value, err := strconv.ParseUint(value, 0, 8)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(uint8(value)), nil
-	case reflect.Uint16:
-		value, err := strconv.ParseUint(value, 0, 16)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(uint16(value)), nil
-	case reflect.Uint32:
-		value, err := strconv.ParseUint(value, 0, 32)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(uint32(value)), nil
-	case reflect.Uint64:
-		value, err := strconv.ParseUint(value, 0, 64)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(uint64(value)), nil
-	case reflect.Float32:
-		value, err := strconv.ParseFloat(value, 32)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(float32(value)), nil
-	case reflect.Float64:
-		value, err := strconv.ParseFloat(value, 64)
-		if err != nil {
-			return reflect.Value{}, err
-		}
-		return reflect.ValueOf(float64(value)), nil
-	case reflect.String:
-		return reflect.ValueOf(value), nil
-	}
-
-	dbgf("%/panic//%@: Invalid: \"%s\" to reflect.Kind: %v", value, kind)
-	panic("")
-}
diff --git a/vendor/github.com/robertkrimen/otto/value_boolean.go b/vendor/github.com/robertkrimen/otto/value_boolean.go
deleted file mode 100644
index 3f7a5a131..000000000
--- a/vendor/github.com/robertkrimen/otto/value_boolean.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-)
-
-func toBoolean(value Value) bool {
-	if value._valueType == valueBoolean {
-		return value.value.(bool)
-	}
-	if value.IsUndefined() {
-		return false
-	}
-	if value.IsNull() {
-		return false
-	}
-	switch value := value.value.(type) {
-	case bool:
-		return value
-	case int, int8, int16, int32, int64:
-		return 0 != reflect.ValueOf(value).Int()
-	case uint, uint8, uint16, uint32, uint64:
-		return 0 != reflect.ValueOf(value).Uint()
-	case float32:
-		return 0 != value
-	case float64:
-		if math.IsNaN(value) || value == 0 {
-			return false
-		}
-		return true
-	case string:
-		return 0 != len(value)
-	}
-	if value.IsObject() {
-		return true
-	}
-	panic(fmt.Errorf("toBoolean(%T)", value.value))
-}
diff --git a/vendor/github.com/robertkrimen/otto/value_number.go b/vendor/github.com/robertkrimen/otto/value_number.go
deleted file mode 100644
index fd4e6693d..000000000
--- a/vendor/github.com/robertkrimen/otto/value_number.go
+++ /dev/null
@@ -1,321 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-var stringToNumberParseInteger = regexp.MustCompile(`^(?:0[xX])`)
-
-func stringToFloat(value string) float64 {
-	value = strings.TrimSpace(value)
-
-	if value == "" {
-		return 0
-	}
-
-	parseFloat := false
-	if strings.IndexRune(value, '.') != -1 {
-		parseFloat = true
-	} else if stringToNumberParseInteger.MatchString(value) {
-		parseFloat = false
-	} else {
-		parseFloat = true
-	}
-
-	if parseFloat {
-		number, err := strconv.ParseFloat(value, 64)
-		if err != nil && err.(*strconv.NumError).Err != strconv.ErrRange {
-			return math.NaN()
-		}
-		return number
-	}
-
-	number, err := strconv.ParseInt(value, 0, 64)
-	if err != nil {
-		return math.NaN()
-	}
-	return float64(number)
-}
-
-func toNumber(value Value) Value {
-	if value._valueType == valueNumber {
-		return value
-	}
-	return Value{valueNumber, toFloat(value)}
-}
-
-func toFloat(value Value) float64 {
-	switch value._valueType {
-	case valueUndefined:
-		return math.NaN()
-	case valueNull:
-		return 0
-	}
-	switch value := value.value.(type) {
-	case bool:
-		if value {
-			return 1
-		}
-		return 0
-	case int:
-		return float64(value)
-	case int8:
-		return float64(value)
-	case int16:
-		return float64(value)
-	case int32:
-		return float64(value)
-	case int64:
-		return float64(value)
-	case uint:
-		return float64(value)
-	case uint8:
-		return float64(value)
-	case uint16:
-		return float64(value)
-	case uint32:
-		return float64(value)
-	case uint64:
-		return float64(value)
-	case float64:
-		return value
-	case string:
-		return stringToFloat(value)
-	case *_object:
-		return toFloat(value.DefaultValue(defaultValueHintNumber))
-	}
-	panic(fmt.Errorf("toFloat(%T)", value.value))
-}
-
-const (
-	float_2_64   float64 = 18446744073709551616.0
-	float_2_63   float64 = 9223372036854775808.0
-	float_2_32   float64 = 4294967296.0
-	float_2_31   float64 = 2147483648.0
-	float_2_16   float64 = 65536.0
-	integer_2_32 int64   = 4294967296
-	integer_2_31 int64   = 2146483648
-	sqrt1_2      float64 = math.Sqrt2 / 2
-)
-
-const (
-	maxInt8   = math.MaxInt8
-	minInt8   = math.MinInt8
-	maxInt16  = math.MaxInt16
-	minInt16  = math.MinInt16
-	maxInt32  = math.MaxInt32
-	minInt32  = math.MinInt32
-	maxInt64  = math.MaxInt64
-	minInt64  = math.MinInt64
-	maxUint8  = math.MaxUint8
-	maxUint16 = math.MaxUint16
-	maxUint32 = math.MaxUint32
-	maxUint64 = math.MaxUint64
-	maxUint   = ^uint(0)
-	minUint   = 0
-	maxInt    = int(^uint(0) >> 1)
-	minInt    = -maxInt - 1
-
-	// int64
-	int64_maxInt    int64 = int64(maxInt)
-	int64_minInt    int64 = int64(minInt)
-	int64_maxInt8   int64 = math.MaxInt8
-	int64_minInt8   int64 = math.MinInt8
-	int64_maxInt16  int64 = math.MaxInt16
-	int64_minInt16  int64 = math.MinInt16
-	int64_maxInt32  int64 = math.MaxInt32
-	int64_minInt32  int64 = math.MinInt32
-	int64_maxUint8  int64 = math.MaxUint8
-	int64_maxUint16 int64 = math.MaxUint16
-	int64_maxUint32 int64 = math.MaxUint32
-
-	// float64
-	float_maxInt    float64 = float64(int(^uint(0) >> 1))
-	float_minInt    float64 = float64(int(-maxInt - 1))
-	float_minUint   float64 = float64(0)
-	float_maxUint   float64 = float64(uint(^uint(0)))
-	float_minUint64 float64 = float64(0)
-	float_maxUint64 float64 = math.MaxUint64
-	float_maxInt64  float64 = math.MaxInt64
-	float_minInt64  float64 = math.MinInt64
-)
-
-func toIntegerFloat(value Value) float64 {
-	float := value.toFloat()
-	if math.IsInf(float, 0) {
-	} else if math.IsNaN(float) {
-		float = 0
-	} else if float > 0 {
-		float = math.Floor(float)
-	} else {
-		float = math.Ceil(float)
-	}
-	return float
-}
-
-type _integerKind int
-
-const (
-	integerValid _integerKind = iota
-	integerInfinite
-	integerInvalid
-)
-
-type _integer struct {
-	_integerKind
-	value int64
-}
-
-func (self _integer) valid() bool {
-	return self._integerKind == integerValid
-}
-
-func (self _integer) infinite() bool {
-	return self._integerKind == integerInfinite
-}
-
-func toInteger(value Value) (integer _integer) {
-	switch value := value.value.(type) {
-	case int8:
-		integer.value = int64(value)
-		return
-	case int16:
-		integer.value = int64(value)
-		return
-	case uint8:
-		integer.value = int64(value)
-		return
-	case uint16:
-		integer.value = int64(value)
-		return
-	case uint32:
-		integer.value = int64(value)
-		return
-	case int:
-		integer.value = int64(value)
-		return
-	case int64:
-		integer.value = value
-		return
-	}
-	{
-		value := value.toFloat()
-		if value == 0 {
-			return
-		}
-		if math.IsNaN(value) {
-			integer._integerKind = integerInvalid
-			return
-		}
-		if math.IsInf(value, 0) {
-			integer._integerKind = integerInfinite
-		}
-		if value >= float_maxInt64 {
-			integer.value = math.MaxInt64
-			return
-		}
-		if value <= float_minInt64 {
-			integer.value = math.MinInt64
-			return
-		}
-		if value > 0 {
-			integer.value = int64(math.Floor(value))
-			return
-		}
-		integer.value = int64(math.Ceil(value))
-		return
-	}
-}
-
-// ECMA 262: 9.5
-func toInt32(value Value) int32 {
-	{
-		switch value := value.value.(type) {
-		case int8:
-			return int32(value)
-		case int16:
-			return int32(value)
-		case int32:
-			return value
-		}
-	}
-	floatValue := value.toFloat()
-	if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
-		return 0
-	}
-	if floatValue == 0 { // This will work for +0 & -0
-		return 0
-	}
-	remainder := math.Mod(floatValue, float_2_32)
-	if remainder > 0 {
-		remainder = math.Floor(remainder)
-	} else {
-		remainder = math.Ceil(remainder) + float_2_32
-	}
-	if remainder > float_2_31 {
-		return int32(remainder - float_2_32)
-	}
-	return int32(remainder)
-}
-
-func toUint32(value Value) uint32 {
-	{
-		switch value := value.value.(type) {
-		case int8:
-			return uint32(value)
-		case int16:
-			return uint32(value)
-		case uint8:
-			return uint32(value)
-		case uint16:
-			return uint32(value)
-		case uint32:
-			return value
-		}
-	}
-	floatValue := value.toFloat()
-	if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
-		return 0
-	}
-	if floatValue == 0 {
-		return 0
-	}
-	remainder := math.Mod(floatValue, float_2_32)
-	if remainder > 0 {
-		remainder = math.Floor(remainder)
-	} else {
-		remainder = math.Ceil(remainder) + float_2_32
-	}
-	return uint32(remainder)
-}
-
-func toUint16(value Value) uint16 {
-	{
-		switch value := value.value.(type) {
-		case int8:
-			return uint16(value)
-		case uint8:
-			return uint16(value)
-		case uint16:
-			return value
-		}
-	}
-	floatValue := value.toFloat()
-	if math.IsNaN(floatValue) || math.IsInf(floatValue, 0) {
-		return 0
-	}
-	if floatValue == 0 {
-		return 0
-	}
-	remainder := math.Mod(floatValue, float_2_16)
-	if remainder > 0 {
-		remainder = math.Floor(remainder)
-	} else {
-		remainder = math.Ceil(remainder) + float_2_16
-	}
-	return uint16(remainder)
-}
diff --git a/vendor/github.com/robertkrimen/otto/value_primitive.go b/vendor/github.com/robertkrimen/otto/value_primitive.go
deleted file mode 100644
index 1f85fb06b..000000000
--- a/vendor/github.com/robertkrimen/otto/value_primitive.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package otto
-
-func toStringPrimitive(value Value) Value {
-	return _toPrimitive(value, defaultValueHintString)
-}
-
-func toNumberPrimitive(value Value) Value {
-	return _toPrimitive(value, defaultValueHintNumber)
-}
-
-func toPrimitive(value Value) Value {
-	return _toPrimitive(value, defaultValueNoHint)
-}
-
-func _toPrimitive(value Value, hint _defaultValueHint) Value {
-	switch value._valueType {
-	case valueNull, valueUndefined, valueNumber, valueString, valueBoolean:
-		return value
-	case valueObject:
-		return value._object().DefaultValue(hint)
-	}
-	panic(hereBeDragons(value._valueType, value))
-}
diff --git a/vendor/github.com/robertkrimen/otto/value_string.go b/vendor/github.com/robertkrimen/otto/value_string.go
deleted file mode 100644
index 30194ddf5..000000000
--- a/vendor/github.com/robertkrimen/otto/value_string.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package otto
-
-import (
-	"fmt"
-	"math"
-	"regexp"
-	"strconv"
-	"unicode/utf16"
-)
-
-var matchLeading0Exponent = regexp.MustCompile(`([eE][\+\-])0+([1-9])`)
-
-func floatToString(value float64, bitsize int) string {
-	// TODO Fit to ECMA-262 9.8.1 specification
-	if math.IsNaN(value) {
-		return "NaN"
-	} else if math.IsInf(value, 0) {
-		if math.Signbit(value) {
-			return "-Infinity"
-		}
-		return "Infinity"
-	}
-	exponent := math.Log10(math.Abs(value))
-	if exponent >= 21 || exponent < -6 {
-		return matchLeading0Exponent.ReplaceAllString(strconv.FormatFloat(value, 'g', -1, bitsize), "$1$2")
-	}
-	return strconv.FormatFloat(value, 'f', -1, bitsize)
-}
-
-func numberToStringRadix(value Value, radix int) string {
-	float := toFloat(value)
-	if math.IsNaN(float) {
-		return "NaN"
-	} else if math.IsInf(float, 1) {
-		return "Infinity"
-	} else if math.IsInf(float, -1) {
-		return "-Infinity"
-	}
-	// FIXME This is very broken
-	// Need to do proper radix conversion for floats, ...
-	// This truncates large floats (so bad).
-	return strconv.FormatInt(int64(float), radix)
-}
-
-func toString(value Value) string {
-	if value._valueType == valueString {
-		switch value := value.value.(type) {
-		case string:
-			return value
-		case []uint16:
-			return string(utf16.Decode(value))
-		}
-	}
-	if value.IsUndefined() {
-		return "undefined"
-	}
-	if value.IsNull() {
-		return "null"
-	}
-	switch value := value.value.(type) {
-	case bool:
-		return strconv.FormatBool(value)
-	case int:
-		return strconv.FormatInt(int64(value), 10)
-	case int8:
-		return strconv.FormatInt(int64(value), 10)
-	case int16:
-		return strconv.FormatInt(int64(value), 10)
-	case int32:
-		return strconv.FormatInt(int64(value), 10)
-	case int64:
-		return strconv.FormatInt(value, 10)
-	case uint:
-		return strconv.FormatUint(uint64(value), 10)
-	case uint8:
-		return strconv.FormatUint(uint64(value), 10)
-	case uint16:
-		return strconv.FormatUint(uint64(value), 10)
-	case uint32:
-		return strconv.FormatUint(uint64(value), 10)
-	case uint64:
-		return strconv.FormatUint(value, 10)
-	case float32:
-		if value == 0 {
-			return "0" // Take care not to return -0
-		}
-		return floatToString(float64(value), 32)
-	case float64:
-		if value == 0 {
-			return "0" // Take care not to return -0
-		}
-		return floatToString(value, 64)
-	case []uint16:
-		return string(utf16.Decode(value))
-	case string:
-		return value
-	case *_object:
-		return toString(value.DefaultValue(defaultValueHintString))
-	}
-	panic(fmt.Errorf("toString(%v %T)", value.value, value.value))
-}
diff --git a/vendor/github.com/robertkrimen/otto/value_test.go b/vendor/github.com/robertkrimen/otto/value_test.go
deleted file mode 100644
index 9b28bc427..000000000
--- a/vendor/github.com/robertkrimen/otto/value_test.go
+++ /dev/null
@@ -1,238 +0,0 @@
-package otto
-
-import (
-	. "./terst"
-	"encoding/json"
-	"math"
-	"testing"
-)
-
-func TestValue(t *testing.T) {
-	Terst(t)
-
-	value := UndefinedValue()
-	Is(value.IsUndefined(), true)
-	Is(value, UndefinedValue())
-	Is(value, "undefined")
-
-	Is(toValue(false), "false")
-	Is(toValue(1), "1")
-	Equal(toValue(1).toFloat(), float64(1))
-}
-
-func TestObject(t *testing.T) {
-	Terst(t)
-
-	Is(Value{}.isEmpty(), true)
-	//Is(newObject().Value(), "[object]")
-	//Is(newBooleanObject(false).Value(), "false")
-	//Is(newFunctionObject(nil).Value(), "[function]")
-	//Is(newNumberObject(1).Value(), "1")
-	//Is(newStringObject("Hello, World.").Value(), "Hello, World.")
-}
-
-func TestToValue(t *testing.T) {
-	Terst(t)
-
-	//Is(toValue(newObjectValue()), "[object]")
-
-	otto, _ := runTestWithOtto()
-
-	value, _ := otto.ToValue(nil)
-	Is(value, "undefined")
-}
-
-func TestToBoolean(t *testing.T) {
-	Terst(t)
-	is := func(left interface{}, right bool) {
-		Is(toValue(left).toBoolean(), right)
-	}
-	is("", false)
-	is("xyzzy", true)
-	is(1, true)
-	is(0, false)
-	//is(toValue(newObject()), true)
-	is(UndefinedValue(), false)
-	is(NullValue(), false)
-}
-
-func TestToFloat(t *testing.T) {
-	Terst(t)
-	is := func(left interface{}, right float64) {
-		if math.IsNaN(right) {
-			Is(toValue(left).toFloat(), "NaN")
-		} else {
-			Is(toValue(left).toFloat(), right)
-		}
-	}
-	is("", 0)
-	is("xyzzy", math.NaN())
-	is("2", 2)
-	is(1, 1)
-	is(0, 0)
-	//is(newObjectValue(), math.NaN())
-	IsTrue(math.IsNaN(UndefinedValue().toFloat()))
-	is(NullValue(), 0)
-}
-
-func TestToObject(t *testing.T) {
-	Terst(t)
-}
-
-func TestToString(t *testing.T) {
-	Terst(t)
-	Is("undefined", UndefinedValue().toString())
-	Is("null", NullValue().toString())
-	Is("true", toValue(true).toString())
-	Is("false", toValue(false).toString())
-
-	Is(UndefinedValue(), "undefined")
-	Is(NullValue(), "null")
-	Is(toValue(true), "true")
-	Is(toValue(false), "false")
-}
-
-func Test_toInt32(t *testing.T) {
-	Terst(t)
-
-	test := []interface{}{
-		0, int32(0),
-		1, int32(1),
-		-2147483649.0, int32(2147483647),
-		-4294967297.0, int32(-1),
-		-4294967296.0, int32(0),
-		-4294967295.0, int32(1),
-		math.Inf(+1), int32(0),
-		math.Inf(-1), int32(0),
-	}
-	for index := 0; index < len(test)/2; index++ {
-		Like(
-			toInt32(toValue(test[index*2])),
-			test[index*2+1].(int32),
-		)
-	}
-}
-
-func Test_toUint32(t *testing.T) {
-	Terst(t)
-
-	test := []interface{}{
-		0, uint32(0),
-		1, uint32(1),
-		-2147483649.0, uint32(2147483647),
-		-4294967297.0, uint32(4294967295),
-		-4294967296.0, uint32(0),
-		-4294967295.0, uint32(1),
-		math.Inf(+1), uint32(0),
-		math.Inf(-1), uint32(0),
-	}
-	for index := 0; index < len(test)/2; index++ {
-		Like(
-			toUint32(toValue(test[index*2])),
-			test[index*2+1].(uint32),
-		)
-	}
-}
-
-func Test_toUint16(t *testing.T) {
-	Terst(t)
-
-	test := []interface{}{
-		0, uint16(0),
-		1, uint16(1),
-		-2147483649.0, uint16(65535),
-		-4294967297.0, uint16(65535),
-		-4294967296.0, uint16(0),
-		-4294967295.0, uint16(1),
-		math.Inf(+1), uint16(0),
-		math.Inf(-1), uint16(0),
-	}
-	for index := 0; index < len(test)/2; index++ {
-		Like(
-			toUint16(toValue(test[index*2])),
-			test[index*2+1].(uint16),
-		)
-	}
-}
-
-func Test_sameValue(t *testing.T) {
-	Terst(t)
-
-	IsFalse(sameValue(positiveZeroValue(), negativeZeroValue()))
-	IsTrue(sameValue(positiveZeroValue(), toValue(0)))
-	IsTrue(sameValue(NaNValue(), NaNValue()))
-	IsFalse(sameValue(NaNValue(), toValue("Nothing happens.")))
-}
-
-func TestExport(t *testing.T) {
-	Terst(t)
-
-	test := runTest()
-
-	Is(test(`null;`).export(), nil)
-	Is(test(`undefined;`).export(), nil)
-	Is(test(`true;`).export(), true)
-	Is(test(`false;`).export(), false)
-	Is(test(`0;`).export(), 0)
-	Is(test(`3.1459`).export(), 3.1459)
-	Is(test(`"Nothing happens";`).export(), "Nothing happens")
-	Is(test(`String.fromCharCode(97,98,99,100,101,102)`).export(), "abcdef")
-	{
-		value := test(`({ abc: 1, def: true, ghi: undefined });`).export().(map[string]interface{})
-		Is(value["abc"], 1)
-		Is(value["def"], true)
-		_, exists := value["ghi"]
-		Is(exists, false)
-	}
-	{
-		value := test(`[ "abc", 1, "def", true, undefined, null ];`).export().([]interface{})
-		Is(value[0], "abc")
-		Is(value[1], 1)
-		Is(value[2], "def")
-		Is(value[3], true)
-		Is(value[4], nil)
-		Is(value[5], nil)
-		Is(value[5], interface{}(nil))
-	}
-
-	roundtrip := []interface{}{
-		true,
-		false,
-		0,
-		3.1459,
-		[]interface{}{true, false, 0, 3.1459, "abc"},
-		map[string]interface{}{
-			"Boolean": true,
-			"Number":  3.1459,
-			"String":  "abc",
-			"Array":   []interface{}{false, 0, "", nil},
-			"Object": map[string]interface{}{
-				"Boolean": false,
-				"Number":  0,
-				"String":  "def",
-			},
-		},
-	}
-
-	for _, value := range roundtrip {
-		input, err := json.Marshal(value)
-		Is(err, nil)
-
-		output, err := json.Marshal(test("(" + string(input) + ");").export())
-		Is(err, nil)
-
-		Is(string(input), string(output))
-	}
-
-	{
-		abc := struct {
-			def int
-			ghi interface{}
-			xyz float32
-		}{}
-		abc.def = 3
-		abc.xyz = 3.1459
-		failSet("abc", abc)
-		Is(test(`abc;`).export(), abc)
-	}
-}
diff --git a/vendor/github.com/stathat/consistent/LICENSE b/vendor/github.com/stathat/consistent/LICENSE
deleted file mode 100644
index 814c09c66..000000000
--- a/vendor/github.com/stathat/consistent/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2012 Numerotron 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/vendor/github.com/stathat/consistent/README.md b/vendor/github.com/stathat/consistent/README.md
deleted file mode 100644
index 919527f9b..000000000
--- a/vendor/github.com/stathat/consistent/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-consistent
-==========
-
-Consistent hash package for Go.
-
-Installation
-------------
-
-    go get github.com/stathat/consistent
-
-Examples
---------
-
-Look at the godoc.
-
-Status
-------
-
-This package was extracted from production code powering [StatHat](http://www.stathat.com),
-so clearly we feel that it is production-ready, but it should still be considered
-experimental as other uses of it could reveal issues we aren't experiencing.
-
-Contact us
-----------
-
-We'd love to hear from you if you are using `consistent`.
-Get in touch:  [@stat_hat](http://twitter.com/stat_hat) or [contact us here](http://www.stathat.com/docs/contact).
-
-About
------
-
-Written by Patrick Crosby at [StatHat](http://www.stathat.com).  Twitter:  [@stat_hat](http://twitter.com/stat_hat)
diff --git a/vendor/github.com/stathat/consistent/consistent.go b/vendor/github.com/stathat/consistent/consistent.go
deleted file mode 100644
index 95322ca4b..000000000
--- a/vendor/github.com/stathat/consistent/consistent.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright (C) 2012 Numerotron Inc.
-// Use of this source code is governed by an MIT-style license
-// that can be found in the LICENSE file.
-
-// Package consistent provides a consistent hashing function.
-//
-// Consistent hashing is often used to distribute requests to a changing set of servers.  For example,
-// say you have some cache servers cacheA, cacheB, and cacheC.  You want to decide which cache server
-// to use to look up information on a user.
-//
-// You could use a typical hash table and hash the user id
-// to one of cacheA, cacheB, or cacheC.  But with a typical hash table, if you add or remove a server,
-// almost all keys will get remapped to different results, which basically could bring your service
-// to a grinding halt while the caches get rebuilt.
-//
-// With a consistent hash, adding or removing a server drastically reduces the number of keys that
-// get remapped.
-//
-// Read more about consistent hashing on wikipedia:  http://en.wikipedia.org/wiki/Consistent_hashing
-//
-package consistent
-
-import (
-	"errors"
-	"hash/crc32"
-	"sort"
-	"strconv"
-	"sync"
-)
-
-type uints []uint32
-
-// Len returns the length of the uints array.
-func (x uints) Len() int { return len(x) }
-
-// Less returns true if element i is less than element j.
-func (x uints) Less(i, j int) bool { return x[i] < x[j] }
-
-// Swap exchanges elements i and j.
-func (x uints) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-
-// ErrEmptyCircle is the error returned when trying to get an element when nothing has been added to hash.
-var ErrEmptyCircle = errors.New("empty circle")
-
-// Consistent holds the information about the members of the consistent hash circle.
-type Consistent struct {
-	circle           map[uint32]string
-	members          map[string]bool
-	sortedHashes     uints
-	NumberOfReplicas int
-	count            int64
-	scratch          [64]byte
-	sync.RWMutex
-}
-
-// New creates a new Consistent object with a default setting of 20 replicas for each entry.
-//
-// To change the number of replicas, set NumberOfReplicas before adding entries.
-func New() *Consistent {
-	c := new(Consistent)
-	c.NumberOfReplicas = 20
-	c.circle = make(map[uint32]string)
-	c.members = make(map[string]bool)
-	return c
-}
-
-// eltKey generates a string key for an element with an index.
-func (c *Consistent) eltKey(elt string, idx int) string {
-	return elt + "|" + strconv.Itoa(idx)
-}
-
-// Add inserts a string element in the consistent hash.
-func (c *Consistent) Add(elt string) {
-	c.Lock()
-	defer c.Unlock()
-	for i := 0; i < c.NumberOfReplicas; i++ {
-		c.circle[c.hashKey(c.eltKey(elt, i))] = elt
-	}
-	c.members[elt] = true
-	c.updateSortedHashes()
-	c.count++
-}
-
-// Remove removes an element from the hash.
-func (c *Consistent) Remove(elt string) {
-	c.Lock()
-	defer c.Unlock()
-	for i := 0; i < c.NumberOfReplicas; i++ {
-		delete(c.circle, c.hashKey(c.eltKey(elt, i)))
-	}
-	delete(c.members, elt)
-	c.updateSortedHashes()
-	c.count--
-}
-
-// Set sets all the elements in the hash.  If there are existing elements not present in elts, they will be removed.
-func (c *Consistent) Set(elts []string) {
-	mems := c.Members()
-	for _, k := range mems {
-		found := false
-		for _, v := range elts {
-			if k == v {
-				found = true
-				break
-			}
-		}
-		if !found {
-			c.Remove(k)
-		}
-	}
-	for _, v := range elts {
-		c.RLock()
-		_, exists := c.members[v]
-		c.RUnlock()
-		if exists {
-			continue
-		}
-		c.Add(v)
-	}
-}
-
-func (c *Consistent) Members() []string {
-	c.RLock()
-	defer c.RUnlock()
-	var m []string
-	for k := range c.members {
-		m = append(m, k)
-	}
-	return m
-}
-
-// Get returns an element close to where name hashes to in the circle.
-func (c *Consistent) Get(name string) (string, error) {
-	c.RLock()
-	defer c.RUnlock()
-	if len(c.circle) == 0 {
-		return "", ErrEmptyCircle
-	}
-	key := c.hashKey(name)
-	i := c.search(key)
-	return c.circle[c.sortedHashes[i]], nil
-}
-
-func (c *Consistent) search(key uint32) (i int) {
-	f := func(x int) bool {
-		return c.sortedHashes[x] > key
-	}
-	i = sort.Search(len(c.sortedHashes), f)
-	if i >= len(c.sortedHashes) {
-		i = 0
-	}
-	return
-}
-
-// GetTwo returns the two closest distinct elements to the name input in the circle.
-func (c *Consistent) GetTwo(name string) (string, string, error) {
-	c.RLock()
-	defer c.RUnlock()
-	if len(c.circle) == 0 {
-		return "", "", ErrEmptyCircle
-	}
-	key := c.hashKey(name)
-	i := c.search(key)
-	a := c.circle[c.sortedHashes[i]]
-
-	if c.count == 1 {
-		return a, "", nil
-	}
-
-	start := i
-	var b string
-	for i = start + 1; i != start; i++ {
-		if i >= len(c.sortedHashes) {
-			i = 0
-		}
-		b = c.circle[c.sortedHashes[i]]
-		if b != a {
-			break
-		}
-	}
-	return a, b, nil
-}
-
-func (c *Consistent) hashKey(key string) uint32 {
-	if len(key) < 64 {
-		copy(c.scratch[:], key)
-		return crc32.ChecksumIEEE(c.scratch[:len(key)])
-	}
-	return crc32.ChecksumIEEE([]byte(key))
-}
-
-func (c *Consistent) updateSortedHashes() {
-	hashes := c.sortedHashes[:0]
-	//reallocate if we're holding on to too much (1/4th)
-	if cap(c.sortedHashes)/(c.NumberOfReplicas*4) > len(c.circle) {
-		hashes = nil
-	}
-	for k := range c.circle {
-		hashes = append(hashes, k)
-	}
-	sort.Sort(hashes)
-	c.sortedHashes = hashes
-}
diff --git a/vendor/github.com/stathat/consistent/consistent_test.go b/vendor/github.com/stathat/consistent/consistent_test.go
deleted file mode 100644
index f1535f1d3..000000000
--- a/vendor/github.com/stathat/consistent/consistent_test.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright (C) 2012 Numerotron Inc.
-// Use of this source code is governed by an MIT-style license
-// that can be found in the LICENSE file.
-
-package consistent
-
-import (
-	"runtime"
-	"sort"
-	"strconv"
-	"testing"
-	"testing/quick"
-)
-
-func checkNum(num, expected int, t *testing.T) {
-	if num != expected {
-		t.Errorf("expected %d, got %d", expected, num)
-	}
-}
-
-func TestNew(t *testing.T) {
-	x := New()
-	if x == nil {
-		t.Errorf("expected obj")
-	}
-	checkNum(x.NumberOfReplicas, 20, t)
-}
-
-func TestAdd(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	checkNum(len(x.circle), 20, t)
-	checkNum(len(x.sortedHashes), 20, t)
-	if sort.IsSorted(x.sortedHashes) == false {
-		t.Errorf("expected sorted hashes to be sorted")
-	}
-	x.Add("qwer")
-	checkNum(len(x.circle), 40, t)
-	checkNum(len(x.sortedHashes), 40, t)
-	if sort.IsSorted(x.sortedHashes) == false {
-		t.Errorf("expected sorted hashes to be sorted")
-	}
-}
-
-func TestRemove(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Remove("abcdefg")
-	checkNum(len(x.circle), 0, t)
-	checkNum(len(x.sortedHashes), 0, t)
-}
-
-func TestRemoveNonExisting(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Remove("abcdefghijk")
-	checkNum(len(x.circle), 20, t)
-}
-
-func TestGetEmpty(t *testing.T) {
-	x := New()
-	_, err := x.Get("asdfsadfsadf")
-	if err == nil {
-		t.Errorf("expected error")
-	}
-	if err != ErrEmptyCircle {
-		t.Errorf("expected empty circle error")
-	}
-}
-
-func TestGetSingle(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	f := func(s string) bool {
-		y, err := x.Get(s)
-		if err != nil {
-			t.Logf("error: %q", err)
-			return false
-		}
-		t.Logf("s = %q, y = %q", s, y)
-		return y == "abcdefg"
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetMultiple(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	result, err := x.Get("ggg")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "opqrstu" {
-		t.Errorf("expected 'opqrstu', got %q", result)
-	}
-	result, err = x.Get("hhh")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "abcdefg" {
-		t.Errorf("expected 'abcdefg', got %q", result)
-	}
-	result, err = x.Get("iiiiii")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "hijklmn" {
-		t.Errorf("expected 'hijklmn', got %q", result)
-	}
-}
-
-func TestGetMultipleQuick(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	f := func(s string) bool {
-		y, err := x.Get(s)
-		if err != nil {
-			t.Logf("error: %q", err)
-			return false
-		}
-		t.Logf("s = %q, y = %q", s, y)
-		return y == "abcdefg" || y == "hijklmn" || y == "opqrstu"
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetMultipleRemove(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	result, err := x.Get("ggg")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "opqrstu" {
-		t.Errorf("expected 'opqrstu', got %q", result)
-	}
-	result, err = x.Get("hhh")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "abcdefg" {
-		t.Errorf("expected 'abcdefg', got %q", result)
-	}
-	result, err = x.Get("iiiiii")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "hijklmn" {
-		t.Errorf("expected 'hijklmn', got %q", result)
-	}
-	x.Remove("hijklmn")
-	result, err = x.Get("ggg")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "opqrstu" {
-		t.Errorf("expected 'opqrstu', got %q", result)
-	}
-	result, err = x.Get("hhh")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "abcdefg" {
-		t.Errorf("expected 'abcdefg', got %q", result)
-	}
-	result, err = x.Get("iiiiii")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if result != "opqrstu" {
-		t.Errorf("expected 'opqrstu', got %q", result)
-	}
-}
-
-func TestGetMultipleRemoveQuick(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	x.Remove("opqrstu")
-	f := func(s string) bool {
-		y, err := x.Get(s)
-		if err != nil {
-			t.Logf("error: %q", err)
-			return false
-		}
-		t.Logf("s = %q, y = %q", s, y)
-		return y == "abcdefg" || y == "hijklmn"
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetTwo(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	a, b, err := x.GetTwo("99999999")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a == b {
-		t.Errorf("a shouldn't equal b")
-	}
-	if a != "abcdefg" {
-		t.Errorf("wrong a: %q", a)
-	}
-	if b != "opqrstu" {
-		t.Errorf("wrong b: %q", b)
-	}
-}
-
-func TestGetTwoQuick(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	x.Add("opqrstu")
-	f := func(s string) bool {
-		a, b, err := x.GetTwo(s)
-		if err != nil {
-			t.Logf("error: %q", err)
-			return false
-		}
-		if a == b {
-			t.Logf("a == b")
-			return false
-		}
-		if a != "abcdefg" && a != "hijklmn" && a != "opqrstu" {
-			t.Logf("invalid a: %q", a)
-			return false
-		}
-
-		if b != "abcdefg" && b != "hijklmn" && b != "opqrstu" {
-			t.Logf("invalid b: %q", b)
-			return false
-		}
-		return true
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetTwoOnlyTwoQuick(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	x.Add("hijklmn")
-	f := func(s string) bool {
-		a, b, err := x.GetTwo(s)
-		if err != nil {
-			t.Logf("error: %q", err)
-			return false
-		}
-		if a == b {
-			t.Logf("a == b")
-			return false
-		}
-		if a != "abcdefg" && a != "hijklmn" {
-			t.Logf("invalid a: %q", a)
-			return false
-		}
-
-		if b != "abcdefg" && b != "hijklmn" {
-			t.Logf("invalid b: %q", b)
-			return false
-		}
-		return true
-	}
-	if err := quick.Check(f, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetTwoOnlyOneInCircle(t *testing.T) {
-	x := New()
-	x.Add("abcdefg")
-	a, b, err := x.GetTwo("99999999")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a == b {
-		t.Errorf("a shouldn't equal b")
-	}
-	if a != "abcdefg" {
-		t.Errorf("wrong a: %q", a)
-	}
-	if b != "" {
-		t.Errorf("wrong b: %q", b)
-	}
-}
-
-func TestSet(t *testing.T) {
-	x := New()
-	x.Add("abc")
-	x.Add("def")
-	x.Add("ghi")
-	x.Set([]string{"jkl", "mno"})
-	if x.count != 2 {
-		t.Errorf("expected 2 elts, got %d", x.count)
-	}
-	a, b, err := x.GetTwo("qwerqwerwqer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a != "jkl" && a != "mno" {
-		t.Errorf("expected jkl or mno, got %s", a)
-	}
-	if b != "jkl" && b != "mno" {
-		t.Errorf("expected jkl or mno, got %s", b)
-	}
-	if a == b {
-		t.Errorf("expected a != b, they were both %s", a)
-	}
-	x.Set([]string{"pqr", "mno"})
-	if x.count != 2 {
-		t.Errorf("expected 2 elts, got %d", x.count)
-	}
-	a, b, err = x.GetTwo("qwerqwerwqer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a != "pqr" && a != "mno" {
-		t.Errorf("expected jkl or mno, got %s", a)
-	}
-	if b != "pqr" && b != "mno" {
-		t.Errorf("expected jkl or mno, got %s", b)
-	}
-	if a == b {
-		t.Errorf("expected a != b, they were both %s", a)
-	}
-	x.Set([]string{"pqr", "mno"})
-	if x.count != 2 {
-		t.Errorf("expected 2 elts, got %d", x.count)
-	}
-	a, b, err = x.GetTwo("qwerqwerwqer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a != "pqr" && a != "mno" {
-		t.Errorf("expected jkl or mno, got %s", a)
-	}
-	if b != "pqr" && b != "mno" {
-		t.Errorf("expected jkl or mno, got %s", b)
-	}
-	if a == b {
-		t.Errorf("expected a != b, they were both %s", a)
-	}
-}
-
-// allocBytes returns the number of bytes allocated by invoking f.
-func allocBytes(f func()) uint64 {
-	var stats runtime.MemStats
-	runtime.ReadMemStats(&stats)
-	t := stats.TotalAlloc
-	f()
-	runtime.ReadMemStats(&stats)
-	return stats.TotalAlloc - t
-}
-
-func mallocNum(f func()) uint64 {
-	var stats runtime.MemStats
-	runtime.ReadMemStats(&stats)
-	t := stats.Mallocs
-	f()
-	runtime.ReadMemStats(&stats)
-	return stats.Mallocs - t
-}
-
-func BenchmarkAllocations(b *testing.B) {
-	x := New()
-	x.Add("stays")
-	b.ResetTimer()
-	allocSize := allocBytes(func() {
-		for i := 0; i < b.N; i++ {
-			x.Add("Foo")
-			x.Remove("Foo")
-		}
-	})
-	b.Logf("%d: Allocated %d bytes (%.2fx)", b.N, allocSize, float64(allocSize)/float64(b.N))
-}
-
-func BenchmarkMalloc(b *testing.B) {
-	x := New()
-	x.Add("stays")
-	b.ResetTimer()
-	mallocs := mallocNum(func() {
-		for i := 0; i < b.N; i++ {
-			x.Add("Foo")
-			x.Remove("Foo")
-		}
-	})
-	b.Logf("%d: Mallocd %d times (%.2fx)", b.N, mallocs, float64(mallocs)/float64(b.N))
-}
-
-func BenchmarkCycle(b *testing.B) {
-	x := New()
-	x.Add("nothing")
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		x.Add("foo" + strconv.Itoa(i))
-		x.Remove("foo" + strconv.Itoa(i))
-	}
-}
-
-func BenchmarkCycleLarge(b *testing.B) {
-	x := New()
-	for i := 0; i < 10; i++ {
-		x.Add("start" + strconv.Itoa(i))
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		x.Add("foo" + strconv.Itoa(i))
-		x.Remove("foo" + strconv.Itoa(i))
-	}
-}
-
-func BenchmarkGet(b *testing.B) {
-	x := New()
-	x.Add("nothing")
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		x.Get("nothing")
-	}
-}
-
-func BenchmarkGetLarge(b *testing.B) {
-	x := New()
-	for i := 0; i < 10; i++ {
-		x.Add("start" + strconv.Itoa(i))
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		x.Get("nothing")
-	}
-}
diff --git a/vendor/github.com/stathat/consistent/example_test.go b/vendor/github.com/stathat/consistent/example_test.go
deleted file mode 100644
index 63ce1735e..000000000
--- a/vendor/github.com/stathat/consistent/example_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright (C) 2012 Numerotron Inc.
-// Use of this source code is governed by an MIT-style license
-// that can be found in the LICENSE file.
-
-package consistent_test
-
-import (
-	"consistent"
-	"fmt"
-	"log"
-)
-
-func ExampleNew() {
-	c := consistent.New()
-	c.Add("cacheA")
-	c.Add("cacheB")
-	c.Add("cacheC")
-	users := []string{"user_mcnulty", "user_bunk", "user_omar", "user_bunny", "user_stringer"}
-	for _, u := range users {
-		server, err := c.Get(u)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s => %s\n", u, server)
-	}
-	// Output:
-	// user_mcnulty => cacheA
-	// user_bunk => cacheC
-	// user_omar => cacheC
-	// user_bunny => cacheA
-	// user_stringer => cacheB
-}
-
-func ExampleAdd() {
-	c := consistent.New()
-	c.Add("cacheA")
-	c.Add("cacheB")
-	c.Add("cacheC")
-	users := []string{"user_mcnulty", "user_bunk", "user_omar", "user_bunny", "user_stringer"}
-	fmt.Println("initial state [A, B, C]")
-	for _, u := range users {
-		server, err := c.Get(u)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s => %s\n", u, server)
-	}
-	c.Add("cacheD")
-	c.Add("cacheE")
-	fmt.Println("\nwith cacheD, cacheE [A, B, C, D, E]")
-	for _, u := range users {
-		server, err := c.Get(u)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s => %s\n", u, server)
-	}
-	// Output:
-	// initial state [A, B, C]
-	// user_mcnulty => cacheA
-	// user_bunk => cacheC
-	// user_omar => cacheC
-	// user_bunny => cacheA
-	// user_stringer => cacheB
-	//
-	// with cacheD, cacheE [A, B, C, D, E]
-	// user_mcnulty => cacheE
-	// user_bunk => cacheD
-	// user_omar => cacheD
-	// user_bunny => cacheA
-	// user_stringer => cacheB
-}
-
-func ExampleRemove() {
-	c := consistent.New()
-	c.Add("cacheA")
-	c.Add("cacheB")
-	c.Add("cacheC")
-	users := []string{"user_mcnulty", "user_bunk", "user_omar", "user_bunny", "user_stringer"}
-	fmt.Println("initial state [A, B, C]")
-	for _, u := range users {
-		server, err := c.Get(u)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s => %s\n", u, server)
-	}
-	c.Remove("cacheC")
-	fmt.Println("\ncacheC removed [A, B]")
-	for _, u := range users {
-		server, err := c.Get(u)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("%s => %s\n", u, server)
-	}
-	// Output:
-	// initial state [A, B, C]
-	// user_mcnulty => cacheA
-	// user_bunk => cacheC
-	// user_omar => cacheC
-	// user_bunny => cacheA
-	// user_stringer => cacheB
-	//
-	// cacheC removed [A, B]
-	// user_mcnulty => cacheA
-	// user_bunk => cacheA
-	// user_omar => cacheA
-	// user_bunny => cacheA
-	// user_stringer => cacheB
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/batch.go b/vendor/github.com/syndtr/goleveldb/leveldb/batch.go
deleted file mode 100644
index ccf390c9c..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/batch.go
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-)
-
-type ErrBatchCorrupted struct {
-	Reason string
-}
-
-func (e *ErrBatchCorrupted) Error() string {
-	return fmt.Sprintf("leveldb: batch corrupted: %s", e.Reason)
-}
-
-func newErrBatchCorrupted(reason string) error {
-	return errors.NewErrCorrupted(nil, &ErrBatchCorrupted{reason})
-}
-
-const (
-	batchHdrLen  = 8 + 4
-	batchGrowRec = 3000
-)
-
-type BatchReplay interface {
-	Put(key, value []byte)
-	Delete(key []byte)
-}
-
-// Batch is a write batch.
-type Batch struct {
-	data       []byte
-	rLen, bLen int
-	seq        uint64
-	sync       bool
-}
-
-func (b *Batch) grow(n int) {
-	off := len(b.data)
-	if off == 0 {
-		off = batchHdrLen
-		if b.data != nil {
-			b.data = b.data[:off]
-		}
-	}
-	if cap(b.data)-off < n {
-		if b.data == nil {
-			b.data = make([]byte, off, off+n)
-		} else {
-			odata := b.data
-			div := 1
-			if b.rLen > batchGrowRec {
-				div = b.rLen / batchGrowRec
-			}
-			b.data = make([]byte, off, off+n+(off-batchHdrLen)/div)
-			copy(b.data, odata)
-		}
-	}
-}
-
-func (b *Batch) appendRec(kt kType, key, value []byte) {
-	n := 1 + binary.MaxVarintLen32 + len(key)
-	if kt == ktVal {
-		n += binary.MaxVarintLen32 + len(value)
-	}
-	b.grow(n)
-	off := len(b.data)
-	data := b.data[:off+n]
-	data[off] = byte(kt)
-	off += 1
-	off += binary.PutUvarint(data[off:], uint64(len(key)))
-	copy(data[off:], key)
-	off += len(key)
-	if kt == ktVal {
-		off += binary.PutUvarint(data[off:], uint64(len(value)))
-		copy(data[off:], value)
-		off += len(value)
-	}
-	b.data = data[:off]
-	b.rLen++
-	//  Include 8-byte ikey header
-	b.bLen += len(key) + len(value) + 8
-}
-
-// Put appends 'put operation' of the given key/value pair to the batch.
-// It is safe to modify the contents of the argument after Put returns.
-func (b *Batch) Put(key, value []byte) {
-	b.appendRec(ktVal, key, value)
-}
-
-// Delete appends 'delete operation' of the given key to the batch.
-// It is safe to modify the contents of the argument after Delete returns.
-func (b *Batch) Delete(key []byte) {
-	b.appendRec(ktDel, key, nil)
-}
-
-// Dump dumps batch contents. The returned slice can be loaded into the
-// batch using Load method.
-// The returned slice is not its own copy, so the contents should not be
-// modified.
-func (b *Batch) Dump() []byte {
-	return b.encode()
-}
-
-// Load loads given slice into the batch. Previous contents of the batch
-// will be discarded.
-// The given slice will not be copied and will be used as batch buffer, so
-// it is not safe to modify the contents of the slice.
-func (b *Batch) Load(data []byte) error {
-	return b.decode(0, data)
-}
-
-// Replay replays batch contents.
-func (b *Batch) Replay(r BatchReplay) error {
-	return b.decodeRec(func(i int, kt kType, key, value []byte) {
-		switch kt {
-		case ktVal:
-			r.Put(key, value)
-		case ktDel:
-			r.Delete(key)
-		}
-	})
-}
-
-// Len returns number of records in the batch.
-func (b *Batch) Len() int {
-	return b.rLen
-}
-
-// Reset resets the batch.
-func (b *Batch) Reset() {
-	b.data = b.data[:0]
-	b.seq = 0
-	b.rLen = 0
-	b.bLen = 0
-	b.sync = false
-}
-
-func (b *Batch) init(sync bool) {
-	b.sync = sync
-}
-
-func (b *Batch) append(p *Batch) {
-	if p.rLen > 0 {
-		b.grow(len(p.data) - batchHdrLen)
-		b.data = append(b.data, p.data[batchHdrLen:]...)
-		b.rLen += p.rLen
-	}
-	if p.sync {
-		b.sync = true
-	}
-}
-
-// size returns sums of key/value pair length plus 8-bytes ikey.
-func (b *Batch) size() int {
-	return b.bLen
-}
-
-func (b *Batch) encode() []byte {
-	b.grow(0)
-	binary.LittleEndian.PutUint64(b.data, b.seq)
-	binary.LittleEndian.PutUint32(b.data[8:], uint32(b.rLen))
-
-	return b.data
-}
-
-func (b *Batch) decode(prevSeq uint64, data []byte) error {
-	if len(data) < batchHdrLen {
-		return newErrBatchCorrupted("too short")
-	}
-
-	b.seq = binary.LittleEndian.Uint64(data)
-	if b.seq < prevSeq {
-		return newErrBatchCorrupted("invalid sequence number")
-	}
-	b.rLen = int(binary.LittleEndian.Uint32(data[8:]))
-	if b.rLen < 0 {
-		return newErrBatchCorrupted("invalid records length")
-	}
-	// No need to be precise at this point, it won't be used anyway
-	b.bLen = len(data) - batchHdrLen
-	b.data = data
-
-	return nil
-}
-
-func (b *Batch) decodeRec(f func(i int, kt kType, key, value []byte)) (err error) {
-	off := batchHdrLen
-	for i := 0; i < b.rLen; i++ {
-		if off >= len(b.data) {
-			return newErrBatchCorrupted("invalid records length")
-		}
-
-		kt := kType(b.data[off])
-		if kt > ktVal {
-			return newErrBatchCorrupted("bad record: invalid type")
-		}
-		off += 1
-
-		x, n := binary.Uvarint(b.data[off:])
-		off += n
-		if n <= 0 || off+int(x) > len(b.data) {
-			return newErrBatchCorrupted("bad record: invalid key length")
-		}
-		key := b.data[off : off+int(x)]
-		off += int(x)
-		var value []byte
-		if kt == ktVal {
-			x, n := binary.Uvarint(b.data[off:])
-			off += n
-			if n <= 0 || off+int(x) > len(b.data) {
-				return newErrBatchCorrupted("bad record: invalid value length")
-			}
-			value = b.data[off : off+int(x)]
-			off += int(x)
-		}
-
-		f(i, kt, key, value)
-	}
-
-	return nil
-}
-
-func (b *Batch) memReplay(to *memdb.DB) error {
-	return b.decodeRec(func(i int, kt kType, key, value []byte) {
-		ikey := newIkey(key, b.seq+uint64(i), kt)
-		to.Put(ikey, value)
-	})
-}
-
-func (b *Batch) memDecodeAndReplay(prevSeq uint64, data []byte, to *memdb.DB) error {
-	if err := b.decode(prevSeq, data); err != nil {
-		return err
-	}
-	return b.memReplay(to)
-}
-
-func (b *Batch) revertMemReplay(to *memdb.DB) error {
-	return b.decodeRec(func(i int, kt kType, key, value []byte) {
-		ikey := newIkey(key, b.seq+uint64(i), kt)
-		to.Delete(ikey)
-	})
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/batch_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/batch_test.go
deleted file mode 100644
index 7fc842f4f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/batch_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-)
-
-type tbRec struct {
-	kt         kType
-	key, value []byte
-}
-
-type testBatch struct {
-	rec []*tbRec
-}
-
-func (p *testBatch) Put(key, value []byte) {
-	p.rec = append(p.rec, &tbRec{ktVal, key, value})
-}
-
-func (p *testBatch) Delete(key []byte) {
-	p.rec = append(p.rec, &tbRec{ktDel, key, nil})
-}
-
-func compareBatch(t *testing.T, b1, b2 *Batch) {
-	if b1.seq != b2.seq {
-		t.Errorf("invalid seq number want %d, got %d", b1.seq, b2.seq)
-	}
-	if b1.Len() != b2.Len() {
-		t.Fatalf("invalid record length want %d, got %d", b1.Len(), b2.Len())
-	}
-	p1, p2 := new(testBatch), new(testBatch)
-	err := b1.Replay(p1)
-	if err != nil {
-		t.Fatal("error when replaying batch 1: ", err)
-	}
-	err = b2.Replay(p2)
-	if err != nil {
-		t.Fatal("error when replaying batch 2: ", err)
-	}
-	for i := range p1.rec {
-		r1, r2 := p1.rec[i], p2.rec[i]
-		if r1.kt != r2.kt {
-			t.Errorf("invalid type on record '%d' want %d, got %d", i, r1.kt, r2.kt)
-		}
-		if !bytes.Equal(r1.key, r2.key) {
-			t.Errorf("invalid key on record '%d' want %s, got %s", i, string(r1.key), string(r2.key))
-		}
-		if r1.kt == ktVal {
-			if !bytes.Equal(r1.value, r2.value) {
-				t.Errorf("invalid value on record '%d' want %s, got %s", i, string(r1.value), string(r2.value))
-			}
-		}
-	}
-}
-
-func TestBatch_EncodeDecode(t *testing.T) {
-	b1 := new(Batch)
-	b1.seq = 10009
-	b1.Put([]byte("key1"), []byte("value1"))
-	b1.Put([]byte("key2"), []byte("value2"))
-	b1.Delete([]byte("key1"))
-	b1.Put([]byte("k"), []byte(""))
-	b1.Put([]byte("zzzzzzzzzzz"), []byte("zzzzzzzzzzzzzzzzzzzzzzzz"))
-	b1.Delete([]byte("key10000"))
-	b1.Delete([]byte("k"))
-	buf := b1.encode()
-	b2 := new(Batch)
-	err := b2.decode(0, buf)
-	if err != nil {
-		t.Error("error when decoding batch: ", err)
-	}
-	compareBatch(t, b1, b2)
-}
-
-func TestBatch_Append(t *testing.T) {
-	b1 := new(Batch)
-	b1.seq = 10009
-	b1.Put([]byte("key1"), []byte("value1"))
-	b1.Put([]byte("key2"), []byte("value2"))
-	b1.Delete([]byte("key1"))
-	b1.Put([]byte("foo"), []byte("foovalue"))
-	b1.Put([]byte("bar"), []byte("barvalue"))
-	b2a := new(Batch)
-	b2a.seq = 10009
-	b2a.Put([]byte("key1"), []byte("value1"))
-	b2a.Put([]byte("key2"), []byte("value2"))
-	b2a.Delete([]byte("key1"))
-	b2b := new(Batch)
-	b2b.Put([]byte("foo"), []byte("foovalue"))
-	b2b.Put([]byte("bar"), []byte("barvalue"))
-	b2a.append(b2b)
-	compareBatch(t, b1, b2a)
-}
-
-func TestBatch_Size(t *testing.T) {
-	b := new(Batch)
-	for i := 0; i < 2; i++ {
-		b.Put([]byte("key1"), []byte("value1"))
-		b.Put([]byte("key2"), []byte("value2"))
-		b.Delete([]byte("key1"))
-		b.Put([]byte("foo"), []byte("foovalue"))
-		b.Put([]byte("bar"), []byte("barvalue"))
-		mem := memdb.New(&iComparer{comparer.DefaultComparer}, 0)
-		b.memReplay(mem)
-		if b.size() != mem.Size() {
-			t.Errorf("invalid batch size calculation, want=%d got=%d", mem.Size(), b.size())
-		}
-		b.Reset()
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/bench2_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/bench2_test.go
deleted file mode 100644
index 0dd60fd82..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/bench2_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build !go1.2
-
-package leveldb
-
-import (
-	"sync/atomic"
-	"testing"
-)
-
-func BenchmarkDBReadConcurrent(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.gc()
-	defer p.close()
-
-	b.ResetTimer()
-	b.SetBytes(116)
-
-	b.RunParallel(func(pb *testing.PB) {
-		iter := p.newIter()
-		defer iter.Release()
-		for pb.Next() && iter.Next() {
-		}
-	})
-}
-
-func BenchmarkDBReadConcurrent2(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.gc()
-	defer p.close()
-
-	b.ResetTimer()
-	b.SetBytes(116)
-
-	var dir uint32
-	b.RunParallel(func(pb *testing.PB) {
-		iter := p.newIter()
-		defer iter.Release()
-		if atomic.AddUint32(&dir, 1)%2 == 0 {
-			for pb.Next() && iter.Next() {
-			}
-		} else {
-			if pb.Next() && iter.Last() {
-				for pb.Next() && iter.Prev() {
-				}
-			}
-		}
-	})
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/bench_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/bench_test.go
deleted file mode 100644
index 91b426709..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/bench_test.go
+++ /dev/null
@@ -1,464 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"fmt"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-)
-
-func randomString(r *rand.Rand, n int) []byte {
-	b := new(bytes.Buffer)
-	for i := 0; i < n; i++ {
-		b.WriteByte(' ' + byte(r.Intn(95)))
-	}
-	return b.Bytes()
-}
-
-func compressibleStr(r *rand.Rand, frac float32, n int) []byte {
-	nn := int(float32(n) * frac)
-	rb := randomString(r, nn)
-	b := make([]byte, 0, n+nn)
-	for len(b) < n {
-		b = append(b, rb...)
-	}
-	return b[:n]
-}
-
-type valueGen struct {
-	src []byte
-	pos int
-}
-
-func newValueGen(frac float32) *valueGen {
-	v := new(valueGen)
-	r := rand.New(rand.NewSource(301))
-	v.src = make([]byte, 0, 1048576+100)
-	for len(v.src) < 1048576 {
-		v.src = append(v.src, compressibleStr(r, frac, 100)...)
-	}
-	return v
-}
-
-func (v *valueGen) get(n int) []byte {
-	if v.pos+n > len(v.src) {
-		v.pos = 0
-	}
-	v.pos += n
-	return v.src[v.pos-n : v.pos]
-}
-
-var benchDB = filepath.Join(os.TempDir(), fmt.Sprintf("goleveldbbench-%d", os.Getuid()))
-
-type dbBench struct {
-	b    *testing.B
-	stor storage.Storage
-	db   *DB
-
-	o  *opt.Options
-	ro *opt.ReadOptions
-	wo *opt.WriteOptions
-
-	keys, values [][]byte
-}
-
-func openDBBench(b *testing.B, noCompress bool) *dbBench {
-	_, err := os.Stat(benchDB)
-	if err == nil {
-		err = os.RemoveAll(benchDB)
-		if err != nil {
-			b.Fatal("cannot remove old db: ", err)
-		}
-	}
-
-	p := &dbBench{
-		b:  b,
-		o:  &opt.Options{},
-		ro: &opt.ReadOptions{},
-		wo: &opt.WriteOptions{},
-	}
-	p.stor, err = storage.OpenFile(benchDB)
-	if err != nil {
-		b.Fatal("cannot open stor: ", err)
-	}
-	if noCompress {
-		p.o.Compression = opt.NoCompression
-	}
-
-	p.db, err = Open(p.stor, p.o)
-	if err != nil {
-		b.Fatal("cannot open db: ", err)
-	}
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-	return p
-}
-
-func (p *dbBench) reopen() {
-	p.db.Close()
-	var err error
-	p.db, err = Open(p.stor, p.o)
-	if err != nil {
-		p.b.Fatal("Reopen: got error: ", err)
-	}
-}
-
-func (p *dbBench) populate(n int) {
-	p.keys, p.values = make([][]byte, n), make([][]byte, n)
-	v := newValueGen(0.5)
-	for i := range p.keys {
-		p.keys[i], p.values[i] = []byte(fmt.Sprintf("%016d", i)), v.get(100)
-	}
-}
-
-func (p *dbBench) randomize() {
-	m := len(p.keys)
-	times := m * 2
-	r1, r2 := rand.New(rand.NewSource(0xdeadbeef)), rand.New(rand.NewSource(0xbeefface))
-	for n := 0; n < times; n++ {
-		i, j := r1.Int()%m, r2.Int()%m
-		if i == j {
-			continue
-		}
-		p.keys[i], p.keys[j] = p.keys[j], p.keys[i]
-		p.values[i], p.values[j] = p.values[j], p.values[i]
-	}
-}
-
-func (p *dbBench) writes(perBatch int) {
-	b := p.b
-	db := p.db
-
-	n := len(p.keys)
-	m := n / perBatch
-	if n%perBatch > 0 {
-		m++
-	}
-	batches := make([]Batch, m)
-	j := 0
-	for i := range batches {
-		first := true
-		for ; j < n && ((j+1)%perBatch != 0 || first); j++ {
-			first = false
-			batches[i].Put(p.keys[j], p.values[j])
-		}
-	}
-	runtime.GC()
-
-	b.ResetTimer()
-	b.StartTimer()
-	for i := range batches {
-		err := db.Write(&(batches[i]), p.wo)
-		if err != nil {
-			b.Fatal("write failed: ", err)
-		}
-	}
-	b.StopTimer()
-	b.SetBytes(116)
-}
-
-func (p *dbBench) gc() {
-	p.keys, p.values = nil, nil
-	runtime.GC()
-}
-
-func (p *dbBench) puts() {
-	b := p.b
-	db := p.db
-
-	b.ResetTimer()
-	b.StartTimer()
-	for i := range p.keys {
-		err := db.Put(p.keys[i], p.values[i], p.wo)
-		if err != nil {
-			b.Fatal("put failed: ", err)
-		}
-	}
-	b.StopTimer()
-	b.SetBytes(116)
-}
-
-func (p *dbBench) fill() {
-	b := p.b
-	db := p.db
-
-	perBatch := 10000
-	batch := new(Batch)
-	for i, n := 0, len(p.keys); i < n; {
-		first := true
-		for ; i < n && ((i+1)%perBatch != 0 || first); i++ {
-			first = false
-			batch.Put(p.keys[i], p.values[i])
-		}
-		err := db.Write(batch, p.wo)
-		if err != nil {
-			b.Fatal("write failed: ", err)
-		}
-		batch.Reset()
-	}
-}
-
-func (p *dbBench) gets() {
-	b := p.b
-	db := p.db
-
-	b.ResetTimer()
-	for i := range p.keys {
-		_, err := db.Get(p.keys[i], p.ro)
-		if err != nil {
-			b.Error("got error: ", err)
-		}
-	}
-	b.StopTimer()
-}
-
-func (p *dbBench) seeks() {
-	b := p.b
-
-	iter := p.newIter()
-	defer iter.Release()
-	b.ResetTimer()
-	for i := range p.keys {
-		if !iter.Seek(p.keys[i]) {
-			b.Error("value not found for: ", string(p.keys[i]))
-		}
-	}
-	b.StopTimer()
-}
-
-func (p *dbBench) newIter() iterator.Iterator {
-	iter := p.db.NewIterator(nil, p.ro)
-	err := iter.Error()
-	if err != nil {
-		p.b.Fatal("cannot create iterator: ", err)
-	}
-	return iter
-}
-
-func (p *dbBench) close() {
-	if bp, err := p.db.GetProperty("leveldb.blockpool"); err == nil {
-		p.b.Log("Block pool stats: ", bp)
-	}
-	p.db.Close()
-	p.stor.Close()
-	os.RemoveAll(benchDB)
-	p.db = nil
-	p.keys = nil
-	p.values = nil
-	runtime.GC()
-	runtime.GOMAXPROCS(1)
-}
-
-func BenchmarkDBWrite(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBWriteBatch(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.writes(1000)
-	p.close()
-}
-
-func BenchmarkDBWriteUncompressed(b *testing.B) {
-	p := openDBBench(b, true)
-	p.populate(b.N)
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBWriteBatchUncompressed(b *testing.B) {
-	p := openDBBench(b, true)
-	p.populate(b.N)
-	p.writes(1000)
-	p.close()
-}
-
-func BenchmarkDBWriteRandom(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.randomize()
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBWriteRandomSync(b *testing.B) {
-	p := openDBBench(b, false)
-	p.wo.Sync = true
-	p.populate(b.N)
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBOverwrite(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.writes(1)
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBOverwriteRandom(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.writes(1)
-	p.randomize()
-	p.writes(1)
-	p.close()
-}
-
-func BenchmarkDBPut(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.puts()
-	p.close()
-}
-
-func BenchmarkDBRead(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.gc()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	for iter.Next() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBReadGC(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	for iter.Next() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBReadUncompressed(b *testing.B) {
-	p := openDBBench(b, true)
-	p.populate(b.N)
-	p.fill()
-	p.gc()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	for iter.Next() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBReadTable(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.reopen()
-	p.gc()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	for iter.Next() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBReadReverse(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.gc()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	iter.Last()
-	for iter.Prev() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBReadReverseTable(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.reopen()
-	p.gc()
-
-	iter := p.newIter()
-	b.ResetTimer()
-	iter.Last()
-	for iter.Prev() {
-	}
-	iter.Release()
-	b.StopTimer()
-	b.SetBytes(116)
-	p.close()
-}
-
-func BenchmarkDBSeek(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.seeks()
-	p.close()
-}
-
-func BenchmarkDBSeekRandom(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.randomize()
-	p.seeks()
-	p.close()
-}
-
-func BenchmarkDBGet(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.gets()
-	p.close()
-}
-
-func BenchmarkDBGetRandom(b *testing.B) {
-	p := openDBBench(b, false)
-	p.populate(b.N)
-	p.fill()
-	p.randomize()
-	p.gets()
-	p.close()
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/cache/bench2_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/bench2_test.go
deleted file mode 100644
index 175e22203..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/cache/bench2_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build !go1.2
-
-package cache
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func BenchmarkLRUCache(b *testing.B) {
-	c := NewCache(NewLRU(10000))
-
-	b.SetParallelism(10)
-	b.RunParallel(func(pb *testing.PB) {
-		r := rand.New(rand.NewSource(time.Now().UnixNano()))
-
-		for pb.Next() {
-			key := uint64(r.Intn(1000000))
-			c.Get(0, key, func() (int, Value) {
-				return 1, key
-			}).Release()
-		}
-	})
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache.go
deleted file mode 100644
index c9670de5d..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache.go
+++ /dev/null
@@ -1,676 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package cache provides interface and implementation of a cache algorithms.
-package cache
-
-import (
-	"sync"
-	"sync/atomic"
-	"unsafe"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// Cacher provides interface to implements a caching functionality.
-// An implementation must be goroutine-safe.
-type Cacher interface {
-	// Capacity returns cache capacity.
-	Capacity() int
-
-	// SetCapacity sets cache capacity.
-	SetCapacity(capacity int)
-
-	// Promote promotes the 'cache node'.
-	Promote(n *Node)
-
-	// Ban evicts the 'cache node' and prevent subsequent 'promote'.
-	Ban(n *Node)
-
-	// Evict evicts the 'cache node'.
-	Evict(n *Node)
-
-	// EvictNS evicts 'cache node' with the given namespace.
-	EvictNS(ns uint64)
-
-	// EvictAll evicts all 'cache node'.
-	EvictAll()
-
-	// Close closes the 'cache tree'
-	Close() error
-}
-
-// Value is a 'cacheable object'. It may implements util.Releaser, if
-// so the the Release method will be called once object is released.
-type Value interface{}
-
-type CacheGetter struct {
-	Cache *Cache
-	NS    uint64
-}
-
-func (g *CacheGetter) Get(key uint64, setFunc func() (size int, value Value)) *Handle {
-	return g.Cache.Get(g.NS, key, setFunc)
-}
-
-// The hash tables implementation is based on:
-// "Dynamic-Sized Nonblocking Hash Tables", by Yujie Liu, Kunlong Zhang, and Michael Spear. ACM Symposium on Principles of Distributed Computing, Jul 2014.
-
-const (
-	mInitialSize           = 1 << 4
-	mOverflowThreshold     = 1 << 5
-	mOverflowGrowThreshold = 1 << 7
-)
-
-type mBucket struct {
-	mu     sync.Mutex
-	node   []*Node
-	frozen bool
-}
-
-func (b *mBucket) freeze() []*Node {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-	if !b.frozen {
-		b.frozen = true
-	}
-	return b.node
-}
-
-func (b *mBucket) get(r *Cache, h *mNode, hash uint32, ns, key uint64, noset bool) (done, added bool, n *Node) {
-	b.mu.Lock()
-
-	if b.frozen {
-		b.mu.Unlock()
-		return
-	}
-
-	// Scan the node.
-	for _, n := range b.node {
-		if n.hash == hash && n.ns == ns && n.key == key {
-			atomic.AddInt32(&n.ref, 1)
-			b.mu.Unlock()
-			return true, false, n
-		}
-	}
-
-	// Get only.
-	if noset {
-		b.mu.Unlock()
-		return true, false, nil
-	}
-
-	// Create node.
-	n = &Node{
-		r:    r,
-		hash: hash,
-		ns:   ns,
-		key:  key,
-		ref:  1,
-	}
-	// Add node to bucket.
-	b.node = append(b.node, n)
-	bLen := len(b.node)
-	b.mu.Unlock()
-
-	// Update counter.
-	grow := atomic.AddInt32(&r.nodes, 1) >= h.growThreshold
-	if bLen > mOverflowThreshold {
-		grow = grow || atomic.AddInt32(&h.overflow, 1) >= mOverflowGrowThreshold
-	}
-
-	// Grow.
-	if grow && atomic.CompareAndSwapInt32(&h.resizeInProgess, 0, 1) {
-		nhLen := len(h.buckets) << 1
-		nh := &mNode{
-			buckets:         make([]unsafe.Pointer, nhLen),
-			mask:            uint32(nhLen) - 1,
-			pred:            unsafe.Pointer(h),
-			growThreshold:   int32(nhLen * mOverflowThreshold),
-			shrinkThreshold: int32(nhLen >> 1),
-		}
-		ok := atomic.CompareAndSwapPointer(&r.mHead, unsafe.Pointer(h), unsafe.Pointer(nh))
-		if !ok {
-			panic("BUG: failed swapping head")
-		}
-		go nh.initBuckets()
-	}
-
-	return true, true, n
-}
-
-func (b *mBucket) delete(r *Cache, h *mNode, hash uint32, ns, key uint64) (done, deleted bool) {
-	b.mu.Lock()
-
-	if b.frozen {
-		b.mu.Unlock()
-		return
-	}
-
-	// Scan the node.
-	var (
-		n    *Node
-		bLen int
-	)
-	for i := range b.node {
-		n = b.node[i]
-		if n.ns == ns && n.key == key {
-			if atomic.LoadInt32(&n.ref) == 0 {
-				deleted = true
-
-				// Call releaser.
-				if n.value != nil {
-					if r, ok := n.value.(util.Releaser); ok {
-						r.Release()
-					}
-					n.value = nil
-				}
-
-				// Remove node from bucket.
-				b.node = append(b.node[:i], b.node[i+1:]...)
-				bLen = len(b.node)
-			}
-			break
-		}
-	}
-	b.mu.Unlock()
-
-	if deleted {
-		// Call OnDel.
-		for _, f := range n.onDel {
-			f()
-		}
-
-		// Update counter.
-		atomic.AddInt32(&r.size, int32(n.size)*-1)
-		shrink := atomic.AddInt32(&r.nodes, -1) < h.shrinkThreshold
-		if bLen >= mOverflowThreshold {
-			atomic.AddInt32(&h.overflow, -1)
-		}
-
-		// Shrink.
-		if shrink && len(h.buckets) > mInitialSize && atomic.CompareAndSwapInt32(&h.resizeInProgess, 0, 1) {
-			nhLen := len(h.buckets) >> 1
-			nh := &mNode{
-				buckets:         make([]unsafe.Pointer, nhLen),
-				mask:            uint32(nhLen) - 1,
-				pred:            unsafe.Pointer(h),
-				growThreshold:   int32(nhLen * mOverflowThreshold),
-				shrinkThreshold: int32(nhLen >> 1),
-			}
-			ok := atomic.CompareAndSwapPointer(&r.mHead, unsafe.Pointer(h), unsafe.Pointer(nh))
-			if !ok {
-				panic("BUG: failed swapping head")
-			}
-			go nh.initBuckets()
-		}
-	}
-
-	return true, deleted
-}
-
-type mNode struct {
-	buckets         []unsafe.Pointer // []*mBucket
-	mask            uint32
-	pred            unsafe.Pointer // *mNode
-	resizeInProgess int32
-
-	overflow        int32
-	growThreshold   int32
-	shrinkThreshold int32
-}
-
-func (n *mNode) initBucket(i uint32) *mBucket {
-	if b := (*mBucket)(atomic.LoadPointer(&n.buckets[i])); b != nil {
-		return b
-	}
-
-	p := (*mNode)(atomic.LoadPointer(&n.pred))
-	if p != nil {
-		var node []*Node
-		if n.mask > p.mask {
-			// Grow.
-			pb := (*mBucket)(atomic.LoadPointer(&p.buckets[i&p.mask]))
-			if pb == nil {
-				pb = p.initBucket(i & p.mask)
-			}
-			m := pb.freeze()
-			// Split nodes.
-			for _, x := range m {
-				if x.hash&n.mask == i {
-					node = append(node, x)
-				}
-			}
-		} else {
-			// Shrink.
-			pb0 := (*mBucket)(atomic.LoadPointer(&p.buckets[i]))
-			if pb0 == nil {
-				pb0 = p.initBucket(i)
-			}
-			pb1 := (*mBucket)(atomic.LoadPointer(&p.buckets[i+uint32(len(n.buckets))]))
-			if pb1 == nil {
-				pb1 = p.initBucket(i + uint32(len(n.buckets)))
-			}
-			m0 := pb0.freeze()
-			m1 := pb1.freeze()
-			// Merge nodes.
-			node = make([]*Node, 0, len(m0)+len(m1))
-			node = append(node, m0...)
-			node = append(node, m1...)
-		}
-		b := &mBucket{node: node}
-		if atomic.CompareAndSwapPointer(&n.buckets[i], nil, unsafe.Pointer(b)) {
-			if len(node) > mOverflowThreshold {
-				atomic.AddInt32(&n.overflow, int32(len(node)-mOverflowThreshold))
-			}
-			return b
-		}
-	}
-
-	return (*mBucket)(atomic.LoadPointer(&n.buckets[i]))
-}
-
-func (n *mNode) initBuckets() {
-	for i := range n.buckets {
-		n.initBucket(uint32(i))
-	}
-	atomic.StorePointer(&n.pred, nil)
-}
-
-// Cache is a 'cache map'.
-type Cache struct {
-	mu     sync.RWMutex
-	mHead  unsafe.Pointer // *mNode
-	nodes  int32
-	size   int32
-	cacher Cacher
-	closed bool
-}
-
-// NewCache creates a new 'cache map'. The cacher is optional and
-// may be nil.
-func NewCache(cacher Cacher) *Cache {
-	h := &mNode{
-		buckets:         make([]unsafe.Pointer, mInitialSize),
-		mask:            mInitialSize - 1,
-		growThreshold:   int32(mInitialSize * mOverflowThreshold),
-		shrinkThreshold: 0,
-	}
-	for i := range h.buckets {
-		h.buckets[i] = unsafe.Pointer(&mBucket{})
-	}
-	r := &Cache{
-		mHead:  unsafe.Pointer(h),
-		cacher: cacher,
-	}
-	return r
-}
-
-func (r *Cache) getBucket(hash uint32) (*mNode, *mBucket) {
-	h := (*mNode)(atomic.LoadPointer(&r.mHead))
-	i := hash & h.mask
-	b := (*mBucket)(atomic.LoadPointer(&h.buckets[i]))
-	if b == nil {
-		b = h.initBucket(i)
-	}
-	return h, b
-}
-
-func (r *Cache) delete(n *Node) bool {
-	for {
-		h, b := r.getBucket(n.hash)
-		done, deleted := b.delete(r, h, n.hash, n.ns, n.key)
-		if done {
-			return deleted
-		}
-	}
-	return false
-}
-
-// Nodes returns number of 'cache node' in the map.
-func (r *Cache) Nodes() int {
-	return int(atomic.LoadInt32(&r.nodes))
-}
-
-// Size returns sums of 'cache node' size in the map.
-func (r *Cache) Size() int {
-	return int(atomic.LoadInt32(&r.size))
-}
-
-// Capacity returns cache capacity.
-func (r *Cache) Capacity() int {
-	if r.cacher == nil {
-		return 0
-	}
-	return r.cacher.Capacity()
-}
-
-// SetCapacity sets cache capacity.
-func (r *Cache) SetCapacity(capacity int) {
-	if r.cacher != nil {
-		r.cacher.SetCapacity(capacity)
-	}
-}
-
-// Get gets 'cache node' with the given namespace and key.
-// If cache node is not found and setFunc is not nil, Get will atomically creates
-// the 'cache node' by calling setFunc. Otherwise Get will returns nil.
-//
-// The returned 'cache handle' should be released after use by calling Release
-// method.
-func (r *Cache) Get(ns, key uint64, setFunc func() (size int, value Value)) *Handle {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if r.closed {
-		return nil
-	}
-
-	hash := murmur32(ns, key, 0xf00)
-	for {
-		h, b := r.getBucket(hash)
-		done, _, n := b.get(r, h, hash, ns, key, setFunc == nil)
-		if done {
-			if n != nil {
-				n.mu.Lock()
-				if n.value == nil {
-					if setFunc == nil {
-						n.mu.Unlock()
-						n.unref()
-						return nil
-					}
-
-					n.size, n.value = setFunc()
-					if n.value == nil {
-						n.size = 0
-						n.mu.Unlock()
-						n.unref()
-						return nil
-					}
-					atomic.AddInt32(&r.size, int32(n.size))
-				}
-				n.mu.Unlock()
-				if r.cacher != nil {
-					r.cacher.Promote(n)
-				}
-				return &Handle{unsafe.Pointer(n)}
-			}
-
-			break
-		}
-	}
-	return nil
-}
-
-// Delete removes and ban 'cache node' with the given namespace and key.
-// A banned 'cache node' will never inserted into the 'cache tree'. Ban
-// only attributed to the particular 'cache node', so when a 'cache node'
-// is recreated it will not be banned.
-//
-// If onDel is not nil, then it will be executed if such 'cache node'
-// doesn't exist or once the 'cache node' is released.
-//
-// Delete return true is such 'cache node' exist.
-func (r *Cache) Delete(ns, key uint64, onDel func()) bool {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if r.closed {
-		return false
-	}
-
-	hash := murmur32(ns, key, 0xf00)
-	for {
-		h, b := r.getBucket(hash)
-		done, _, n := b.get(r, h, hash, ns, key, true)
-		if done {
-			if n != nil {
-				if onDel != nil {
-					n.mu.Lock()
-					n.onDel = append(n.onDel, onDel)
-					n.mu.Unlock()
-				}
-				if r.cacher != nil {
-					r.cacher.Ban(n)
-				}
-				n.unref()
-				return true
-			}
-
-			break
-		}
-	}
-
-	if onDel != nil {
-		onDel()
-	}
-
-	return false
-}
-
-// Evict evicts 'cache node' with the given namespace and key. This will
-// simply call Cacher.Evict.
-//
-// Evict return true is such 'cache node' exist.
-func (r *Cache) Evict(ns, key uint64) bool {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if r.closed {
-		return false
-	}
-
-	hash := murmur32(ns, key, 0xf00)
-	for {
-		h, b := r.getBucket(hash)
-		done, _, n := b.get(r, h, hash, ns, key, true)
-		if done {
-			if n != nil {
-				if r.cacher != nil {
-					r.cacher.Evict(n)
-				}
-				n.unref()
-				return true
-			}
-
-			break
-		}
-	}
-
-	return false
-}
-
-// EvictNS evicts 'cache node' with the given namespace. This will
-// simply call Cacher.EvictNS.
-func (r *Cache) EvictNS(ns uint64) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if r.closed {
-		return
-	}
-
-	if r.cacher != nil {
-		r.cacher.EvictNS(ns)
-	}
-}
-
-// EvictAll evicts all 'cache node'. This will simply call Cacher.EvictAll.
-func (r *Cache) EvictAll() {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-	if r.closed {
-		return
-	}
-
-	if r.cacher != nil {
-		r.cacher.EvictAll()
-	}
-}
-
-// Close closes the 'cache map' and releases all 'cache node'.
-func (r *Cache) Close() error {
-	r.mu.Lock()
-	if !r.closed {
-		r.closed = true
-
-		if r.cacher != nil {
-			if err := r.cacher.Close(); err != nil {
-				return err
-			}
-		}
-
-		h := (*mNode)(r.mHead)
-		h.initBuckets()
-
-		for i := range h.buckets {
-			b := (*mBucket)(h.buckets[i])
-			for _, n := range b.node {
-				// Call releaser.
-				if n.value != nil {
-					if r, ok := n.value.(util.Releaser); ok {
-						r.Release()
-					}
-					n.value = nil
-				}
-
-				// Call OnDel.
-				for _, f := range n.onDel {
-					f()
-				}
-			}
-		}
-	}
-	r.mu.Unlock()
-	return nil
-}
-
-// Node is a 'cache node'.
-type Node struct {
-	r *Cache
-
-	hash    uint32
-	ns, key uint64
-
-	mu    sync.Mutex
-	size  int
-	value Value
-
-	ref   int32
-	onDel []func()
-
-	CacheData unsafe.Pointer
-}
-
-// NS returns this 'cache node' namespace.
-func (n *Node) NS() uint64 {
-	return n.ns
-}
-
-// Key returns this 'cache node' key.
-func (n *Node) Key() uint64 {
-	return n.key
-}
-
-// Size returns this 'cache node' size.
-func (n *Node) Size() int {
-	return n.size
-}
-
-// Value returns this 'cache node' value.
-func (n *Node) Value() Value {
-	return n.value
-}
-
-// Ref returns this 'cache node' ref counter.
-func (n *Node) Ref() int32 {
-	return atomic.LoadInt32(&n.ref)
-}
-
-// GetHandle returns an handle for this 'cache node'.
-func (n *Node) GetHandle() *Handle {
-	if atomic.AddInt32(&n.ref, 1) <= 1 {
-		panic("BUG: Node.GetHandle on zero ref")
-	}
-	return &Handle{unsafe.Pointer(n)}
-}
-
-func (n *Node) unref() {
-	if atomic.AddInt32(&n.ref, -1) == 0 {
-		n.r.delete(n)
-	}
-}
-
-func (n *Node) unrefLocked() {
-	if atomic.AddInt32(&n.ref, -1) == 0 {
-		n.r.mu.RLock()
-		if !n.r.closed {
-			n.r.delete(n)
-		}
-		n.r.mu.RUnlock()
-	}
-}
-
-type Handle struct {
-	n unsafe.Pointer // *Node
-}
-
-func (h *Handle) Value() Value {
-	n := (*Node)(atomic.LoadPointer(&h.n))
-	if n != nil {
-		return n.value
-	}
-	return nil
-}
-
-func (h *Handle) Release() {
-	nPtr := atomic.LoadPointer(&h.n)
-	if nPtr != nil && atomic.CompareAndSwapPointer(&h.n, nPtr, nil) {
-		n := (*Node)(nPtr)
-		n.unrefLocked()
-	}
-}
-
-func murmur32(ns, key uint64, seed uint32) uint32 {
-	const (
-		m = uint32(0x5bd1e995)
-		r = 24
-	)
-
-	k1 := uint32(ns >> 32)
-	k2 := uint32(ns)
-	k3 := uint32(key >> 32)
-	k4 := uint32(key)
-
-	k1 *= m
-	k1 ^= k1 >> r
-	k1 *= m
-
-	k2 *= m
-	k2 ^= k2 >> r
-	k2 *= m
-
-	k3 *= m
-	k3 ^= k3 >> r
-	k3 *= m
-
-	k4 *= m
-	k4 ^= k4 >> r
-	k4 *= m
-
-	h := seed
-
-	h *= m
-	h ^= k1
-	h *= m
-	h ^= k2
-	h *= m
-	h ^= k3
-	h *= m
-	h ^= k4
-
-	h ^= h >> 13
-	h *= m
-	h ^= h >> 15
-
-	return h
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache_test.go
deleted file mode 100644
index c2a50156f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/cache/cache_test.go
+++ /dev/null
@@ -1,554 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package cache
-
-import (
-	"math/rand"
-	"runtime"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-	"unsafe"
-)
-
-type int32o int32
-
-func (o *int32o) acquire() {
-	if atomic.AddInt32((*int32)(o), 1) != 1 {
-		panic("BUG: invalid ref")
-	}
-}
-
-func (o *int32o) Release() {
-	if atomic.AddInt32((*int32)(o), -1) != 0 {
-		panic("BUG: invalid ref")
-	}
-}
-
-type releaserFunc struct {
-	fn    func()
-	value Value
-}
-
-func (r releaserFunc) Release() {
-	if r.fn != nil {
-		r.fn()
-	}
-}
-
-func set(c *Cache, ns, key uint64, value Value, charge int, relf func()) *Handle {
-	return c.Get(ns, key, func() (int, Value) {
-		if relf != nil {
-			return charge, releaserFunc{relf, value}
-		} else {
-			return charge, value
-		}
-	})
-}
-
-func TestCacheMap(t *testing.T) {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	nsx := []struct {
-		nobjects, nhandles, concurrent, repeat int
-	}{
-		{10000, 400, 50, 3},
-		{100000, 1000, 100, 10},
-	}
-
-	var (
-		objects [][]int32o
-		handles [][]unsafe.Pointer
-	)
-
-	for _, x := range nsx {
-		objects = append(objects, make([]int32o, x.nobjects))
-		handles = append(handles, make([]unsafe.Pointer, x.nhandles))
-	}
-
-	c := NewCache(nil)
-
-	wg := new(sync.WaitGroup)
-	var done int32
-
-	for ns, x := range nsx {
-		for i := 0; i < x.concurrent; i++ {
-			wg.Add(1)
-			go func(ns, i, repeat int, objects []int32o, handles []unsafe.Pointer) {
-				defer wg.Done()
-				r := rand.New(rand.NewSource(time.Now().UnixNano()))
-
-				for j := len(objects) * repeat; j >= 0; j-- {
-					key := uint64(r.Intn(len(objects)))
-					h := c.Get(uint64(ns), key, func() (int, Value) {
-						o := &objects[key]
-						o.acquire()
-						return 1, o
-					})
-					if v := h.Value().(*int32o); v != &objects[key] {
-						t.Fatalf("#%d invalid value: want=%p got=%p", ns, &objects[key], v)
-					}
-					if objects[key] != 1 {
-						t.Fatalf("#%d invalid object %d: %d", ns, key, objects[key])
-					}
-					if !atomic.CompareAndSwapPointer(&handles[r.Intn(len(handles))], nil, unsafe.Pointer(h)) {
-						h.Release()
-					}
-				}
-			}(ns, i, x.repeat, objects[ns], handles[ns])
-		}
-
-		go func(handles []unsafe.Pointer) {
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-
-			for atomic.LoadInt32(&done) == 0 {
-				i := r.Intn(len(handles))
-				h := (*Handle)(atomic.LoadPointer(&handles[i]))
-				if h != nil && atomic.CompareAndSwapPointer(&handles[i], unsafe.Pointer(h), nil) {
-					h.Release()
-				}
-				time.Sleep(time.Millisecond)
-			}
-		}(handles[ns])
-	}
-
-	go func() {
-		handles := make([]*Handle, 100000)
-		for atomic.LoadInt32(&done) == 0 {
-			for i := range handles {
-				handles[i] = c.Get(999999999, uint64(i), func() (int, Value) {
-					return 1, 1
-				})
-			}
-			for _, h := range handles {
-				h.Release()
-			}
-		}
-	}()
-
-	wg.Wait()
-
-	atomic.StoreInt32(&done, 1)
-
-	for _, handles0 := range handles {
-		for i := range handles0 {
-			h := (*Handle)(atomic.LoadPointer(&handles0[i]))
-			if h != nil && atomic.CompareAndSwapPointer(&handles0[i], unsafe.Pointer(h), nil) {
-				h.Release()
-			}
-		}
-	}
-
-	for ns, objects0 := range objects {
-		for i, o := range objects0 {
-			if o != 0 {
-				t.Fatalf("invalid object #%d.%d: ref=%d", ns, i, o)
-			}
-		}
-	}
-}
-
-func TestCacheMap_NodesAndSize(t *testing.T) {
-	c := NewCache(nil)
-	if c.Nodes() != 0 {
-		t.Errorf("invalid nodes counter: want=%d got=%d", 0, c.Nodes())
-	}
-	if c.Size() != 0 {
-		t.Errorf("invalid size counter: want=%d got=%d", 0, c.Size())
-	}
-	set(c, 0, 1, 1, 1, nil)
-	set(c, 0, 2, 2, 2, nil)
-	set(c, 1, 1, 3, 3, nil)
-	set(c, 2, 1, 4, 1, nil)
-	if c.Nodes() != 4 {
-		t.Errorf("invalid nodes counter: want=%d got=%d", 4, c.Nodes())
-	}
-	if c.Size() != 7 {
-		t.Errorf("invalid size counter: want=%d got=%d", 4, c.Size())
-	}
-}
-
-func TestLRUCache_Capacity(t *testing.T) {
-	c := NewCache(NewLRU(10))
-	if c.Capacity() != 10 {
-		t.Errorf("invalid capacity: want=%d got=%d", 10, c.Capacity())
-	}
-	set(c, 0, 1, 1, 1, nil).Release()
-	set(c, 0, 2, 2, 2, nil).Release()
-	set(c, 1, 1, 3, 3, nil).Release()
-	set(c, 2, 1, 4, 1, nil).Release()
-	set(c, 2, 2, 5, 1, nil).Release()
-	set(c, 2, 3, 6, 1, nil).Release()
-	set(c, 2, 4, 7, 1, nil).Release()
-	set(c, 2, 5, 8, 1, nil).Release()
-	if c.Nodes() != 7 {
-		t.Errorf("invalid nodes counter: want=%d got=%d", 7, c.Nodes())
-	}
-	if c.Size() != 10 {
-		t.Errorf("invalid size counter: want=%d got=%d", 10, c.Size())
-	}
-	c.SetCapacity(9)
-	if c.Capacity() != 9 {
-		t.Errorf("invalid capacity: want=%d got=%d", 9, c.Capacity())
-	}
-	if c.Nodes() != 6 {
-		t.Errorf("invalid nodes counter: want=%d got=%d", 6, c.Nodes())
-	}
-	if c.Size() != 8 {
-		t.Errorf("invalid size counter: want=%d got=%d", 8, c.Size())
-	}
-}
-
-func TestCacheMap_NilValue(t *testing.T) {
-	c := NewCache(NewLRU(10))
-	h := c.Get(0, 0, func() (size int, value Value) {
-		return 1, nil
-	})
-	if h != nil {
-		t.Error("cache handle is non-nil")
-	}
-	if c.Nodes() != 0 {
-		t.Errorf("invalid nodes counter: want=%d got=%d", 0, c.Nodes())
-	}
-	if c.Size() != 0 {
-		t.Errorf("invalid size counter: want=%d got=%d", 0, c.Size())
-	}
-}
-
-func TestLRUCache_GetLatency(t *testing.T) {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	const (
-		concurrentSet = 30
-		concurrentGet = 3
-		duration      = 3 * time.Second
-		delay         = 3 * time.Millisecond
-		maxkey        = 100000
-	)
-
-	var (
-		set, getHit, getAll        int32
-		getMaxLatency, getDuration int64
-	)
-
-	c := NewCache(NewLRU(5000))
-	wg := &sync.WaitGroup{}
-	until := time.Now().Add(duration)
-	for i := 0; i < concurrentSet; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			for time.Now().Before(until) {
-				c.Get(0, uint64(r.Intn(maxkey)), func() (int, Value) {
-					time.Sleep(delay)
-					atomic.AddInt32(&set, 1)
-					return 1, 1
-				}).Release()
-			}
-		}(i)
-	}
-	for i := 0; i < concurrentGet; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			r := rand.New(rand.NewSource(time.Now().UnixNano()))
-			for {
-				mark := time.Now()
-				if mark.Before(until) {
-					h := c.Get(0, uint64(r.Intn(maxkey)), nil)
-					latency := int64(time.Now().Sub(mark))
-					m := atomic.LoadInt64(&getMaxLatency)
-					if latency > m {
-						atomic.CompareAndSwapInt64(&getMaxLatency, m, latency)
-					}
-					atomic.AddInt64(&getDuration, latency)
-					if h != nil {
-						atomic.AddInt32(&getHit, 1)
-						h.Release()
-					}
-					atomic.AddInt32(&getAll, 1)
-				} else {
-					break
-				}
-			}
-		}(i)
-	}
-
-	wg.Wait()
-	getAvglatency := time.Duration(getDuration) / time.Duration(getAll)
-	t.Logf("set=%d getHit=%d getAll=%d getMaxLatency=%v getAvgLatency=%v",
-		set, getHit, getAll, time.Duration(getMaxLatency), getAvglatency)
-
-	if getAvglatency > delay/3 {
-		t.Errorf("get avg latency > %v: got=%v", delay/3, getAvglatency)
-	}
-}
-
-func TestLRUCache_HitMiss(t *testing.T) {
-	cases := []struct {
-		key   uint64
-		value string
-	}{
-		{1, "vvvvvvvvv"},
-		{100, "v1"},
-		{0, "v2"},
-		{12346, "v3"},
-		{777, "v4"},
-		{999, "v5"},
-		{7654, "v6"},
-		{2, "v7"},
-		{3, "v8"},
-		{9, "v9"},
-	}
-
-	setfin := 0
-	c := NewCache(NewLRU(1000))
-	for i, x := range cases {
-		set(c, 0, x.key, x.value, len(x.value), func() {
-			setfin++
-		}).Release()
-		for j, y := range cases {
-			h := c.Get(0, y.key, nil)
-			if j <= i {
-				// should hit
-				if h == nil {
-					t.Errorf("case '%d' iteration '%d' is miss", i, j)
-				} else {
-					if x := h.Value().(releaserFunc).value.(string); x != y.value {
-						t.Errorf("case '%d' iteration '%d' has invalid value got '%s', want '%s'", i, j, x, y.value)
-					}
-				}
-			} else {
-				// should miss
-				if h != nil {
-					t.Errorf("case '%d' iteration '%d' is hit , value '%s'", i, j, h.Value().(releaserFunc).value.(string))
-				}
-			}
-			if h != nil {
-				h.Release()
-			}
-		}
-	}
-
-	for i, x := range cases {
-		finalizerOk := false
-		c.Delete(0, x.key, func() {
-			finalizerOk = true
-		})
-
-		if !finalizerOk {
-			t.Errorf("case %d delete finalizer not executed", i)
-		}
-
-		for j, y := range cases {
-			h := c.Get(0, y.key, nil)
-			if j > i {
-				// should hit
-				if h == nil {
-					t.Errorf("case '%d' iteration '%d' is miss", i, j)
-				} else {
-					if x := h.Value().(releaserFunc).value.(string); x != y.value {
-						t.Errorf("case '%d' iteration '%d' has invalid value got '%s', want '%s'", i, j, x, y.value)
-					}
-				}
-			} else {
-				// should miss
-				if h != nil {
-					t.Errorf("case '%d' iteration '%d' is hit, value '%s'", i, j, h.Value().(releaserFunc).value.(string))
-				}
-			}
-			if h != nil {
-				h.Release()
-			}
-		}
-	}
-
-	if setfin != len(cases) {
-		t.Errorf("some set finalizer may not be executed, want=%d got=%d", len(cases), setfin)
-	}
-}
-
-func TestLRUCache_Eviction(t *testing.T) {
-	c := NewCache(NewLRU(12))
-	o1 := set(c, 0, 1, 1, 1, nil)
-	set(c, 0, 2, 2, 1, nil).Release()
-	set(c, 0, 3, 3, 1, nil).Release()
-	set(c, 0, 4, 4, 1, nil).Release()
-	set(c, 0, 5, 5, 1, nil).Release()
-	if h := c.Get(0, 2, nil); h != nil { // 1,3,4,5,2
-		h.Release()
-	}
-	set(c, 0, 9, 9, 10, nil).Release() // 5,2,9
-
-	for _, key := range []uint64{9, 2, 5, 1} {
-		h := c.Get(0, key, nil)
-		if h == nil {
-			t.Errorf("miss for key '%d'", key)
-		} else {
-			if x := h.Value().(int); x != int(key) {
-				t.Errorf("invalid value for key '%d' want '%d', got '%d'", key, key, x)
-			}
-			h.Release()
-		}
-	}
-	o1.Release()
-	for _, key := range []uint64{1, 2, 5} {
-		h := c.Get(0, key, nil)
-		if h == nil {
-			t.Errorf("miss for key '%d'", key)
-		} else {
-			if x := h.Value().(int); x != int(key) {
-				t.Errorf("invalid value for key '%d' want '%d', got '%d'", key, key, x)
-			}
-			h.Release()
-		}
-	}
-	for _, key := range []uint64{3, 4, 9} {
-		h := c.Get(0, key, nil)
-		if h != nil {
-			t.Errorf("hit for key '%d'", key)
-			if x := h.Value().(int); x != int(key) {
-				t.Errorf("invalid value for key '%d' want '%d', got '%d'", key, key, x)
-			}
-			h.Release()
-		}
-	}
-}
-
-func TestLRUCache_Evict(t *testing.T) {
-	c := NewCache(NewLRU(6))
-	set(c, 0, 1, 1, 1, nil).Release()
-	set(c, 0, 2, 2, 1, nil).Release()
-	set(c, 1, 1, 4, 1, nil).Release()
-	set(c, 1, 2, 5, 1, nil).Release()
-	set(c, 2, 1, 6, 1, nil).Release()
-	set(c, 2, 2, 7, 1, nil).Release()
-
-	for ns := 0; ns < 3; ns++ {
-		for key := 1; key < 3; key++ {
-			if h := c.Get(uint64(ns), uint64(key), nil); h != nil {
-				h.Release()
-			} else {
-				t.Errorf("Cache.Get on #%d.%d return nil", ns, key)
-			}
-		}
-	}
-
-	if ok := c.Evict(0, 1); !ok {
-		t.Error("first Cache.Evict on #0.1 return false")
-	}
-	if ok := c.Evict(0, 1); ok {
-		t.Error("second Cache.Evict on #0.1 return true")
-	}
-	if h := c.Get(0, 1, nil); h != nil {
-		t.Errorf("Cache.Get on #0.1 return non-nil: %v", h.Value())
-	}
-
-	c.EvictNS(1)
-	if h := c.Get(1, 1, nil); h != nil {
-		t.Errorf("Cache.Get on #1.1 return non-nil: %v", h.Value())
-	}
-	if h := c.Get(1, 2, nil); h != nil {
-		t.Errorf("Cache.Get on #1.2 return non-nil: %v", h.Value())
-	}
-
-	c.EvictAll()
-	for ns := 0; ns < 3; ns++ {
-		for key := 1; key < 3; key++ {
-			if h := c.Get(uint64(ns), uint64(key), nil); h != nil {
-				t.Errorf("Cache.Get on #%d.%d return non-nil: %v", ns, key, h.Value())
-			}
-		}
-	}
-}
-
-func TestLRUCache_Delete(t *testing.T) {
-	delFuncCalled := 0
-	delFunc := func() {
-		delFuncCalled++
-	}
-
-	c := NewCache(NewLRU(2))
-	set(c, 0, 1, 1, 1, nil).Release()
-	set(c, 0, 2, 2, 1, nil).Release()
-
-	if ok := c.Delete(0, 1, delFunc); !ok {
-		t.Error("Cache.Delete on #1 return false")
-	}
-	if h := c.Get(0, 1, nil); h != nil {
-		t.Errorf("Cache.Get on #1 return non-nil: %v", h.Value())
-	}
-	if ok := c.Delete(0, 1, delFunc); ok {
-		t.Error("Cache.Delete on #1 return true")
-	}
-
-	h2 := c.Get(0, 2, nil)
-	if h2 == nil {
-		t.Error("Cache.Get on #2 return nil")
-	}
-	if ok := c.Delete(0, 2, delFunc); !ok {
-		t.Error("(1) Cache.Delete on #2 return false")
-	}
-	if ok := c.Delete(0, 2, delFunc); !ok {
-		t.Error("(2) Cache.Delete on #2 return false")
-	}
-
-	set(c, 0, 3, 3, 1, nil).Release()
-	set(c, 0, 4, 4, 1, nil).Release()
-	c.Get(0, 2, nil).Release()
-
-	for key := 2; key <= 4; key++ {
-		if h := c.Get(0, uint64(key), nil); h != nil {
-			h.Release()
-		} else {
-			t.Errorf("Cache.Get on #%d return nil", key)
-		}
-	}
-
-	h2.Release()
-	if h := c.Get(0, 2, nil); h != nil {
-		t.Errorf("Cache.Get on #2 return non-nil: %v", h.Value())
-	}
-
-	if delFuncCalled != 4 {
-		t.Errorf("delFunc isn't called 4 times: got=%d", delFuncCalled)
-	}
-}
-
-func TestLRUCache_Close(t *testing.T) {
-	relFuncCalled := 0
-	relFunc := func() {
-		relFuncCalled++
-	}
-	delFuncCalled := 0
-	delFunc := func() {
-		delFuncCalled++
-	}
-
-	c := NewCache(NewLRU(2))
-	set(c, 0, 1, 1, 1, relFunc).Release()
-	set(c, 0, 2, 2, 1, relFunc).Release()
-
-	h3 := set(c, 0, 3, 3, 1, relFunc)
-	if h3 == nil {
-		t.Error("Cache.Get on #3 return nil")
-	}
-	if ok := c.Delete(0, 3, delFunc); !ok {
-		t.Error("Cache.Delete on #3 return false")
-	}
-
-	c.Close()
-
-	if relFuncCalled != 3 {
-		t.Errorf("relFunc isn't called 3 times: got=%d", relFuncCalled)
-	}
-	if delFuncCalled != 1 {
-		t.Errorf("delFunc isn't called 1 times: got=%d", delFuncCalled)
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/cache/lru.go b/vendor/github.com/syndtr/goleveldb/leveldb/cache/lru.go
deleted file mode 100644
index d9a84cde1..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/cache/lru.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package cache
-
-import (
-	"sync"
-	"unsafe"
-)
-
-type lruNode struct {
-	n   *Node
-	h   *Handle
-	ban bool
-
-	next, prev *lruNode
-}
-
-func (n *lruNode) insert(at *lruNode) {
-	x := at.next
-	at.next = n
-	n.prev = at
-	n.next = x
-	x.prev = n
-}
-
-func (n *lruNode) remove() {
-	if n.prev != nil {
-		n.prev.next = n.next
-		n.next.prev = n.prev
-		n.prev = nil
-		n.next = nil
-	} else {
-		panic("BUG: removing removed node")
-	}
-}
-
-type lru struct {
-	mu       sync.Mutex
-	capacity int
-	used     int
-	recent   lruNode
-}
-
-func (r *lru) reset() {
-	r.recent.next = &r.recent
-	r.recent.prev = &r.recent
-	r.used = 0
-}
-
-func (r *lru) Capacity() int {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	return r.capacity
-}
-
-func (r *lru) SetCapacity(capacity int) {
-	var evicted []*lruNode
-
-	r.mu.Lock()
-	r.capacity = capacity
-	for r.used > r.capacity {
-		rn := r.recent.prev
-		if rn == nil {
-			panic("BUG: invalid LRU used or capacity counter")
-		}
-		rn.remove()
-		rn.n.CacheData = nil
-		r.used -= rn.n.Size()
-		evicted = append(evicted, rn)
-	}
-	r.mu.Unlock()
-
-	for _, rn := range evicted {
-		rn.h.Release()
-	}
-}
-
-func (r *lru) Promote(n *Node) {
-	var evicted []*lruNode
-
-	r.mu.Lock()
-	if n.CacheData == nil {
-		if n.Size() <= r.capacity {
-			rn := &lruNode{n: n, h: n.GetHandle()}
-			rn.insert(&r.recent)
-			n.CacheData = unsafe.Pointer(rn)
-			r.used += n.Size()
-
-			for r.used > r.capacity {
-				rn := r.recent.prev
-				if rn == nil {
-					panic("BUG: invalid LRU used or capacity counter")
-				}
-				rn.remove()
-				rn.n.CacheData = nil
-				r.used -= rn.n.Size()
-				evicted = append(evicted, rn)
-			}
-		}
-	} else {
-		rn := (*lruNode)(n.CacheData)
-		if !rn.ban {
-			rn.remove()
-			rn.insert(&r.recent)
-		}
-	}
-	r.mu.Unlock()
-
-	for _, rn := range evicted {
-		rn.h.Release()
-	}
-}
-
-func (r *lru) Ban(n *Node) {
-	r.mu.Lock()
-	if n.CacheData == nil {
-		n.CacheData = unsafe.Pointer(&lruNode{n: n, ban: true})
-	} else {
-		rn := (*lruNode)(n.CacheData)
-		if !rn.ban {
-			rn.remove()
-			rn.ban = true
-			r.used -= rn.n.Size()
-			r.mu.Unlock()
-
-			rn.h.Release()
-			rn.h = nil
-			return
-		}
-	}
-	r.mu.Unlock()
-}
-
-func (r *lru) Evict(n *Node) {
-	r.mu.Lock()
-	rn := (*lruNode)(n.CacheData)
-	if rn == nil || rn.ban {
-		r.mu.Unlock()
-		return
-	}
-	n.CacheData = nil
-	r.mu.Unlock()
-
-	rn.h.Release()
-}
-
-func (r *lru) EvictNS(ns uint64) {
-	var evicted []*lruNode
-
-	r.mu.Lock()
-	for e := r.recent.prev; e != &r.recent; {
-		rn := e
-		e = e.prev
-		if rn.n.NS() == ns {
-			rn.remove()
-			rn.n.CacheData = nil
-			r.used -= rn.n.Size()
-			evicted = append(evicted, rn)
-		}
-	}
-	r.mu.Unlock()
-
-	for _, rn := range evicted {
-		rn.h.Release()
-	}
-}
-
-func (r *lru) EvictAll() {
-	r.mu.Lock()
-	back := r.recent.prev
-	for rn := back; rn != &r.recent; rn = rn.prev {
-		rn.n.CacheData = nil
-	}
-	r.reset()
-	r.mu.Unlock()
-
-	for rn := back; rn != &r.recent; rn = rn.prev {
-		rn.h.Release()
-	}
-}
-
-func (r *lru) Close() error {
-	return nil
-}
-
-// NewLRU create a new LRU-cache.
-func NewLRU(capacity int) Cacher {
-	r := &lru{capacity: capacity}
-	r.reset()
-	return r
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer.go
deleted file mode 100644
index d33d5e9c7..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/comparer.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import "github.com/syndtr/goleveldb/leveldb/comparer"
-
-type iComparer struct {
-	ucmp comparer.Comparer
-}
-
-func (icmp *iComparer) uName() string {
-	return icmp.ucmp.Name()
-}
-
-func (icmp *iComparer) uCompare(a, b []byte) int {
-	return icmp.ucmp.Compare(a, b)
-}
-
-func (icmp *iComparer) uSeparator(dst, a, b []byte) []byte {
-	return icmp.ucmp.Separator(dst, a, b)
-}
-
-func (icmp *iComparer) uSuccessor(dst, b []byte) []byte {
-	return icmp.ucmp.Successor(dst, b)
-}
-
-func (icmp *iComparer) Name() string {
-	return icmp.uName()
-}
-
-func (icmp *iComparer) Compare(a, b []byte) int {
-	x := icmp.ucmp.Compare(iKey(a).ukey(), iKey(b).ukey())
-	if x == 0 {
-		if m, n := iKey(a).num(), iKey(b).num(); m > n {
-			x = -1
-		} else if m < n {
-			x = 1
-		}
-	}
-	return x
-}
-
-func (icmp *iComparer) Separator(dst, a, b []byte) []byte {
-	ua, ub := iKey(a).ukey(), iKey(b).ukey()
-	dst = icmp.ucmp.Separator(dst, ua, ub)
-	if dst == nil {
-		return nil
-	}
-	if len(dst) < len(ua) && icmp.uCompare(ua, dst) < 0 {
-		dst = append(dst, kMaxNumBytes...)
-	} else {
-		// Did not close possibilities that n maybe longer than len(ub).
-		dst = append(dst, a[len(a)-8:]...)
-	}
-	return dst
-}
-
-func (icmp *iComparer) Successor(dst, b []byte) []byte {
-	ub := iKey(b).ukey()
-	dst = icmp.ucmp.Successor(dst, ub)
-	if dst == nil {
-		return nil
-	}
-	if len(dst) < len(ub) && icmp.uCompare(ub, dst) < 0 {
-		dst = append(dst, kMaxNumBytes...)
-	} else {
-		// Did not close possibilities that n maybe longer than len(ub).
-		dst = append(dst, b[len(b)-8:]...)
-	}
-	return dst
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go
deleted file mode 100644
index 14dddf88d..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/comparer/bytes_comparer.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package comparer
-
-import "bytes"
-
-type bytesComparer struct{}
-
-func (bytesComparer) Compare(a, b []byte) int {
-	return bytes.Compare(a, b)
-}
-
-func (bytesComparer) Name() string {
-	return "leveldb.BytewiseComparator"
-}
-
-func (bytesComparer) Separator(dst, a, b []byte) []byte {
-	i, n := 0, len(a)
-	if n > len(b) {
-		n = len(b)
-	}
-	for ; i < n && a[i] == b[i]; i++ {
-	}
-	if i >= n {
-		// Do not shorten if one string is a prefix of the other
-	} else if c := a[i]; c < 0xff && c+1 < b[i] {
-		dst = append(dst, a[:i+1]...)
-		dst[i]++
-		return dst
-	}
-	return nil
-}
-
-func (bytesComparer) Successor(dst, b []byte) []byte {
-	for i, c := range b {
-		if c != 0xff {
-			dst = append(dst, b[:i+1]...)
-			dst[i]++
-			return dst
-		}
-	}
-	return nil
-}
-
-// DefaultComparer are default implementation of the Comparer interface.
-// It uses the natural ordering, consistent with bytes.Compare.
-var DefaultComparer = bytesComparer{}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go b/vendor/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go
deleted file mode 100644
index 14a28f16f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/comparer/comparer.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package comparer provides interface and implementation for ordering
-// sets of data.
-package comparer
-
-// BasicComparer is the interface that wraps the basic Compare method.
-type BasicComparer interface {
-	// Compare returns -1, 0, or +1 depending on whether a is 'less than',
-	// 'equal to' or 'greater than' b. The two arguments can only be 'equal'
-	// if their contents are exactly equal. Furthermore, the empty slice
-	// must be 'less than' any non-empty slice.
-	Compare(a, b []byte) int
-}
-
-// Comparer defines a total ordering over the space of []byte keys: a 'less
-// than' relationship.
-type Comparer interface {
-	BasicComparer
-
-	// Name returns name of the comparer.
-	//
-	// The Level-DB on-disk format stores the comparer name, and opening a
-	// database with a different comparer from the one it was created with
-	// will result in an error.
-	//
-	// An implementation to a new name whenever the comparer implementation
-	// changes in a way that will cause the relative ordering of any two keys
-	// to change.
-	//
-	// Names starting with "leveldb." are reserved and should not be used
-	// by any users of this package.
-	Name() string
-
-	// Bellow are advanced functions used used to reduce the space requirements
-	// for internal data structures such as index blocks.
-
-	// Separator appends a sequence of bytes x to dst such that a <= x && x < b,
-	// where 'less than' is consistent with Compare. An implementation should
-	// return nil if x equal to a.
-	//
-	// Either contents of a or b should not by any means modified. Doing so
-	// may cause corruption on the internal state.
-	Separator(dst, a, b []byte) []byte
-
-	// Successor appends a sequence of bytes x to dst such that x >= b, where
-	// 'less than' is consistent with Compare. An implementation should return
-	// nil if x equal to b.
-	//
-	// Contents of b should not by any means modified. Doing so may cause
-	// corruption on the internal state.
-	Successor(dst, b []byte) []byte
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/corrupt_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/corrupt_test.go
deleted file mode 100644
index a351874ed..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/corrupt_test.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"fmt"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"io"
-	"math/rand"
-	"testing"
-)
-
-const ctValSize = 1000
-
-type dbCorruptHarness struct {
-	dbHarness
-}
-
-func newDbCorruptHarnessWopt(t *testing.T, o *opt.Options) *dbCorruptHarness {
-	h := new(dbCorruptHarness)
-	h.init(t, o)
-	return h
-}
-
-func newDbCorruptHarness(t *testing.T) *dbCorruptHarness {
-	return newDbCorruptHarnessWopt(t, &opt.Options{
-		BlockCacheCapacity: 100,
-		Strict:             opt.StrictJournalChecksum,
-	})
-}
-
-func (h *dbCorruptHarness) recover() {
-	p := &h.dbHarness
-	t := p.t
-
-	var err error
-	p.db, err = Recover(h.stor, h.o)
-	if err != nil {
-		t.Fatal("Repair: got error: ", err)
-	}
-}
-
-func (h *dbCorruptHarness) build(n int) {
-	p := &h.dbHarness
-	t := p.t
-	db := p.db
-
-	batch := new(Batch)
-	for i := 0; i < n; i++ {
-		batch.Reset()
-		batch.Put(tkey(i), tval(i, ctValSize))
-		err := db.Write(batch, p.wo)
-		if err != nil {
-			t.Fatal("write error: ", err)
-		}
-	}
-}
-
-func (h *dbCorruptHarness) buildShuffled(n int, rnd *rand.Rand) {
-	p := &h.dbHarness
-	t := p.t
-	db := p.db
-
-	batch := new(Batch)
-	for i := range rnd.Perm(n) {
-		batch.Reset()
-		batch.Put(tkey(i), tval(i, ctValSize))
-		err := db.Write(batch, p.wo)
-		if err != nil {
-			t.Fatal("write error: ", err)
-		}
-	}
-}
-
-func (h *dbCorruptHarness) deleteRand(n, max int, rnd *rand.Rand) {
-	p := &h.dbHarness
-	t := p.t
-	db := p.db
-
-	batch := new(Batch)
-	for i := 0; i < n; i++ {
-		batch.Reset()
-		batch.Delete(tkey(rnd.Intn(max)))
-		err := db.Write(batch, p.wo)
-		if err != nil {
-			t.Fatal("write error: ", err)
-		}
-	}
-}
-
-func (h *dbCorruptHarness) corrupt(ft storage.FileType, fi, offset, n int) {
-	p := &h.dbHarness
-	t := p.t
-
-	ff, _ := p.stor.GetFiles(ft)
-	sff := files(ff)
-	sff.sort()
-	if fi < 0 {
-		fi = len(sff) - 1
-	}
-	if fi >= len(sff) {
-		t.Fatalf("no such file with type %q with index %d", ft, fi)
-	}
-
-	file := sff[fi]
-
-	r, err := file.Open()
-	if err != nil {
-		t.Fatal("cannot open file: ", err)
-	}
-	x, err := r.Seek(0, 2)
-	if err != nil {
-		t.Fatal("cannot query file size: ", err)
-	}
-	m := int(x)
-	if _, err := r.Seek(0, 0); err != nil {
-		t.Fatal(err)
-	}
-
-	if offset < 0 {
-		if -offset > m {
-			offset = 0
-		} else {
-			offset = m + offset
-		}
-	}
-	if offset > m {
-		offset = m
-	}
-	if offset+n > m {
-		n = m - offset
-	}
-
-	buf := make([]byte, m)
-	_, err = io.ReadFull(r, buf)
-	if err != nil {
-		t.Fatal("cannot read file: ", err)
-	}
-	r.Close()
-
-	for i := 0; i < n; i++ {
-		buf[offset+i] ^= 0x80
-	}
-
-	err = file.Remove()
-	if err != nil {
-		t.Fatal("cannot remove old file: ", err)
-	}
-	w, err := file.Create()
-	if err != nil {
-		t.Fatal("cannot create new file: ", err)
-	}
-	_, err = w.Write(buf)
-	if err != nil {
-		t.Fatal("cannot write new file: ", err)
-	}
-	w.Close()
-}
-
-func (h *dbCorruptHarness) removeAll(ft storage.FileType) {
-	ff, err := h.stor.GetFiles(ft)
-	if err != nil {
-		h.t.Fatal("get files: ", err)
-	}
-	for _, f := range ff {
-		if err := f.Remove(); err != nil {
-			h.t.Error("remove file: ", err)
-		}
-	}
-}
-
-func (h *dbCorruptHarness) removeOne(ft storage.FileType) {
-	ff, err := h.stor.GetFiles(ft)
-	if err != nil {
-		h.t.Fatal("get files: ", err)
-	}
-	f := ff[rand.Intn(len(ff))]
-	h.t.Logf("removing file @%d", f.Num())
-	if err := f.Remove(); err != nil {
-		h.t.Error("remove file: ", err)
-	}
-}
-
-func (h *dbCorruptHarness) check(min, max int) {
-	p := &h.dbHarness
-	t := p.t
-	db := p.db
-
-	var n, badk, badv, missed, good int
-	iter := db.NewIterator(nil, p.ro)
-	for iter.Next() {
-		k := 0
-		fmt.Sscanf(string(iter.Key()), "%d", &k)
-		if k < n {
-			badk++
-			continue
-		}
-		missed += k - n
-		n = k + 1
-		if !bytes.Equal(iter.Value(), tval(k, ctValSize)) {
-			badv++
-		} else {
-			good++
-		}
-	}
-	err := iter.Error()
-	iter.Release()
-	t.Logf("want=%d..%d got=%d badkeys=%d badvalues=%d missed=%d, err=%v",
-		min, max, good, badk, badv, missed, err)
-	if good < min || good > max {
-		t.Errorf("good entries number not in range")
-	}
-}
-
-func TestCorruptDB_Journal(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.build(100)
-	h.check(100, 100)
-	h.closeDB()
-	h.corrupt(storage.TypeJournal, -1, 19, 1)
-	h.corrupt(storage.TypeJournal, -1, 32*1024+1000, 1)
-
-	h.openDB()
-	h.check(36, 36)
-
-	h.close()
-}
-
-func TestCorruptDB_Table(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.build(100)
-	h.compactMem()
-	h.compactRangeAt(0, "", "")
-	h.compactRangeAt(1, "", "")
-	h.closeDB()
-	h.corrupt(storage.TypeTable, -1, 100, 1)
-
-	h.openDB()
-	h.check(99, 99)
-
-	h.close()
-}
-
-func TestCorruptDB_TableIndex(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.build(10000)
-	h.compactMem()
-	h.closeDB()
-	h.corrupt(storage.TypeTable, -1, -2000, 500)
-
-	h.openDB()
-	h.check(5000, 9999)
-
-	h.close()
-}
-
-func TestCorruptDB_MissingManifest(t *testing.T) {
-	rnd := rand.New(rand.NewSource(0x0badda7a))
-	h := newDbCorruptHarnessWopt(t, &opt.Options{
-		BlockCacheCapacity: 100,
-		Strict:             opt.StrictJournalChecksum,
-		WriteBuffer:        1000 * 60,
-	})
-
-	h.build(1000)
-	h.compactMem()
-	h.buildShuffled(1000, rnd)
-	h.compactMem()
-	h.deleteRand(500, 1000, rnd)
-	h.compactMem()
-	h.buildShuffled(1000, rnd)
-	h.compactMem()
-	h.deleteRand(500, 1000, rnd)
-	h.compactMem()
-	h.buildShuffled(1000, rnd)
-	h.compactMem()
-	h.closeDB()
-
-	h.stor.SetIgnoreOpenErr(storage.TypeManifest)
-	h.removeAll(storage.TypeManifest)
-	h.openAssert(false)
-	h.stor.SetIgnoreOpenErr(0)
-
-	h.recover()
-	h.check(1000, 1000)
-	h.build(1000)
-	h.compactMem()
-	h.compactRange("", "")
-	h.closeDB()
-
-	h.recover()
-	h.check(1000, 1000)
-
-	h.close()
-}
-
-func TestCorruptDB_SequenceNumberRecovery(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("foo", "v1")
-	h.put("foo", "v2")
-	h.put("foo", "v3")
-	h.put("foo", "v4")
-	h.put("foo", "v5")
-	h.closeDB()
-
-	h.recover()
-	h.getVal("foo", "v5")
-	h.put("foo", "v6")
-	h.getVal("foo", "v6")
-
-	h.reopenDB()
-	h.getVal("foo", "v6")
-
-	h.close()
-}
-
-func TestCorruptDB_SequenceNumberRecoveryTable(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("foo", "v1")
-	h.put("foo", "v2")
-	h.put("foo", "v3")
-	h.compactMem()
-	h.put("foo", "v4")
-	h.put("foo", "v5")
-	h.compactMem()
-	h.closeDB()
-
-	h.recover()
-	h.getVal("foo", "v5")
-	h.put("foo", "v6")
-	h.getVal("foo", "v6")
-
-	h.reopenDB()
-	h.getVal("foo", "v6")
-
-	h.close()
-}
-
-func TestCorruptDB_CorruptedManifest(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("foo", "hello")
-	h.compactMem()
-	h.compactRange("", "")
-	h.closeDB()
-	h.corrupt(storage.TypeManifest, -1, 0, 1000)
-	h.openAssert(false)
-
-	h.recover()
-	h.getVal("foo", "hello")
-
-	h.close()
-}
-
-func TestCorruptDB_CompactionInputError(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.build(10)
-	h.compactMem()
-	h.closeDB()
-	h.corrupt(storage.TypeTable, -1, 100, 1)
-
-	h.openDB()
-	h.check(9, 9)
-
-	h.build(10000)
-	h.check(10000, 10000)
-
-	h.close()
-}
-
-func TestCorruptDB_UnrelatedKeys(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.build(10)
-	h.compactMem()
-	h.closeDB()
-	h.corrupt(storage.TypeTable, -1, 100, 1)
-
-	h.openDB()
-	h.put(string(tkey(1000)), string(tval(1000, ctValSize)))
-	h.getVal(string(tkey(1000)), string(tval(1000, ctValSize)))
-	h.compactMem()
-	h.getVal(string(tkey(1000)), string(tval(1000, ctValSize)))
-
-	h.close()
-}
-
-func TestCorruptDB_Level0NewerFileHasOlderSeqnum(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("a", "v1")
-	h.put("b", "v1")
-	h.compactMem()
-	h.put("a", "v2")
-	h.put("b", "v2")
-	h.compactMem()
-	h.put("a", "v3")
-	h.put("b", "v3")
-	h.compactMem()
-	h.put("c", "v0")
-	h.put("d", "v0")
-	h.compactMem()
-	h.compactRangeAt(1, "", "")
-	h.closeDB()
-
-	h.recover()
-	h.getVal("a", "v3")
-	h.getVal("b", "v3")
-	h.getVal("c", "v0")
-	h.getVal("d", "v0")
-
-	h.close()
-}
-
-func TestCorruptDB_RecoverInvalidSeq_Issue53(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("a", "v1")
-	h.put("b", "v1")
-	h.compactMem()
-	h.put("a", "v2")
-	h.put("b", "v2")
-	h.compactMem()
-	h.put("a", "v3")
-	h.put("b", "v3")
-	h.compactMem()
-	h.put("c", "v0")
-	h.put("d", "v0")
-	h.compactMem()
-	h.compactRangeAt(0, "", "")
-	h.closeDB()
-
-	h.recover()
-	h.getVal("a", "v3")
-	h.getVal("b", "v3")
-	h.getVal("c", "v0")
-	h.getVal("d", "v0")
-
-	h.close()
-}
-
-func TestCorruptDB_MissingTableFiles(t *testing.T) {
-	h := newDbCorruptHarness(t)
-
-	h.put("a", "v1")
-	h.put("b", "v1")
-	h.compactMem()
-	h.put("c", "v2")
-	h.put("d", "v2")
-	h.compactMem()
-	h.put("e", "v3")
-	h.put("f", "v3")
-	h.closeDB()
-
-	h.removeOne(storage.TypeTable)
-	h.openAssert(false)
-
-	h.close()
-}
-
-func TestCorruptDB_RecoverTable(t *testing.T) {
-	h := newDbCorruptHarnessWopt(t, &opt.Options{
-		WriteBuffer:         112 * opt.KiB,
-		CompactionTableSize: 90 * opt.KiB,
-		Filter:              filter.NewBloomFilter(10),
-	})
-
-	h.build(1000)
-	h.compactMem()
-	h.compactRangeAt(0, "", "")
-	h.compactRangeAt(1, "", "")
-	seq := h.db.seq
-	h.closeDB()
-	h.corrupt(storage.TypeTable, 0, 1000, 1)
-	h.corrupt(storage.TypeTable, 3, 10000, 1)
-	// Corrupted filter shouldn't affect recovery.
-	h.corrupt(storage.TypeTable, 3, 113888, 10)
-	h.corrupt(storage.TypeTable, -1, 20000, 1)
-
-	h.recover()
-	if h.db.seq != seq {
-		t.Errorf("invalid seq, want=%d got=%d", seq, h.db.seq)
-	}
-	h.check(985, 985)
-
-	h.close()
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db.go b/vendor/github.com/syndtr/goleveldb/leveldb/db.go
deleted file mode 100644
index def86bc1a..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db.go
+++ /dev/null
@@ -1,1068 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"container/list"
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/journal"
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/table"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// DB is a LevelDB database.
-type DB struct {
-	// Need 64-bit alignment.
-	seq uint64
-
-	// Session.
-	s *session
-
-	// MemDB.
-	memMu             sync.RWMutex
-	memPool           chan *memdb.DB
-	mem, frozenMem    *memDB
-	journal           *journal.Writer
-	journalWriter     storage.Writer
-	journalFile       storage.File
-	frozenJournalFile storage.File
-	frozenSeq         uint64
-
-	// Snapshot.
-	snapsMu   sync.Mutex
-	snapsList *list.List
-
-	// Stats.
-	aliveSnaps, aliveIters int32
-
-	// Write.
-	writeC       chan *Batch
-	writeMergedC chan bool
-	writeLockC   chan struct{}
-	writeAckC    chan error
-	writeDelay   time.Duration
-	writeDelayN  int
-	journalC     chan *Batch
-	journalAckC  chan error
-
-	// Compaction.
-	tcompCmdC        chan cCmd
-	tcompPauseC      chan chan<- struct{}
-	mcompCmdC        chan cCmd
-	compErrC         chan error
-	compPerErrC      chan error
-	compErrSetC      chan error
-	compWriteLocking bool
-	compStats        []cStats
-
-	// Close.
-	closeW sync.WaitGroup
-	closeC chan struct{}
-	closed uint32
-	closer io.Closer
-}
-
-func openDB(s *session) (*DB, error) {
-	s.log("db@open opening")
-	start := time.Now()
-	db := &DB{
-		s: s,
-		// Initial sequence
-		seq: s.stSeqNum,
-		// MemDB
-		memPool: make(chan *memdb.DB, 1),
-		// Snapshot
-		snapsList: list.New(),
-		// Write
-		writeC:       make(chan *Batch),
-		writeMergedC: make(chan bool),
-		writeLockC:   make(chan struct{}, 1),
-		writeAckC:    make(chan error),
-		journalC:     make(chan *Batch),
-		journalAckC:  make(chan error),
-		// Compaction
-		tcompCmdC:   make(chan cCmd),
-		tcompPauseC: make(chan chan<- struct{}),
-		mcompCmdC:   make(chan cCmd),
-		compErrC:    make(chan error),
-		compPerErrC: make(chan error),
-		compErrSetC: make(chan error),
-		compStats:   make([]cStats, s.o.GetNumLevel()),
-		// Close
-		closeC: make(chan struct{}),
-	}
-
-	// Read-only mode.
-	readOnly := s.o.GetReadOnly()
-
-	if readOnly {
-		// Recover journals (read-only mode).
-		if err := db.recoverJournalRO(); err != nil {
-			return nil, err
-		}
-	} else {
-		// Recover journals.
-		if err := db.recoverJournal(); err != nil {
-			return nil, err
-		}
-
-		// Remove any obsolete files.
-		if err := db.checkAndCleanFiles(); err != nil {
-			// Close journal.
-			if db.journal != nil {
-				db.journal.Close()
-				db.journalWriter.Close()
-			}
-			return nil, err
-		}
-
-	}
-
-	// Doesn't need to be included in the wait group.
-	go db.compactionError()
-	go db.mpoolDrain()
-
-	if readOnly {
-		db.SetReadOnly()
-	} else {
-		db.closeW.Add(3)
-		go db.tCompaction()
-		go db.mCompaction()
-		go db.jWriter()
-	}
-
-	s.logf("db@open done T·%v", time.Since(start))
-
-	runtime.SetFinalizer(db, (*DB).Close)
-	return db, nil
-}
-
-// Open opens or creates a DB for the given storage.
-// The DB will be created if not exist, unless ErrorIfMissing is true.
-// Also, if ErrorIfExist is true and the DB exist Open will returns
-// os.ErrExist error.
-//
-// Open will return an error with type of ErrCorrupted if corruption
-// detected in the DB. Corrupted DB can be recovered with Recover
-// function.
-//
-// The returned DB instance is goroutine-safe.
-// The DB must be closed after use, by calling Close method.
-func Open(stor storage.Storage, o *opt.Options) (db *DB, err error) {
-	s, err := newSession(stor, o)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			s.close()
-			s.release()
-		}
-	}()
-
-	err = s.recover()
-	if err != nil {
-		if !os.IsNotExist(err) || s.o.GetErrorIfMissing() {
-			return
-		}
-		err = s.create()
-		if err != nil {
-			return
-		}
-	} else if s.o.GetErrorIfExist() {
-		err = os.ErrExist
-		return
-	}
-
-	return openDB(s)
-}
-
-// OpenFile opens or creates a DB for the given path.
-// The DB will be created if not exist, unless ErrorIfMissing is true.
-// Also, if ErrorIfExist is true and the DB exist OpenFile will returns
-// os.ErrExist error.
-//
-// OpenFile uses standard file-system backed storage implementation as
-// desribed in the leveldb/storage package.
-//
-// OpenFile will return an error with type of ErrCorrupted if corruption
-// detected in the DB. Corrupted DB can be recovered with Recover
-// function.
-//
-// The returned DB instance is goroutine-safe.
-// The DB must be closed after use, by calling Close method.
-func OpenFile(path string, o *opt.Options) (db *DB, err error) {
-	stor, err := storage.OpenFile(path)
-	if err != nil {
-		return
-	}
-	db, err = Open(stor, o)
-	if err != nil {
-		stor.Close()
-	} else {
-		db.closer = stor
-	}
-	return
-}
-
-// Recover recovers and opens a DB with missing or corrupted manifest files
-// for the given storage. It will ignore any manifest files, valid or not.
-// The DB must already exist or it will returns an error.
-// Also, Recover will ignore ErrorIfMissing and ErrorIfExist options.
-//
-// The returned DB instance is goroutine-safe.
-// The DB must be closed after use, by calling Close method.
-func Recover(stor storage.Storage, o *opt.Options) (db *DB, err error) {
-	s, err := newSession(stor, o)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			s.close()
-			s.release()
-		}
-	}()
-
-	err = recoverTable(s, o)
-	if err != nil {
-		return
-	}
-	return openDB(s)
-}
-
-// RecoverFile recovers and opens a DB with missing or corrupted manifest files
-// for the given path. It will ignore any manifest files, valid or not.
-// The DB must already exist or it will returns an error.
-// Also, Recover will ignore ErrorIfMissing and ErrorIfExist options.
-//
-// RecoverFile uses standard file-system backed storage implementation as desribed
-// in the leveldb/storage package.
-//
-// The returned DB instance is goroutine-safe.
-// The DB must be closed after use, by calling Close method.
-func RecoverFile(path string, o *opt.Options) (db *DB, err error) {
-	stor, err := storage.OpenFile(path)
-	if err != nil {
-		return
-	}
-	db, err = Recover(stor, o)
-	if err != nil {
-		stor.Close()
-	} else {
-		db.closer = stor
-	}
-	return
-}
-
-func recoverTable(s *session, o *opt.Options) error {
-	o = dupOptions(o)
-	// Mask StrictReader, lets StrictRecovery doing its job.
-	o.Strict &= ^opt.StrictReader
-
-	// Get all tables and sort it by file number.
-	tableFiles_, err := s.getFiles(storage.TypeTable)
-	if err != nil {
-		return err
-	}
-	tableFiles := files(tableFiles_)
-	tableFiles.sort()
-
-	var (
-		maxSeq                                                            uint64
-		recoveredKey, goodKey, corruptedKey, corruptedBlock, droppedTable int
-
-		// We will drop corrupted table.
-		strict = o.GetStrict(opt.StrictRecovery)
-
-		rec   = &sessionRecord{}
-		bpool = util.NewBufferPool(o.GetBlockSize() + 5)
-	)
-	buildTable := func(iter iterator.Iterator) (tmp storage.File, size int64, err error) {
-		tmp = s.newTemp()
-		writer, err := tmp.Create()
-		if err != nil {
-			return
-		}
-		defer func() {
-			writer.Close()
-			if err != nil {
-				tmp.Remove()
-				tmp = nil
-			}
-		}()
-
-		// Copy entries.
-		tw := table.NewWriter(writer, o)
-		for iter.Next() {
-			key := iter.Key()
-			if validIkey(key) {
-				err = tw.Append(key, iter.Value())
-				if err != nil {
-					return
-				}
-			}
-		}
-		err = iter.Error()
-		if err != nil {
-			return
-		}
-		err = tw.Close()
-		if err != nil {
-			return
-		}
-		err = writer.Sync()
-		if err != nil {
-			return
-		}
-		size = int64(tw.BytesLen())
-		return
-	}
-	recoverTable := func(file storage.File) error {
-		s.logf("table@recovery recovering @%d", file.Num())
-		reader, err := file.Open()
-		if err != nil {
-			return err
-		}
-		var closed bool
-		defer func() {
-			if !closed {
-				reader.Close()
-			}
-		}()
-
-		// Get file size.
-		size, err := reader.Seek(0, 2)
-		if err != nil {
-			return err
-		}
-
-		var (
-			tSeq                                     uint64
-			tgoodKey, tcorruptedKey, tcorruptedBlock int
-			imin, imax                               []byte
-		)
-		tr, err := table.NewReader(reader, size, storage.NewFileInfo(file), nil, bpool, o)
-		if err != nil {
-			return err
-		}
-		iter := tr.NewIterator(nil, nil)
-		if itererr, ok := iter.(iterator.ErrorCallbackSetter); ok {
-			itererr.SetErrorCallback(func(err error) {
-				if errors.IsCorrupted(err) {
-					s.logf("table@recovery block corruption @%d %q", file.Num(), err)
-					tcorruptedBlock++
-				}
-			})
-		}
-
-		// Scan the table.
-		for iter.Next() {
-			key := iter.Key()
-			_, seq, _, kerr := parseIkey(key)
-			if kerr != nil {
-				tcorruptedKey++
-				continue
-			}
-			tgoodKey++
-			if seq > tSeq {
-				tSeq = seq
-			}
-			if imin == nil {
-				imin = append([]byte{}, key...)
-			}
-			imax = append(imax[:0], key...)
-		}
-		if err := iter.Error(); err != nil {
-			iter.Release()
-			return err
-		}
-		iter.Release()
-
-		goodKey += tgoodKey
-		corruptedKey += tcorruptedKey
-		corruptedBlock += tcorruptedBlock
-
-		if strict && (tcorruptedKey > 0 || tcorruptedBlock > 0) {
-			droppedTable++
-			s.logf("table@recovery dropped @%d Gk·%d Ck·%d Cb·%d S·%d Q·%d", file.Num(), tgoodKey, tcorruptedKey, tcorruptedBlock, size, tSeq)
-			return nil
-		}
-
-		if tgoodKey > 0 {
-			if tcorruptedKey > 0 || tcorruptedBlock > 0 {
-				// Rebuild the table.
-				s.logf("table@recovery rebuilding @%d", file.Num())
-				iter := tr.NewIterator(nil, nil)
-				tmp, newSize, err := buildTable(iter)
-				iter.Release()
-				if err != nil {
-					return err
-				}
-				closed = true
-				reader.Close()
-				if err := file.Replace(tmp); err != nil {
-					return err
-				}
-				size = newSize
-			}
-			if tSeq > maxSeq {
-				maxSeq = tSeq
-			}
-			recoveredKey += tgoodKey
-			// Add table to level 0.
-			rec.addTable(0, file.Num(), uint64(size), imin, imax)
-			s.logf("table@recovery recovered @%d Gk·%d Ck·%d Cb·%d S·%d Q·%d", file.Num(), tgoodKey, tcorruptedKey, tcorruptedBlock, size, tSeq)
-		} else {
-			droppedTable++
-			s.logf("table@recovery unrecoverable @%d Ck·%d Cb·%d S·%d", file.Num(), tcorruptedKey, tcorruptedBlock, size)
-		}
-
-		return nil
-	}
-
-	// Recover all tables.
-	if len(tableFiles) > 0 {
-		s.logf("table@recovery F·%d", len(tableFiles))
-
-		// Mark file number as used.
-		s.markFileNum(tableFiles[len(tableFiles)-1].Num())
-
-		for _, file := range tableFiles {
-			if err := recoverTable(file); err != nil {
-				return err
-			}
-		}
-
-		s.logf("table@recovery recovered F·%d N·%d Gk·%d Ck·%d Q·%d", len(tableFiles), recoveredKey, goodKey, corruptedKey, maxSeq)
-	}
-
-	// Set sequence number.
-	rec.setSeqNum(maxSeq)
-
-	// Create new manifest.
-	if err := s.create(); err != nil {
-		return err
-	}
-
-	// Commit.
-	return s.commit(rec)
-}
-
-func (db *DB) recoverJournal() error {
-	// Get all journals and sort it by file number.
-	allJournalFiles, err := db.s.getFiles(storage.TypeJournal)
-	if err != nil {
-		return err
-	}
-	files(allJournalFiles).sort()
-
-	// Journals that will be recovered.
-	var recJournalFiles []storage.File
-	for _, jf := range allJournalFiles {
-		if jf.Num() >= db.s.stJournalNum || jf.Num() == db.s.stPrevJournalNum {
-			recJournalFiles = append(recJournalFiles, jf)
-		}
-	}
-
-	var (
-		of  storage.File // Obsolete file.
-		rec = &sessionRecord{}
-	)
-
-	// Recover journals.
-	if len(recJournalFiles) > 0 {
-		db.logf("journal@recovery F·%d", len(recJournalFiles))
-
-		// Mark file number as used.
-		db.s.markFileNum(recJournalFiles[len(recJournalFiles)-1].Num())
-
-		var (
-			// Options.
-			strict      = db.s.o.GetStrict(opt.StrictJournal)
-			checksum    = db.s.o.GetStrict(opt.StrictJournalChecksum)
-			writeBuffer = db.s.o.GetWriteBuffer()
-
-			jr    *journal.Reader
-			mdb   = memdb.New(db.s.icmp, writeBuffer)
-			buf   = &util.Buffer{}
-			batch = &Batch{}
-		)
-
-		for _, jf := range recJournalFiles {
-			db.logf("journal@recovery recovering @%d", jf.Num())
-
-			fr, err := jf.Open()
-			if err != nil {
-				return err
-			}
-
-			// Create or reset journal reader instance.
-			if jr == nil {
-				jr = journal.NewReader(fr, dropper{db.s, jf}, strict, checksum)
-			} else {
-				jr.Reset(fr, dropper{db.s, jf}, strict, checksum)
-			}
-
-			// Flush memdb and remove obsolete journal file.
-			if of != nil {
-				if mdb.Len() > 0 {
-					if _, err := db.s.flushMemdb(rec, mdb, -1); err != nil {
-						fr.Close()
-						return err
-					}
-				}
-
-				rec.setJournalNum(jf.Num())
-				rec.setSeqNum(db.seq)
-				if err := db.s.commit(rec); err != nil {
-					fr.Close()
-					return err
-				}
-				rec.resetAddedTables()
-
-				of.Remove()
-				of = nil
-			}
-
-			// Replay journal to memdb.
-			mdb.Reset()
-			for {
-				r, err := jr.Next()
-				if err != nil {
-					if err == io.EOF {
-						break
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-
-				buf.Reset()
-				if _, err := buf.ReadFrom(r); err != nil {
-					if err == io.ErrUnexpectedEOF {
-						// This is error returned due to corruption, with strict == false.
-						continue
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-				if err := batch.memDecodeAndReplay(db.seq, buf.Bytes(), mdb); err != nil {
-					if !strict && errors.IsCorrupted(err) {
-						db.s.logf("journal error: %v (skipped)", err)
-						// We won't apply sequence number as it might be corrupted.
-						continue
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-
-				// Save sequence number.
-				db.seq = batch.seq + uint64(batch.Len())
-
-				// Flush it if large enough.
-				if mdb.Size() >= writeBuffer {
-					if _, err := db.s.flushMemdb(rec, mdb, 0); err != nil {
-						fr.Close()
-						return err
-					}
-
-					mdb.Reset()
-				}
-			}
-
-			fr.Close()
-			of = jf
-		}
-
-		// Flush the last memdb.
-		if mdb.Len() > 0 {
-			if _, err := db.s.flushMemdb(rec, mdb, 0); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Create a new journal.
-	if _, err := db.newMem(0); err != nil {
-		return err
-	}
-
-	// Commit.
-	rec.setJournalNum(db.journalFile.Num())
-	rec.setSeqNum(db.seq)
-	if err := db.s.commit(rec); err != nil {
-		// Close journal on error.
-		if db.journal != nil {
-			db.journal.Close()
-			db.journalWriter.Close()
-		}
-		return err
-	}
-
-	// Remove the last obsolete journal file.
-	if of != nil {
-		of.Remove()
-	}
-
-	return nil
-}
-
-func (db *DB) recoverJournalRO() error {
-	// Get all journals and sort it by file number.
-	allJournalFiles, err := db.s.getFiles(storage.TypeJournal)
-	if err != nil {
-		return err
-	}
-	files(allJournalFiles).sort()
-
-	// Journals that will be recovered.
-	var recJournalFiles []storage.File
-	for _, jf := range allJournalFiles {
-		if jf.Num() >= db.s.stJournalNum || jf.Num() == db.s.stPrevJournalNum {
-			recJournalFiles = append(recJournalFiles, jf)
-		}
-	}
-
-	var (
-		// Options.
-		strict      = db.s.o.GetStrict(opt.StrictJournal)
-		checksum    = db.s.o.GetStrict(opt.StrictJournalChecksum)
-		writeBuffer = db.s.o.GetWriteBuffer()
-
-		mdb = memdb.New(db.s.icmp, writeBuffer)
-	)
-
-	// Recover journals.
-	if len(recJournalFiles) > 0 {
-		db.logf("journal@recovery RO·Mode F·%d", len(recJournalFiles))
-
-		var (
-			jr    *journal.Reader
-			buf   = &util.Buffer{}
-			batch = &Batch{}
-		)
-
-		for _, jf := range recJournalFiles {
-			db.logf("journal@recovery recovering @%d", jf.Num())
-
-			fr, err := jf.Open()
-			if err != nil {
-				return err
-			}
-
-			// Create or reset journal reader instance.
-			if jr == nil {
-				jr = journal.NewReader(fr, dropper{db.s, jf}, strict, checksum)
-			} else {
-				jr.Reset(fr, dropper{db.s, jf}, strict, checksum)
-			}
-
-			// Replay journal to memdb.
-			for {
-				r, err := jr.Next()
-				if err != nil {
-					if err == io.EOF {
-						break
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-
-				buf.Reset()
-				if _, err := buf.ReadFrom(r); err != nil {
-					if err == io.ErrUnexpectedEOF {
-						// This is error returned due to corruption, with strict == false.
-						continue
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-				if err := batch.memDecodeAndReplay(db.seq, buf.Bytes(), mdb); err != nil {
-					if !strict && errors.IsCorrupted(err) {
-						db.s.logf("journal error: %v (skipped)", err)
-						// We won't apply sequence number as it might be corrupted.
-						continue
-					}
-
-					fr.Close()
-					return errors.SetFile(err, jf)
-				}
-
-				// Save sequence number.
-				db.seq = batch.seq + uint64(batch.Len())
-			}
-
-			fr.Close()
-		}
-	}
-
-	// Set memDB.
-	db.mem = &memDB{db: db, DB: mdb, ref: 1}
-
-	return nil
-}
-
-func (db *DB) get(key []byte, seq uint64, ro *opt.ReadOptions) (value []byte, err error) {
-	ikey := newIkey(key, seq, ktSeek)
-
-	em, fm := db.getMems()
-	for _, m := range [...]*memDB{em, fm} {
-		if m == nil {
-			continue
-		}
-		defer m.decref()
-
-		mk, mv, me := m.Find(ikey)
-		if me == nil {
-			ukey, _, kt, kerr := parseIkey(mk)
-			if kerr != nil {
-				// Shouldn't have had happen.
-				panic(kerr)
-			}
-			if db.s.icmp.uCompare(ukey, key) == 0 {
-				if kt == ktDel {
-					return nil, ErrNotFound
-				}
-				return append([]byte{}, mv...), nil
-			}
-		} else if me != ErrNotFound {
-			return nil, me
-		}
-	}
-
-	v := db.s.version()
-	value, cSched, err := v.get(ikey, ro, false)
-	v.release()
-	if cSched {
-		// Trigger table compaction.
-		db.compSendTrigger(db.tcompCmdC)
-	}
-	return
-}
-
-func (db *DB) has(key []byte, seq uint64, ro *opt.ReadOptions) (ret bool, err error) {
-	ikey := newIkey(key, seq, ktSeek)
-
-	em, fm := db.getMems()
-	for _, m := range [...]*memDB{em, fm} {
-		if m == nil {
-			continue
-		}
-		defer m.decref()
-
-		mk, _, me := m.Find(ikey)
-		if me == nil {
-			ukey, _, kt, kerr := parseIkey(mk)
-			if kerr != nil {
-				// Shouldn't have had happen.
-				panic(kerr)
-			}
-			if db.s.icmp.uCompare(ukey, key) == 0 {
-				if kt == ktDel {
-					return false, nil
-				}
-				return true, nil
-			}
-		} else if me != ErrNotFound {
-			return false, me
-		}
-	}
-
-	v := db.s.version()
-	_, cSched, err := v.get(ikey, ro, true)
-	v.release()
-	if cSched {
-		// Trigger table compaction.
-		db.compSendTrigger(db.tcompCmdC)
-	}
-	if err == nil {
-		ret = true
-	} else if err == ErrNotFound {
-		err = nil
-	}
-	return
-}
-
-// Get gets the value for the given key. It returns ErrNotFound if the
-// DB does not contains the key.
-//
-// The returned slice is its own copy, it is safe to modify the contents
-// of the returned slice.
-// It is safe to modify the contents of the argument after Get returns.
-func (db *DB) Get(key []byte, ro *opt.ReadOptions) (value []byte, err error) {
-	err = db.ok()
-	if err != nil {
-		return
-	}
-
-	se := db.acquireSnapshot()
-	defer db.releaseSnapshot(se)
-	return db.get(key, se.seq, ro)
-}
-
-// Has returns true if the DB does contains the given key.
-//
-// It is safe to modify the contents of the argument after Get returns.
-func (db *DB) Has(key []byte, ro *opt.ReadOptions) (ret bool, err error) {
-	err = db.ok()
-	if err != nil {
-		return
-	}
-
-	se := db.acquireSnapshot()
-	defer db.releaseSnapshot(se)
-	return db.has(key, se.seq, ro)
-}
-
-// NewIterator returns an iterator for the latest snapshot of the
-// uderlying DB.
-// The returned iterator is not goroutine-safe, but it is safe to use
-// multiple iterators concurrently, with each in a dedicated goroutine.
-// It is also safe to use an iterator concurrently with modifying its
-// underlying DB. The resultant key/value pairs are guaranteed to be
-// consistent.
-//
-// Slice allows slicing the iterator to only contains keys in the given
-// range. A nil Range.Start is treated as a key before all keys in the
-// DB. And a nil Range.Limit is treated as a key after all keys in
-// the DB.
-//
-// The iterator must be released after use, by calling Release method.
-//
-// Also read Iterator documentation of the leveldb/iterator package.
-func (db *DB) NewIterator(slice *util.Range, ro *opt.ReadOptions) iterator.Iterator {
-	if err := db.ok(); err != nil {
-		return iterator.NewEmptyIterator(err)
-	}
-
-	se := db.acquireSnapshot()
-	defer db.releaseSnapshot(se)
-	// Iterator holds 'version' lock, 'version' is immutable so snapshot
-	// can be released after iterator created.
-	return db.newIterator(se.seq, slice, ro)
-}
-
-// GetSnapshot returns a latest snapshot of the underlying DB. A snapshot
-// is a frozen snapshot of a DB state at a particular point in time. The
-// content of snapshot are guaranteed to be consistent.
-//
-// The snapshot must be released after use, by calling Release method.
-func (db *DB) GetSnapshot() (*Snapshot, error) {
-	if err := db.ok(); err != nil {
-		return nil, err
-	}
-
-	return db.newSnapshot(), nil
-}
-
-// GetProperty returns value of the given property name.
-//
-// Property names:
-//	leveldb.num-files-at-level{n}
-//		Returns the number of files at level 'n'.
-//	leveldb.stats
-//		Returns statistics of the underlying DB.
-//	leveldb.sstables
-//		Returns sstables list for each level.
-//	leveldb.blockpool
-//		Returns block pool stats.
-//	leveldb.cachedblock
-//		Returns size of cached block.
-//	leveldb.openedtables
-//		Returns number of opened tables.
-//	leveldb.alivesnaps
-//		Returns number of alive snapshots.
-//	leveldb.aliveiters
-//		Returns number of alive iterators.
-func (db *DB) GetProperty(name string) (value string, err error) {
-	err = db.ok()
-	if err != nil {
-		return
-	}
-
-	const prefix = "leveldb."
-	if !strings.HasPrefix(name, prefix) {
-		return "", ErrNotFound
-	}
-	p := name[len(prefix):]
-
-	v := db.s.version()
-	defer v.release()
-
-	numFilesPrefix := "num-files-at-level"
-	switch {
-	case strings.HasPrefix(p, numFilesPrefix):
-		var level uint
-		var rest string
-		n, _ := fmt.Sscanf(p[len(numFilesPrefix):], "%d%s", &level, &rest)
-		if n != 1 || int(level) >= db.s.o.GetNumLevel() {
-			err = ErrNotFound
-		} else {
-			value = fmt.Sprint(v.tLen(int(level)))
-		}
-	case p == "stats":
-		value = "Compactions\n" +
-			" Level |   Tables   |    Size(MB)   |    Time(sec)  |    Read(MB)   |   Write(MB)\n" +
-			"-------+------------+---------------+---------------+---------------+---------------\n"
-		for level, tables := range v.tables {
-			duration, read, write := db.compStats[level].get()
-			if len(tables) == 0 && duration == 0 {
-				continue
-			}
-			value += fmt.Sprintf(" %3d   | %10d | %13.5f | %13.5f | %13.5f | %13.5f\n",
-				level, len(tables), float64(tables.size())/1048576.0, duration.Seconds(),
-				float64(read)/1048576.0, float64(write)/1048576.0)
-		}
-	case p == "sstables":
-		for level, tables := range v.tables {
-			value += fmt.Sprintf("--- level %d ---\n", level)
-			for _, t := range tables {
-				value += fmt.Sprintf("%d:%d[%q .. %q]\n", t.file.Num(), t.size, t.imin, t.imax)
-			}
-		}
-	case p == "blockpool":
-		value = fmt.Sprintf("%v", db.s.tops.bpool)
-	case p == "cachedblock":
-		if db.s.tops.bcache != nil {
-			value = fmt.Sprintf("%d", db.s.tops.bcache.Size())
-		} else {
-			value = "<nil>"
-		}
-	case p == "openedtables":
-		value = fmt.Sprintf("%d", db.s.tops.cache.Size())
-	case p == "alivesnaps":
-		value = fmt.Sprintf("%d", atomic.LoadInt32(&db.aliveSnaps))
-	case p == "aliveiters":
-		value = fmt.Sprintf("%d", atomic.LoadInt32(&db.aliveIters))
-	default:
-		err = ErrNotFound
-	}
-
-	return
-}
-
-// SizeOf calculates approximate sizes of the given key ranges.
-// The length of the returned sizes are equal with the length of the given
-// ranges. The returned sizes measure storage space usage, so if the user
-// data compresses by a factor of ten, the returned sizes will be one-tenth
-// the size of the corresponding user data size.
-// The results may not include the sizes of recently written data.
-func (db *DB) SizeOf(ranges []util.Range) (Sizes, error) {
-	if err := db.ok(); err != nil {
-		return nil, err
-	}
-
-	v := db.s.version()
-	defer v.release()
-
-	sizes := make(Sizes, 0, len(ranges))
-	for _, r := range ranges {
-		imin := newIkey(r.Start, kMaxSeq, ktSeek)
-		imax := newIkey(r.Limit, kMaxSeq, ktSeek)
-		start, err := v.offsetOf(imin)
-		if err != nil {
-			return nil, err
-		}
-		limit, err := v.offsetOf(imax)
-		if err != nil {
-			return nil, err
-		}
-		var size uint64
-		if limit >= start {
-			size = limit - start
-		}
-		sizes = append(sizes, size)
-	}
-
-	return sizes, nil
-}
-
-// Close closes the DB. This will also releases any outstanding snapshot and
-// abort any in-flight compaction.
-//
-// It is not safe to close a DB until all outstanding iterators are released.
-// It is valid to call Close multiple times. Other methods should not be
-// called after the DB has been closed.
-func (db *DB) Close() error {
-	if !db.setClosed() {
-		return ErrClosed
-	}
-
-	start := time.Now()
-	db.log("db@close closing")
-
-	// Clear the finalizer.
-	runtime.SetFinalizer(db, nil)
-
-	// Get compaction error.
-	var err error
-	select {
-	case err = <-db.compErrC:
-		if err == ErrReadOnly {
-			err = nil
-		}
-	default:
-	}
-
-	// Signal all goroutines.
-	close(db.closeC)
-
-	// Wait for all gorotines to exit.
-	db.closeW.Wait()
-
-	// Lock writer and closes journal.
-	db.writeLockC <- struct{}{}
-	if db.journal != nil {
-		db.journal.Close()
-		db.journalWriter.Close()
-	}
-
-	if db.writeDelayN > 0 {
-		db.logf("db@write was delayed N·%d T·%v", db.writeDelayN, db.writeDelay)
-	}
-
-	// Close session.
-	db.s.close()
-	db.logf("db@close done T·%v", time.Since(start))
-	db.s.release()
-
-	if db.closer != nil {
-		if err1 := db.closer.Close(); err == nil {
-			err = err1
-		}
-	}
-
-	// NIL'ing pointers.
-	db.s = nil
-	db.mem = nil
-	db.frozenMem = nil
-	db.journal = nil
-	db.journalWriter = nil
-	db.journalFile = nil
-	db.frozenJournalFile = nil
-	db.closer = nil
-
-	return err
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go
deleted file mode 100644
index 26003106e..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_compaction.go
+++ /dev/null
@@ -1,791 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"sync"
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-)
-
-var (
-	errCompactionTransactExiting = errors.New("leveldb: compaction transact exiting")
-)
-
-type cStats struct {
-	sync.Mutex
-	duration time.Duration
-	read     uint64
-	write    uint64
-}
-
-func (p *cStats) add(n *cStatsStaging) {
-	p.Lock()
-	p.duration += n.duration
-	p.read += n.read
-	p.write += n.write
-	p.Unlock()
-}
-
-func (p *cStats) get() (duration time.Duration, read, write uint64) {
-	p.Lock()
-	defer p.Unlock()
-	return p.duration, p.read, p.write
-}
-
-type cStatsStaging struct {
-	start    time.Time
-	duration time.Duration
-	on       bool
-	read     uint64
-	write    uint64
-}
-
-func (p *cStatsStaging) startTimer() {
-	if !p.on {
-		p.start = time.Now()
-		p.on = true
-	}
-}
-
-func (p *cStatsStaging) stopTimer() {
-	if p.on {
-		p.duration += time.Since(p.start)
-		p.on = false
-	}
-}
-
-func (db *DB) compactionError() {
-	var err error
-noerr:
-	// No error.
-	for {
-		select {
-		case err = <-db.compErrSetC:
-			switch {
-			case err == nil:
-			case err == ErrReadOnly, errors.IsCorrupted(err):
-				goto hasperr
-			default:
-				goto haserr
-			}
-		case _, _ = <-db.closeC:
-			return
-		}
-	}
-haserr:
-	// Transient error.
-	for {
-		select {
-		case db.compErrC <- err:
-		case err = <-db.compErrSetC:
-			switch {
-			case err == nil:
-				goto noerr
-			case err == ErrReadOnly, errors.IsCorrupted(err):
-				goto hasperr
-			default:
-			}
-		case _, _ = <-db.closeC:
-			return
-		}
-	}
-hasperr:
-	// Persistent error.
-	for {
-		select {
-		case db.compErrC <- err:
-		case db.compPerErrC <- err:
-		case db.writeLockC <- struct{}{}:
-			// Hold write lock, so that write won't pass-through.
-			db.compWriteLocking = true
-		case _, _ = <-db.closeC:
-			if db.compWriteLocking {
-				// We should release the lock or Close will hang.
-				<-db.writeLockC
-			}
-			return
-		}
-	}
-}
-
-type compactionTransactCounter int
-
-func (cnt *compactionTransactCounter) incr() {
-	*cnt++
-}
-
-type compactionTransactInterface interface {
-	run(cnt *compactionTransactCounter) error
-	revert() error
-}
-
-func (db *DB) compactionTransact(name string, t compactionTransactInterface) {
-	defer func() {
-		if x := recover(); x != nil {
-			if x == errCompactionTransactExiting {
-				if err := t.revert(); err != nil {
-					db.logf("%s revert error %q", name, err)
-				}
-			}
-			panic(x)
-		}
-	}()
-
-	const (
-		backoffMin = 1 * time.Second
-		backoffMax = 8 * time.Second
-		backoffMul = 2 * time.Second
-	)
-	var (
-		backoff  = backoffMin
-		backoffT = time.NewTimer(backoff)
-		lastCnt  = compactionTransactCounter(0)
-
-		disableBackoff = db.s.o.GetDisableCompactionBackoff()
-	)
-	for n := 0; ; n++ {
-		// Check wether the DB is closed.
-		if db.isClosed() {
-			db.logf("%s exiting", name)
-			db.compactionExitTransact()
-		} else if n > 0 {
-			db.logf("%s retrying N·%d", name, n)
-		}
-
-		// Execute.
-		cnt := compactionTransactCounter(0)
-		err := t.run(&cnt)
-		if err != nil {
-			db.logf("%s error I·%d %q", name, cnt, err)
-		}
-
-		// Set compaction error status.
-		select {
-		case db.compErrSetC <- err:
-		case perr := <-db.compPerErrC:
-			if err != nil {
-				db.logf("%s exiting (persistent error %q)", name, perr)
-				db.compactionExitTransact()
-			}
-		case _, _ = <-db.closeC:
-			db.logf("%s exiting", name)
-			db.compactionExitTransact()
-		}
-		if err == nil {
-			return
-		}
-		if errors.IsCorrupted(err) {
-			db.logf("%s exiting (corruption detected)", name)
-			db.compactionExitTransact()
-		}
-
-		if !disableBackoff {
-			// Reset backoff duration if counter is advancing.
-			if cnt > lastCnt {
-				backoff = backoffMin
-				lastCnt = cnt
-			}
-
-			// Backoff.
-			backoffT.Reset(backoff)
-			if backoff < backoffMax {
-				backoff *= backoffMul
-				if backoff > backoffMax {
-					backoff = backoffMax
-				}
-			}
-			select {
-			case <-backoffT.C:
-			case _, _ = <-db.closeC:
-				db.logf("%s exiting", name)
-				db.compactionExitTransact()
-			}
-		}
-	}
-}
-
-type compactionTransactFunc struct {
-	runFunc    func(cnt *compactionTransactCounter) error
-	revertFunc func() error
-}
-
-func (t *compactionTransactFunc) run(cnt *compactionTransactCounter) error {
-	return t.runFunc(cnt)
-}
-
-func (t *compactionTransactFunc) revert() error {
-	if t.revertFunc != nil {
-		return t.revertFunc()
-	}
-	return nil
-}
-
-func (db *DB) compactionTransactFunc(name string, run func(cnt *compactionTransactCounter) error, revert func() error) {
-	db.compactionTransact(name, &compactionTransactFunc{run, revert})
-}
-
-func (db *DB) compactionExitTransact() {
-	panic(errCompactionTransactExiting)
-}
-
-func (db *DB) memCompaction() {
-	mdb := db.getFrozenMem()
-	if mdb == nil {
-		return
-	}
-	defer mdb.decref()
-
-	db.logf("memdb@flush N·%d S·%s", mdb.Len(), shortenb(mdb.Size()))
-
-	// Don't compact empty memdb.
-	if mdb.Len() == 0 {
-		db.logf("memdb@flush skipping")
-		// drop frozen memdb
-		db.dropFrozenMem()
-		return
-	}
-
-	// Pause table compaction.
-	resumeC := make(chan struct{})
-	select {
-	case db.tcompPauseC <- (chan<- struct{})(resumeC):
-	case <-db.compPerErrC:
-		close(resumeC)
-		resumeC = nil
-	case _, _ = <-db.closeC:
-		return
-	}
-
-	var (
-		rec        = &sessionRecord{}
-		stats      = &cStatsStaging{}
-		flushLevel int
-	)
-
-	db.compactionTransactFunc("memdb@flush", func(cnt *compactionTransactCounter) (err error) {
-		stats.startTimer()
-		flushLevel, err = db.s.flushMemdb(rec, mdb.DB, -1)
-		stats.stopTimer()
-		return
-	}, func() error {
-		for _, r := range rec.addedTables {
-			db.logf("memdb@flush revert @%d", r.num)
-			f := db.s.getTableFile(r.num)
-			if err := f.Remove(); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-
-	db.compactionTransactFunc("memdb@commit", func(cnt *compactionTransactCounter) (err error) {
-		stats.startTimer()
-		rec.setJournalNum(db.journalFile.Num())
-		rec.setSeqNum(db.frozenSeq)
-		err = db.s.commit(rec)
-		stats.stopTimer()
-		return
-	}, nil)
-
-	db.logf("memdb@flush committed F·%d T·%v", len(rec.addedTables), stats.duration)
-
-	for _, r := range rec.addedTables {
-		stats.write += r.size
-	}
-	db.compStats[flushLevel].add(stats)
-
-	// Drop frozen memdb.
-	db.dropFrozenMem()
-
-	// Resume table compaction.
-	if resumeC != nil {
-		select {
-		case <-resumeC:
-			close(resumeC)
-		case _, _ = <-db.closeC:
-			return
-		}
-	}
-
-	// Trigger table compaction.
-	db.compSendTrigger(db.tcompCmdC)
-}
-
-type tableCompactionBuilder struct {
-	db           *DB
-	s            *session
-	c            *compaction
-	rec          *sessionRecord
-	stat0, stat1 *cStatsStaging
-
-	snapHasLastUkey bool
-	snapLastUkey    []byte
-	snapLastSeq     uint64
-	snapIter        int
-	snapKerrCnt     int
-	snapDropCnt     int
-
-	kerrCnt int
-	dropCnt int
-
-	minSeq    uint64
-	strict    bool
-	tableSize int
-
-	tw *tWriter
-}
-
-func (b *tableCompactionBuilder) appendKV(key, value []byte) error {
-	// Create new table if not already.
-	if b.tw == nil {
-		// Check for pause event.
-		if b.db != nil {
-			select {
-			case ch := <-b.db.tcompPauseC:
-				b.db.pauseCompaction(ch)
-			case _, _ = <-b.db.closeC:
-				b.db.compactionExitTransact()
-			default:
-			}
-		}
-
-		// Create new table.
-		var err error
-		b.tw, err = b.s.tops.create()
-		if err != nil {
-			return err
-		}
-	}
-
-	// Write key/value into table.
-	return b.tw.append(key, value)
-}
-
-func (b *tableCompactionBuilder) needFlush() bool {
-	return b.tw.tw.BytesLen() >= b.tableSize
-}
-
-func (b *tableCompactionBuilder) flush() error {
-	t, err := b.tw.finish()
-	if err != nil {
-		return err
-	}
-	b.rec.addTableFile(b.c.level+1, t)
-	b.stat1.write += t.size
-	b.s.logf("table@build created L%d@%d N·%d S·%s %q:%q", b.c.level+1, t.file.Num(), b.tw.tw.EntriesLen(), shortenb(int(t.size)), t.imin, t.imax)
-	b.tw = nil
-	return nil
-}
-
-func (b *tableCompactionBuilder) cleanup() {
-	if b.tw != nil {
-		b.tw.drop()
-		b.tw = nil
-	}
-}
-
-func (b *tableCompactionBuilder) run(cnt *compactionTransactCounter) error {
-	snapResumed := b.snapIter > 0
-	hasLastUkey := b.snapHasLastUkey // The key might has zero length, so this is necessary.
-	lastUkey := append([]byte{}, b.snapLastUkey...)
-	lastSeq := b.snapLastSeq
-	b.kerrCnt = b.snapKerrCnt
-	b.dropCnt = b.snapDropCnt
-	// Restore compaction state.
-	b.c.restore()
-
-	defer b.cleanup()
-
-	b.stat1.startTimer()
-	defer b.stat1.stopTimer()
-
-	iter := b.c.newIterator()
-	defer iter.Release()
-	for i := 0; iter.Next(); i++ {
-		// Incr transact counter.
-		cnt.incr()
-
-		// Skip until last state.
-		if i < b.snapIter {
-			continue
-		}
-
-		resumed := false
-		if snapResumed {
-			resumed = true
-			snapResumed = false
-		}
-
-		ikey := iter.Key()
-		ukey, seq, kt, kerr := parseIkey(ikey)
-
-		if kerr == nil {
-			shouldStop := !resumed && b.c.shouldStopBefore(ikey)
-
-			if !hasLastUkey || b.s.icmp.uCompare(lastUkey, ukey) != 0 {
-				// First occurrence of this user key.
-
-				// Only rotate tables if ukey doesn't hop across.
-				if b.tw != nil && (shouldStop || b.needFlush()) {
-					if err := b.flush(); err != nil {
-						return err
-					}
-
-					// Creates snapshot of the state.
-					b.c.save()
-					b.snapHasLastUkey = hasLastUkey
-					b.snapLastUkey = append(b.snapLastUkey[:0], lastUkey...)
-					b.snapLastSeq = lastSeq
-					b.snapIter = i
-					b.snapKerrCnt = b.kerrCnt
-					b.snapDropCnt = b.dropCnt
-				}
-
-				hasLastUkey = true
-				lastUkey = append(lastUkey[:0], ukey...)
-				lastSeq = kMaxSeq
-			}
-
-			switch {
-			case lastSeq <= b.minSeq:
-				// Dropped because newer entry for same user key exist
-				fallthrough // (A)
-			case kt == ktDel && seq <= b.minSeq && b.c.baseLevelForKey(lastUkey):
-				// For this user key:
-				// (1) there is no data in higher levels
-				// (2) data in lower levels will have larger seq numbers
-				// (3) data in layers that are being compacted here and have
-				//     smaller seq numbers will be dropped in the next
-				//     few iterations of this loop (by rule (A) above).
-				// Therefore this deletion marker is obsolete and can be dropped.
-				lastSeq = seq
-				b.dropCnt++
-				continue
-			default:
-				lastSeq = seq
-			}
-		} else {
-			if b.strict {
-				return kerr
-			}
-
-			// Don't drop corrupted keys.
-			hasLastUkey = false
-			lastUkey = lastUkey[:0]
-			lastSeq = kMaxSeq
-			b.kerrCnt++
-		}
-
-		if err := b.appendKV(ikey, iter.Value()); err != nil {
-			return err
-		}
-	}
-
-	if err := iter.Error(); err != nil {
-		return err
-	}
-
-	// Finish last table.
-	if b.tw != nil && !b.tw.empty() {
-		return b.flush()
-	}
-	return nil
-}
-
-func (b *tableCompactionBuilder) revert() error {
-	for _, at := range b.rec.addedTables {
-		b.s.logf("table@build revert @%d", at.num)
-		f := b.s.getTableFile(at.num)
-		if err := f.Remove(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (db *DB) tableCompaction(c *compaction, noTrivial bool) {
-	defer c.release()
-
-	rec := &sessionRecord{}
-	rec.addCompPtr(c.level, c.imax)
-
-	if !noTrivial && c.trivial() {
-		t := c.tables[0][0]
-		db.logf("table@move L%d@%d -> L%d", c.level, t.file.Num(), c.level+1)
-		rec.delTable(c.level, t.file.Num())
-		rec.addTableFile(c.level+1, t)
-		db.compactionTransactFunc("table@move", func(cnt *compactionTransactCounter) (err error) {
-			return db.s.commit(rec)
-		}, nil)
-		return
-	}
-
-	var stats [2]cStatsStaging
-	for i, tables := range c.tables {
-		for _, t := range tables {
-			stats[i].read += t.size
-			// Insert deleted tables into record
-			rec.delTable(c.level+i, t.file.Num())
-		}
-	}
-	sourceSize := int(stats[0].read + stats[1].read)
-	minSeq := db.minSeq()
-	db.logf("table@compaction L%d·%d -> L%d·%d S·%s Q·%d", c.level, len(c.tables[0]), c.level+1, len(c.tables[1]), shortenb(sourceSize), minSeq)
-
-	b := &tableCompactionBuilder{
-		db:        db,
-		s:         db.s,
-		c:         c,
-		rec:       rec,
-		stat1:     &stats[1],
-		minSeq:    minSeq,
-		strict:    db.s.o.GetStrict(opt.StrictCompaction),
-		tableSize: db.s.o.GetCompactionTableSize(c.level + 1),
-	}
-	db.compactionTransact("table@build", b)
-
-	// Commit changes
-	db.compactionTransactFunc("table@commit", func(cnt *compactionTransactCounter) (err error) {
-		stats[1].startTimer()
-		defer stats[1].stopTimer()
-		return db.s.commit(rec)
-	}, nil)
-
-	resultSize := int(stats[1].write)
-	db.logf("table@compaction committed F%s S%s Ke·%d D·%d T·%v", sint(len(rec.addedTables)-len(rec.deletedTables)), sshortenb(resultSize-sourceSize), b.kerrCnt, b.dropCnt, stats[1].duration)
-
-	// Save compaction stats
-	for i := range stats {
-		db.compStats[c.level+1].add(&stats[i])
-	}
-}
-
-func (db *DB) tableRangeCompaction(level int, umin, umax []byte) {
-	db.logf("table@compaction range L%d %q:%q", level, umin, umax)
-
-	if level >= 0 {
-		if c := db.s.getCompactionRange(level, umin, umax); c != nil {
-			db.tableCompaction(c, true)
-		}
-	} else {
-		v := db.s.version()
-		m := 1
-		for i, t := range v.tables[1:] {
-			if t.overlaps(db.s.icmp, umin, umax, false) {
-				m = i + 1
-			}
-		}
-		v.release()
-
-		for level := 0; level < m; level++ {
-			if c := db.s.getCompactionRange(level, umin, umax); c != nil {
-				db.tableCompaction(c, true)
-			}
-		}
-	}
-}
-
-func (db *DB) tableAutoCompaction() {
-	if c := db.s.pickCompaction(); c != nil {
-		db.tableCompaction(c, false)
-	}
-}
-
-func (db *DB) tableNeedCompaction() bool {
-	v := db.s.version()
-	defer v.release()
-	return v.needCompaction()
-}
-
-func (db *DB) pauseCompaction(ch chan<- struct{}) {
-	select {
-	case ch <- struct{}{}:
-	case _, _ = <-db.closeC:
-		db.compactionExitTransact()
-	}
-}
-
-type cCmd interface {
-	ack(err error)
-}
-
-type cIdle struct {
-	ackC chan<- error
-}
-
-func (r cIdle) ack(err error) {
-	if r.ackC != nil {
-		defer func() {
-			recover()
-		}()
-		r.ackC <- err
-	}
-}
-
-type cRange struct {
-	level    int
-	min, max []byte
-	ackC     chan<- error
-}
-
-func (r cRange) ack(err error) {
-	if r.ackC != nil {
-		defer func() {
-			recover()
-		}()
-		r.ackC <- err
-	}
-}
-
-// This will trigger auto compation and/or wait for all compaction to be done.
-func (db *DB) compSendIdle(compC chan<- cCmd) (err error) {
-	ch := make(chan error)
-	defer close(ch)
-	// Send cmd.
-	select {
-	case compC <- cIdle{ch}:
-	case err = <-db.compErrC:
-		return
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-	// Wait cmd.
-	select {
-	case err = <-ch:
-	case err = <-db.compErrC:
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-	return err
-}
-
-// This will trigger auto compaction but will not wait for it.
-func (db *DB) compSendTrigger(compC chan<- cCmd) {
-	select {
-	case compC <- cIdle{}:
-	default:
-	}
-}
-
-// Send range compaction request.
-func (db *DB) compSendRange(compC chan<- cCmd, level int, min, max []byte) (err error) {
-	ch := make(chan error)
-	defer close(ch)
-	// Send cmd.
-	select {
-	case compC <- cRange{level, min, max, ch}:
-	case err := <-db.compErrC:
-		return err
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-	// Wait cmd.
-	select {
-	case err = <-ch:
-	case err = <-db.compErrC:
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-	return err
-}
-
-func (db *DB) mCompaction() {
-	var x cCmd
-
-	defer func() {
-		if x := recover(); x != nil {
-			if x != errCompactionTransactExiting {
-				panic(x)
-			}
-		}
-		if x != nil {
-			x.ack(ErrClosed)
-		}
-		db.closeW.Done()
-	}()
-
-	for {
-		select {
-		case x = <-db.mcompCmdC:
-			switch x.(type) {
-			case cIdle:
-				db.memCompaction()
-				x.ack(nil)
-				x = nil
-			default:
-				panic("leveldb: unknown command")
-			}
-		case _, _ = <-db.closeC:
-			return
-		}
-	}
-}
-
-func (db *DB) tCompaction() {
-	var x cCmd
-	var ackQ []cCmd
-
-	defer func() {
-		if x := recover(); x != nil {
-			if x != errCompactionTransactExiting {
-				panic(x)
-			}
-		}
-		for i := range ackQ {
-			ackQ[i].ack(ErrClosed)
-			ackQ[i] = nil
-		}
-		if x != nil {
-			x.ack(ErrClosed)
-		}
-		db.closeW.Done()
-	}()
-
-	for {
-		if db.tableNeedCompaction() {
-			select {
-			case x = <-db.tcompCmdC:
-			case ch := <-db.tcompPauseC:
-				db.pauseCompaction(ch)
-				continue
-			case _, _ = <-db.closeC:
-				return
-			default:
-			}
-		} else {
-			for i := range ackQ {
-				ackQ[i].ack(nil)
-				ackQ[i] = nil
-			}
-			ackQ = ackQ[:0]
-			select {
-			case x = <-db.tcompCmdC:
-			case ch := <-db.tcompPauseC:
-				db.pauseCompaction(ch)
-				continue
-			case _, _ = <-db.closeC:
-				return
-			}
-		}
-		if x != nil {
-			switch cmd := x.(type) {
-			case cIdle:
-				ackQ = append(ackQ, x)
-			case cRange:
-				db.tableRangeCompaction(cmd.level, cmd.min, cmd.max)
-				x.ack(nil)
-			default:
-				panic("leveldb: unknown command")
-			}
-			x = nil
-		}
-		db.tableAutoCompaction()
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_iter.go
deleted file mode 100644
index 656ae9856..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_iter.go
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"errors"
-	"math/rand"
-	"runtime"
-	"sync"
-	"sync/atomic"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	errInvalidIkey = errors.New("leveldb: Iterator: invalid internal key")
-)
-
-type memdbReleaser struct {
-	once sync.Once
-	m    *memDB
-}
-
-func (mr *memdbReleaser) Release() {
-	mr.once.Do(func() {
-		mr.m.decref()
-	})
-}
-
-func (db *DB) newRawIterator(slice *util.Range, ro *opt.ReadOptions) iterator.Iterator {
-	em, fm := db.getMems()
-	v := db.s.version()
-
-	ti := v.getIterators(slice, ro)
-	n := len(ti) + 2
-	i := make([]iterator.Iterator, 0, n)
-	emi := em.NewIterator(slice)
-	emi.SetReleaser(&memdbReleaser{m: em})
-	i = append(i, emi)
-	if fm != nil {
-		fmi := fm.NewIterator(slice)
-		fmi.SetReleaser(&memdbReleaser{m: fm})
-		i = append(i, fmi)
-	}
-	i = append(i, ti...)
-	strict := opt.GetStrict(db.s.o.Options, ro, opt.StrictReader)
-	mi := iterator.NewMergedIterator(i, db.s.icmp, strict)
-	mi.SetReleaser(&versionReleaser{v: v})
-	return mi
-}
-
-func (db *DB) newIterator(seq uint64, slice *util.Range, ro *opt.ReadOptions) *dbIter {
-	var islice *util.Range
-	if slice != nil {
-		islice = &util.Range{}
-		if slice.Start != nil {
-			islice.Start = newIkey(slice.Start, kMaxSeq, ktSeek)
-		}
-		if slice.Limit != nil {
-			islice.Limit = newIkey(slice.Limit, kMaxSeq, ktSeek)
-		}
-	}
-	rawIter := db.newRawIterator(islice, ro)
-	iter := &dbIter{
-		db:     db,
-		icmp:   db.s.icmp,
-		iter:   rawIter,
-		seq:    seq,
-		strict: opt.GetStrict(db.s.o.Options, ro, opt.StrictReader),
-		key:    make([]byte, 0),
-		value:  make([]byte, 0),
-	}
-	atomic.AddInt32(&db.aliveIters, 1)
-	runtime.SetFinalizer(iter, (*dbIter).Release)
-	return iter
-}
-
-func (db *DB) iterSamplingRate() int {
-	return rand.Intn(2 * db.s.o.GetIteratorSamplingRate())
-}
-
-type dir int
-
-const (
-	dirReleased dir = iota - 1
-	dirSOI
-	dirEOI
-	dirBackward
-	dirForward
-)
-
-// dbIter represent an interator states over a database session.
-type dbIter struct {
-	db     *DB
-	icmp   *iComparer
-	iter   iterator.Iterator
-	seq    uint64
-	strict bool
-
-	smaplingGap int
-	dir         dir
-	key         []byte
-	value       []byte
-	err         error
-	releaser    util.Releaser
-}
-
-func (i *dbIter) sampleSeek() {
-	ikey := i.iter.Key()
-	i.smaplingGap -= len(ikey) + len(i.iter.Value())
-	for i.smaplingGap < 0 {
-		i.smaplingGap += i.db.iterSamplingRate()
-		i.db.sampleSeek(ikey)
-	}
-}
-
-func (i *dbIter) setErr(err error) {
-	i.err = err
-	i.key = nil
-	i.value = nil
-}
-
-func (i *dbIter) iterErr() {
-	if err := i.iter.Error(); err != nil {
-		i.setErr(err)
-	}
-}
-
-func (i *dbIter) Valid() bool {
-	return i.err == nil && i.dir > dirEOI
-}
-
-func (i *dbIter) First() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.iter.First() {
-		i.dir = dirSOI
-		return i.next()
-	}
-	i.dir = dirEOI
-	i.iterErr()
-	return false
-}
-
-func (i *dbIter) Last() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.iter.Last() {
-		return i.prev()
-	}
-	i.dir = dirSOI
-	i.iterErr()
-	return false
-}
-
-func (i *dbIter) Seek(key []byte) bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	ikey := newIkey(key, i.seq, ktSeek)
-	if i.iter.Seek(ikey) {
-		i.dir = dirSOI
-		return i.next()
-	}
-	i.dir = dirEOI
-	i.iterErr()
-	return false
-}
-
-func (i *dbIter) next() bool {
-	for {
-		if ukey, seq, kt, kerr := parseIkey(i.iter.Key()); kerr == nil {
-			i.sampleSeek()
-			if seq <= i.seq {
-				switch kt {
-				case ktDel:
-					// Skip deleted key.
-					i.key = append(i.key[:0], ukey...)
-					i.dir = dirForward
-				case ktVal:
-					if i.dir == dirSOI || i.icmp.uCompare(ukey, i.key) > 0 {
-						i.key = append(i.key[:0], ukey...)
-						i.value = append(i.value[:0], i.iter.Value()...)
-						i.dir = dirForward
-						return true
-					}
-				}
-			}
-		} else if i.strict {
-			i.setErr(kerr)
-			break
-		}
-		if !i.iter.Next() {
-			i.dir = dirEOI
-			i.iterErr()
-			break
-		}
-	}
-	return false
-}
-
-func (i *dbIter) Next() bool {
-	if i.dir == dirEOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if !i.iter.Next() || (i.dir == dirBackward && !i.iter.Next()) {
-		i.dir = dirEOI
-		i.iterErr()
-		return false
-	}
-	return i.next()
-}
-
-func (i *dbIter) prev() bool {
-	i.dir = dirBackward
-	del := true
-	if i.iter.Valid() {
-		for {
-			if ukey, seq, kt, kerr := parseIkey(i.iter.Key()); kerr == nil {
-				i.sampleSeek()
-				if seq <= i.seq {
-					if !del && i.icmp.uCompare(ukey, i.key) < 0 {
-						return true
-					}
-					del = (kt == ktDel)
-					if !del {
-						i.key = append(i.key[:0], ukey...)
-						i.value = append(i.value[:0], i.iter.Value()...)
-					}
-				}
-			} else if i.strict {
-				i.setErr(kerr)
-				return false
-			}
-			if !i.iter.Prev() {
-				break
-			}
-		}
-	}
-	if del {
-		i.dir = dirSOI
-		i.iterErr()
-		return false
-	}
-	return true
-}
-
-func (i *dbIter) Prev() bool {
-	if i.dir == dirSOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	switch i.dir {
-	case dirEOI:
-		return i.Last()
-	case dirForward:
-		for i.iter.Prev() {
-			if ukey, _, _, kerr := parseIkey(i.iter.Key()); kerr == nil {
-				i.sampleSeek()
-				if i.icmp.uCompare(ukey, i.key) < 0 {
-					goto cont
-				}
-			} else if i.strict {
-				i.setErr(kerr)
-				return false
-			}
-		}
-		i.dir = dirSOI
-		i.iterErr()
-		return false
-	}
-
-cont:
-	return i.prev()
-}
-
-func (i *dbIter) Key() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.key
-}
-
-func (i *dbIter) Value() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.value
-}
-
-func (i *dbIter) Release() {
-	if i.dir != dirReleased {
-		// Clear the finalizer.
-		runtime.SetFinalizer(i, nil)
-
-		if i.releaser != nil {
-			i.releaser.Release()
-			i.releaser = nil
-		}
-
-		i.dir = dirReleased
-		i.key = nil
-		i.value = nil
-		i.iter.Release()
-		i.iter = nil
-		atomic.AddInt32(&i.db.aliveIters, -1)
-		i.db = nil
-	}
-}
-
-func (i *dbIter) SetReleaser(releaser util.Releaser) {
-	if i.dir == dirReleased {
-		panic(util.ErrReleased)
-	}
-	if i.releaser != nil && releaser != nil {
-		panic(util.ErrHasReleaser)
-	}
-	i.releaser = releaser
-}
-
-func (i *dbIter) Error() error {
-	return i.err
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
deleted file mode 100644
index 0372848ff..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_snapshot.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"container/list"
-	"fmt"
-	"runtime"
-	"sync"
-	"sync/atomic"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type snapshotElement struct {
-	seq uint64
-	ref int
-	e   *list.Element
-}
-
-// Acquires a snapshot, based on latest sequence.
-func (db *DB) acquireSnapshot() *snapshotElement {
-	db.snapsMu.Lock()
-	defer db.snapsMu.Unlock()
-
-	seq := db.getSeq()
-
-	if e := db.snapsList.Back(); e != nil {
-		se := e.Value.(*snapshotElement)
-		if se.seq == seq {
-			se.ref++
-			return se
-		} else if seq < se.seq {
-			panic("leveldb: sequence number is not increasing")
-		}
-	}
-	se := &snapshotElement{seq: seq, ref: 1}
-	se.e = db.snapsList.PushBack(se)
-	return se
-}
-
-// Releases given snapshot element.
-func (db *DB) releaseSnapshot(se *snapshotElement) {
-	db.snapsMu.Lock()
-	defer db.snapsMu.Unlock()
-
-	se.ref--
-	if se.ref == 0 {
-		db.snapsList.Remove(se.e)
-		se.e = nil
-	} else if se.ref < 0 {
-		panic("leveldb: Snapshot: negative element reference")
-	}
-}
-
-// Gets minimum sequence that not being snapshoted.
-func (db *DB) minSeq() uint64 {
-	db.snapsMu.Lock()
-	defer db.snapsMu.Unlock()
-
-	if e := db.snapsList.Front(); e != nil {
-		return e.Value.(*snapshotElement).seq
-	}
-
-	return db.getSeq()
-}
-
-// Snapshot is a DB snapshot.
-type Snapshot struct {
-	db       *DB
-	elem     *snapshotElement
-	mu       sync.RWMutex
-	released bool
-}
-
-// Creates new snapshot object.
-func (db *DB) newSnapshot() *Snapshot {
-	snap := &Snapshot{
-		db:   db,
-		elem: db.acquireSnapshot(),
-	}
-	atomic.AddInt32(&db.aliveSnaps, 1)
-	runtime.SetFinalizer(snap, (*Snapshot).Release)
-	return snap
-}
-
-func (snap *Snapshot) String() string {
-	return fmt.Sprintf("leveldb.Snapshot{%d}", snap.elem.seq)
-}
-
-// Get gets the value for the given key. It returns ErrNotFound if
-// the DB does not contains the key.
-//
-// The caller should not modify the contents of the returned slice, but
-// it is safe to modify the contents of the argument after Get returns.
-func (snap *Snapshot) Get(key []byte, ro *opt.ReadOptions) (value []byte, err error) {
-	err = snap.db.ok()
-	if err != nil {
-		return
-	}
-	snap.mu.RLock()
-	defer snap.mu.RUnlock()
-	if snap.released {
-		err = ErrSnapshotReleased
-		return
-	}
-	return snap.db.get(key, snap.elem.seq, ro)
-}
-
-// Has returns true if the DB does contains the given key.
-//
-// It is safe to modify the contents of the argument after Get returns.
-func (snap *Snapshot) Has(key []byte, ro *opt.ReadOptions) (ret bool, err error) {
-	err = snap.db.ok()
-	if err != nil {
-		return
-	}
-	snap.mu.RLock()
-	defer snap.mu.RUnlock()
-	if snap.released {
-		err = ErrSnapshotReleased
-		return
-	}
-	return snap.db.has(key, snap.elem.seq, ro)
-}
-
-// NewIterator returns an iterator for the snapshot of the uderlying DB.
-// The returned iterator is not goroutine-safe, but it is safe to use
-// multiple iterators concurrently, with each in a dedicated goroutine.
-// It is also safe to use an iterator concurrently with modifying its
-// underlying DB. The resultant key/value pairs are guaranteed to be
-// consistent.
-//
-// Slice allows slicing the iterator to only contains keys in the given
-// range. A nil Range.Start is treated as a key before all keys in the
-// DB. And a nil Range.Limit is treated as a key after all keys in
-// the DB.
-//
-// The iterator must be released after use, by calling Release method.
-// Releasing the snapshot doesn't mean releasing the iterator too, the
-// iterator would be still valid until released.
-//
-// Also read Iterator documentation of the leveldb/iterator package.
-func (snap *Snapshot) NewIterator(slice *util.Range, ro *opt.ReadOptions) iterator.Iterator {
-	if err := snap.db.ok(); err != nil {
-		return iterator.NewEmptyIterator(err)
-	}
-	snap.mu.Lock()
-	defer snap.mu.Unlock()
-	if snap.released {
-		return iterator.NewEmptyIterator(ErrSnapshotReleased)
-	}
-	// Since iterator already hold version ref, it doesn't need to
-	// hold snapshot ref.
-	return snap.db.newIterator(snap.elem.seq, slice, ro)
-}
-
-// Release releases the snapshot. This will not release any returned
-// iterators, the iterators would still be valid until released or the
-// underlying DB is closed.
-//
-// Other methods should not be called after the snapshot has been released.
-func (snap *Snapshot) Release() {
-	snap.mu.Lock()
-	defer snap.mu.Unlock()
-
-	if !snap.released {
-		// Clear the finalizer.
-		runtime.SetFinalizer(snap, nil)
-
-		snap.released = true
-		snap.db.releaseSnapshot(snap.elem)
-		atomic.AddInt32(&snap.db.aliveSnaps, -1)
-		snap.db = nil
-		snap.elem = nil
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_state.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_state.go
deleted file mode 100644
index 24671dd39..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_state.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"sync/atomic"
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb/journal"
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-)
-
-type memDB struct {
-	db *DB
-	*memdb.DB
-	ref int32
-}
-
-func (m *memDB) incref() {
-	atomic.AddInt32(&m.ref, 1)
-}
-
-func (m *memDB) decref() {
-	if ref := atomic.AddInt32(&m.ref, -1); ref == 0 {
-		// Only put back memdb with std capacity.
-		if m.Capacity() == m.db.s.o.GetWriteBuffer() {
-			m.Reset()
-			m.db.mpoolPut(m.DB)
-		}
-		m.db = nil
-		m.DB = nil
-	} else if ref < 0 {
-		panic("negative memdb ref")
-	}
-}
-
-// Get latest sequence number.
-func (db *DB) getSeq() uint64 {
-	return atomic.LoadUint64(&db.seq)
-}
-
-// Atomically adds delta to seq.
-func (db *DB) addSeq(delta uint64) {
-	atomic.AddUint64(&db.seq, delta)
-}
-
-func (db *DB) sampleSeek(ikey iKey) {
-	v := db.s.version()
-	if v.sampleSeek(ikey) {
-		// Trigger table compaction.
-		db.compSendTrigger(db.tcompCmdC)
-	}
-	v.release()
-}
-
-func (db *DB) mpoolPut(mem *memdb.DB) {
-	defer func() {
-		recover()
-	}()
-	select {
-	case db.memPool <- mem:
-	default:
-	}
-}
-
-func (db *DB) mpoolGet() *memdb.DB {
-	select {
-	case mem := <-db.memPool:
-		return mem
-	default:
-		return nil
-	}
-}
-
-func (db *DB) mpoolDrain() {
-	ticker := time.NewTicker(30 * time.Second)
-	for {
-		select {
-		case <-ticker.C:
-			select {
-			case <-db.memPool:
-			default:
-			}
-		case _, _ = <-db.closeC:
-			close(db.memPool)
-			return
-		}
-	}
-}
-
-// Create new memdb and froze the old one; need external synchronization.
-// newMem only called synchronously by the writer.
-func (db *DB) newMem(n int) (mem *memDB, err error) {
-	num := db.s.allocFileNum()
-	file := db.s.getJournalFile(num)
-	w, err := file.Create()
-	if err != nil {
-		db.s.reuseFileNum(num)
-		return
-	}
-
-	db.memMu.Lock()
-	defer db.memMu.Unlock()
-
-	if db.frozenMem != nil {
-		panic("still has frozen mem")
-	}
-
-	if db.journal == nil {
-		db.journal = journal.NewWriter(w)
-	} else {
-		db.journal.Reset(w)
-		db.journalWriter.Close()
-		db.frozenJournalFile = db.journalFile
-	}
-	db.journalWriter = w
-	db.journalFile = file
-	db.frozenMem = db.mem
-	mdb := db.mpoolGet()
-	if mdb == nil || mdb.Capacity() < n {
-		mdb = memdb.New(db.s.icmp, maxInt(db.s.o.GetWriteBuffer(), n))
-	}
-	mem = &memDB{
-		db:  db,
-		DB:  mdb,
-		ref: 2,
-	}
-	db.mem = mem
-	// The seq only incremented by the writer. And whoever called newMem
-	// should hold write lock, so no need additional synchronization here.
-	db.frozenSeq = db.seq
-	return
-}
-
-// Get all memdbs.
-func (db *DB) getMems() (e, f *memDB) {
-	db.memMu.RLock()
-	defer db.memMu.RUnlock()
-	if db.mem == nil {
-		panic("nil effective mem")
-	}
-	db.mem.incref()
-	if db.frozenMem != nil {
-		db.frozenMem.incref()
-	}
-	return db.mem, db.frozenMem
-}
-
-// Get frozen memdb.
-func (db *DB) getEffectiveMem() *memDB {
-	db.memMu.RLock()
-	defer db.memMu.RUnlock()
-	if db.mem == nil {
-		panic("nil effective mem")
-	}
-	db.mem.incref()
-	return db.mem
-}
-
-// Check whether we has frozen memdb.
-func (db *DB) hasFrozenMem() bool {
-	db.memMu.RLock()
-	defer db.memMu.RUnlock()
-	return db.frozenMem != nil
-}
-
-// Get frozen memdb.
-func (db *DB) getFrozenMem() *memDB {
-	db.memMu.RLock()
-	defer db.memMu.RUnlock()
-	if db.frozenMem != nil {
-		db.frozenMem.incref()
-	}
-	return db.frozenMem
-}
-
-// Drop frozen memdb; assume that frozen memdb isn't nil.
-func (db *DB) dropFrozenMem() {
-	db.memMu.Lock()
-	if err := db.frozenJournalFile.Remove(); err != nil {
-		db.logf("journal@remove removing @%d %q", db.frozenJournalFile.Num(), err)
-	} else {
-		db.logf("journal@remove removed @%d", db.frozenJournalFile.Num())
-	}
-	db.frozenJournalFile = nil
-	db.frozenMem.decref()
-	db.frozenMem = nil
-	db.memMu.Unlock()
-}
-
-// Set closed flag; return true if not already closed.
-func (db *DB) setClosed() bool {
-	return atomic.CompareAndSwapUint32(&db.closed, 0, 1)
-}
-
-// Check whether DB was closed.
-func (db *DB) isClosed() bool {
-	return atomic.LoadUint32(&db.closed) != 0
-}
-
-// Check read ok status.
-func (db *DB) ok() error {
-	if db.isClosed() {
-		return ErrClosed
-	}
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_test.go
deleted file mode 100644
index 9d91ebf1a..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_test.go
+++ /dev/null
@@ -1,2701 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"container/list"
-	crand "crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-	"unsafe"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func tkey(i int) []byte {
-	return []byte(fmt.Sprintf("%016d", i))
-}
-
-func tval(seed, n int) []byte {
-	r := rand.New(rand.NewSource(int64(seed)))
-	return randomString(r, n)
-}
-
-type dbHarness struct {
-	t *testing.T
-
-	stor *testStorage
-	db   *DB
-	o    *opt.Options
-	ro   *opt.ReadOptions
-	wo   *opt.WriteOptions
-}
-
-func newDbHarnessWopt(t *testing.T, o *opt.Options) *dbHarness {
-	h := new(dbHarness)
-	h.init(t, o)
-	return h
-}
-
-func newDbHarness(t *testing.T) *dbHarness {
-	return newDbHarnessWopt(t, &opt.Options{})
-}
-
-func (h *dbHarness) init(t *testing.T, o *opt.Options) {
-	h.t = t
-	h.stor = newTestStorage(t)
-	h.o = o
-	h.ro = nil
-	h.wo = nil
-
-	if err := h.openDB0(); err != nil {
-		// So that it will come after fatal message.
-		defer h.stor.Close()
-		h.t.Fatal("Open (init): got error: ", err)
-	}
-}
-
-func (h *dbHarness) openDB0() (err error) {
-	h.t.Log("opening DB")
-	h.db, err = Open(h.stor, h.o)
-	return
-}
-
-func (h *dbHarness) openDB() {
-	if err := h.openDB0(); err != nil {
-		h.t.Fatal("Open: got error: ", err)
-	}
-}
-
-func (h *dbHarness) closeDB0() error {
-	h.t.Log("closing DB")
-	return h.db.Close()
-}
-
-func (h *dbHarness) closeDB() {
-	if err := h.closeDB0(); err != nil {
-		h.t.Error("Close: got error: ", err)
-	}
-	h.stor.CloseCheck()
-	runtime.GC()
-}
-
-func (h *dbHarness) reopenDB() {
-	h.closeDB()
-	h.openDB()
-}
-
-func (h *dbHarness) close() {
-	h.closeDB0()
-	h.db = nil
-	h.stor.Close()
-	h.stor = nil
-	runtime.GC()
-}
-
-func (h *dbHarness) openAssert(want bool) {
-	db, err := Open(h.stor, h.o)
-	if err != nil {
-		if want {
-			h.t.Error("Open: assert: got error: ", err)
-		} else {
-			h.t.Log("Open: assert: got error (expected): ", err)
-		}
-	} else {
-		if !want {
-			h.t.Error("Open: assert: expect error")
-		}
-		db.Close()
-	}
-}
-
-func (h *dbHarness) write(batch *Batch) {
-	if err := h.db.Write(batch, h.wo); err != nil {
-		h.t.Error("Write: got error: ", err)
-	}
-}
-
-func (h *dbHarness) put(key, value string) {
-	if err := h.db.Put([]byte(key), []byte(value), h.wo); err != nil {
-		h.t.Error("Put: got error: ", err)
-	}
-}
-
-func (h *dbHarness) putMulti(n int, low, hi string) {
-	for i := 0; i < n; i++ {
-		h.put(low, "begin")
-		h.put(hi, "end")
-		h.compactMem()
-	}
-}
-
-func (h *dbHarness) maxNextLevelOverlappingBytes(want uint64) {
-	t := h.t
-	db := h.db
-
-	var (
-		maxOverlaps uint64
-		maxLevel    int
-	)
-	v := db.s.version()
-	for i, tt := range v.tables[1 : len(v.tables)-1] {
-		level := i + 1
-		next := v.tables[level+1]
-		for _, t := range tt {
-			r := next.getOverlaps(nil, db.s.icmp, t.imin.ukey(), t.imax.ukey(), false)
-			sum := r.size()
-			if sum > maxOverlaps {
-				maxOverlaps = sum
-				maxLevel = level
-			}
-		}
-	}
-	v.release()
-
-	if maxOverlaps > want {
-		t.Errorf("next level most overlapping bytes is more than %d, got=%d level=%d", want, maxOverlaps, maxLevel)
-	} else {
-		t.Logf("next level most overlapping bytes is %d, level=%d want=%d", maxOverlaps, maxLevel, want)
-	}
-}
-
-func (h *dbHarness) delete(key string) {
-	t := h.t
-	db := h.db
-
-	err := db.Delete([]byte(key), h.wo)
-	if err != nil {
-		t.Error("Delete: got error: ", err)
-	}
-}
-
-func (h *dbHarness) assertNumKeys(want int) {
-	iter := h.db.NewIterator(nil, h.ro)
-	defer iter.Release()
-	got := 0
-	for iter.Next() {
-		got++
-	}
-	if err := iter.Error(); err != nil {
-		h.t.Error("assertNumKeys: ", err)
-	}
-	if want != got {
-		h.t.Errorf("assertNumKeys: want=%d got=%d", want, got)
-	}
-}
-
-func (h *dbHarness) getr(db Reader, key string, expectFound bool) (found bool, v []byte) {
-	t := h.t
-	v, err := db.Get([]byte(key), h.ro)
-	switch err {
-	case ErrNotFound:
-		if expectFound {
-			t.Errorf("Get: key '%s' not found, want found", key)
-		}
-	case nil:
-		found = true
-		if !expectFound {
-			t.Errorf("Get: key '%s' found, want not found", key)
-		}
-	default:
-		t.Error("Get: got error: ", err)
-	}
-	return
-}
-
-func (h *dbHarness) get(key string, expectFound bool) (found bool, v []byte) {
-	return h.getr(h.db, key, expectFound)
-}
-
-func (h *dbHarness) getValr(db Reader, key, value string) {
-	t := h.t
-	found, r := h.getr(db, key, true)
-	if !found {
-		return
-	}
-	rval := string(r)
-	if rval != value {
-		t.Errorf("Get: invalid value, got '%s', want '%s'", rval, value)
-	}
-}
-
-func (h *dbHarness) getVal(key, value string) {
-	h.getValr(h.db, key, value)
-}
-
-func (h *dbHarness) allEntriesFor(key, want string) {
-	t := h.t
-	db := h.db
-	s := db.s
-
-	ikey := newIkey([]byte(key), kMaxSeq, ktVal)
-	iter := db.newRawIterator(nil, nil)
-	if !iter.Seek(ikey) && iter.Error() != nil {
-		t.Error("AllEntries: error during seek, err: ", iter.Error())
-		return
-	}
-	res := "[ "
-	first := true
-	for iter.Valid() {
-		if ukey, _, kt, kerr := parseIkey(iter.Key()); kerr == nil {
-			if s.icmp.uCompare(ikey.ukey(), ukey) != 0 {
-				break
-			}
-			if !first {
-				res += ", "
-			}
-			first = false
-			switch kt {
-			case ktVal:
-				res += string(iter.Value())
-			case ktDel:
-				res += "DEL"
-			}
-		} else {
-			if !first {
-				res += ", "
-			}
-			first = false
-			res += "CORRUPTED"
-		}
-		iter.Next()
-	}
-	if !first {
-		res += " "
-	}
-	res += "]"
-	if res != want {
-		t.Errorf("AllEntries: assert failed for key %q, got=%q want=%q", key, res, want)
-	}
-}
-
-// Return a string that contains all key,value pairs in order,
-// formatted like "(k1->v1)(k2->v2)".
-func (h *dbHarness) getKeyVal(want string) {
-	t := h.t
-	db := h.db
-
-	s, err := db.GetSnapshot()
-	if err != nil {
-		t.Fatal("GetSnapshot: got error: ", err)
-	}
-	res := ""
-	iter := s.NewIterator(nil, nil)
-	for iter.Next() {
-		res += fmt.Sprintf("(%s->%s)", string(iter.Key()), string(iter.Value()))
-	}
-	iter.Release()
-
-	if res != want {
-		t.Errorf("GetKeyVal: invalid key/value pair, got=%q want=%q", res, want)
-	}
-	s.Release()
-}
-
-func (h *dbHarness) waitCompaction() {
-	t := h.t
-	db := h.db
-	if err := db.compSendIdle(db.tcompCmdC); err != nil {
-		t.Error("compaction error: ", err)
-	}
-}
-
-func (h *dbHarness) waitMemCompaction() {
-	t := h.t
-	db := h.db
-
-	if err := db.compSendIdle(db.mcompCmdC); err != nil {
-		t.Error("compaction error: ", err)
-	}
-}
-
-func (h *dbHarness) compactMem() {
-	t := h.t
-	db := h.db
-
-	t.Log("starting memdb compaction")
-
-	db.writeLockC <- struct{}{}
-	defer func() {
-		<-db.writeLockC
-	}()
-
-	if _, err := db.rotateMem(0); err != nil {
-		t.Error("compaction error: ", err)
-	}
-	if err := db.compSendIdle(db.mcompCmdC); err != nil {
-		t.Error("compaction error: ", err)
-	}
-
-	if h.totalTables() == 0 {
-		t.Error("zero tables after mem compaction")
-	}
-
-	t.Log("memdb compaction done")
-}
-
-func (h *dbHarness) compactRangeAtErr(level int, min, max string, wanterr bool) {
-	t := h.t
-	db := h.db
-
-	var _min, _max []byte
-	if min != "" {
-		_min = []byte(min)
-	}
-	if max != "" {
-		_max = []byte(max)
-	}
-
-	t.Logf("starting table range compaction: level=%d, min=%q, max=%q", level, min, max)
-
-	if err := db.compSendRange(db.tcompCmdC, level, _min, _max); err != nil {
-		if wanterr {
-			t.Log("CompactRangeAt: got error (expected): ", err)
-		} else {
-			t.Error("CompactRangeAt: got error: ", err)
-		}
-	} else if wanterr {
-		t.Error("CompactRangeAt: expect error")
-	}
-
-	t.Log("table range compaction done")
-}
-
-func (h *dbHarness) compactRangeAt(level int, min, max string) {
-	h.compactRangeAtErr(level, min, max, false)
-}
-
-func (h *dbHarness) compactRange(min, max string) {
-	t := h.t
-	db := h.db
-
-	t.Logf("starting DB range compaction: min=%q, max=%q", min, max)
-
-	var r util.Range
-	if min != "" {
-		r.Start = []byte(min)
-	}
-	if max != "" {
-		r.Limit = []byte(max)
-	}
-	if err := db.CompactRange(r); err != nil {
-		t.Error("CompactRange: got error: ", err)
-	}
-
-	t.Log("DB range compaction done")
-}
-
-func (h *dbHarness) sizeOf(start, limit string) uint64 {
-	sz, err := h.db.SizeOf([]util.Range{
-		{[]byte(start), []byte(limit)},
-	})
-	if err != nil {
-		h.t.Error("SizeOf: got error: ", err)
-	}
-	return sz.Sum()
-}
-
-func (h *dbHarness) sizeAssert(start, limit string, low, hi uint64) {
-	sz := h.sizeOf(start, limit)
-	if sz < low || sz > hi {
-		h.t.Errorf("sizeOf %q to %q not in range, want %d - %d, got %d",
-			shorten(start), shorten(limit), low, hi, sz)
-	}
-}
-
-func (h *dbHarness) getSnapshot() (s *Snapshot) {
-	s, err := h.db.GetSnapshot()
-	if err != nil {
-		h.t.Fatal("GetSnapshot: got error: ", err)
-	}
-	return
-}
-func (h *dbHarness) tablesPerLevel(want string) {
-	res := ""
-	nz := 0
-	v := h.db.s.version()
-	for level, tt := range v.tables {
-		if level > 0 {
-			res += ","
-		}
-		res += fmt.Sprint(len(tt))
-		if len(tt) > 0 {
-			nz = len(res)
-		}
-	}
-	v.release()
-	res = res[:nz]
-	if res != want {
-		h.t.Errorf("invalid tables len, want=%s, got=%s", want, res)
-	}
-}
-
-func (h *dbHarness) totalTables() (n int) {
-	v := h.db.s.version()
-	for _, tt := range v.tables {
-		n += len(tt)
-	}
-	v.release()
-	return
-}
-
-type keyValue interface {
-	Key() []byte
-	Value() []byte
-}
-
-func testKeyVal(t *testing.T, kv keyValue, want string) {
-	res := string(kv.Key()) + "->" + string(kv.Value())
-	if res != want {
-		t.Errorf("invalid key/value, want=%q, got=%q", want, res)
-	}
-}
-
-func numKey(num int) string {
-	return fmt.Sprintf("key%06d", num)
-}
-
-var _bloom_filter = filter.NewBloomFilter(10)
-
-func truno(t *testing.T, o *opt.Options, f func(h *dbHarness)) {
-	for i := 0; i < 4; i++ {
-		func() {
-			switch i {
-			case 0:
-			case 1:
-				if o == nil {
-					o = &opt.Options{Filter: _bloom_filter}
-				} else {
-					old := o
-					o = &opt.Options{}
-					*o = *old
-					o.Filter = _bloom_filter
-				}
-			case 2:
-				if o == nil {
-					o = &opt.Options{Compression: opt.NoCompression}
-				} else {
-					old := o
-					o = &opt.Options{}
-					*o = *old
-					o.Compression = opt.NoCompression
-				}
-			}
-			h := newDbHarnessWopt(t, o)
-			defer h.close()
-			switch i {
-			case 3:
-				h.reopenDB()
-			}
-			f(h)
-		}()
-	}
-}
-
-func trun(t *testing.T, f func(h *dbHarness)) {
-	truno(t, nil, f)
-}
-
-func testAligned(t *testing.T, name string, offset uintptr) {
-	if offset%8 != 0 {
-		t.Errorf("field %s offset is not 64-bit aligned", name)
-	}
-}
-
-func Test_FieldsAligned(t *testing.T) {
-	p1 := new(DB)
-	testAligned(t, "DB.seq", unsafe.Offsetof(p1.seq))
-	p2 := new(session)
-	testAligned(t, "session.stNextFileNum", unsafe.Offsetof(p2.stNextFileNum))
-	testAligned(t, "session.stJournalNum", unsafe.Offsetof(p2.stJournalNum))
-	testAligned(t, "session.stPrevJournalNum", unsafe.Offsetof(p2.stPrevJournalNum))
-	testAligned(t, "session.stSeqNum", unsafe.Offsetof(p2.stSeqNum))
-}
-
-func TestDB_Locking(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.stor.Close()
-	h.openAssert(false)
-	h.closeDB()
-	h.openAssert(true)
-}
-
-func TestDB_Empty(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.get("foo", false)
-
-		h.reopenDB()
-		h.get("foo", false)
-	})
-}
-
-func TestDB_ReadWrite(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.getVal("foo", "v1")
-		h.put("bar", "v2")
-		h.put("foo", "v3")
-		h.getVal("foo", "v3")
-		h.getVal("bar", "v2")
-
-		h.reopenDB()
-		h.getVal("foo", "v3")
-		h.getVal("bar", "v2")
-	})
-}
-
-func TestDB_PutDeleteGet(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.getVal("foo", "v1")
-		h.put("foo", "v2")
-		h.getVal("foo", "v2")
-		h.delete("foo")
-		h.get("foo", false)
-
-		h.reopenDB()
-		h.get("foo", false)
-	})
-}
-
-func TestDB_EmptyBatch(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.get("foo", false)
-	err := h.db.Write(new(Batch), h.wo)
-	if err != nil {
-		t.Error("writing empty batch yield error: ", err)
-	}
-	h.get("foo", false)
-}
-
-func TestDB_GetFromFrozen(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{WriteBuffer: 100100})
-	defer h.close()
-
-	h.put("foo", "v1")
-	h.getVal("foo", "v1")
-
-	h.stor.DelaySync(storage.TypeTable)      // Block sync calls
-	h.put("k1", strings.Repeat("x", 100000)) // Fill memtable
-	h.put("k2", strings.Repeat("y", 100000)) // Trigger compaction
-	for i := 0; h.db.getFrozenMem() == nil && i < 100; i++ {
-		time.Sleep(10 * time.Microsecond)
-	}
-	if h.db.getFrozenMem() == nil {
-		h.stor.ReleaseSync(storage.TypeTable)
-		t.Fatal("No frozen mem")
-	}
-	h.getVal("foo", "v1")
-	h.stor.ReleaseSync(storage.TypeTable) // Release sync calls
-
-	h.reopenDB()
-	h.getVal("foo", "v1")
-	h.get("k1", true)
-	h.get("k2", true)
-}
-
-func TestDB_GetFromTable(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.compactMem()
-		h.getVal("foo", "v1")
-	})
-}
-
-func TestDB_GetSnapshot(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		bar := strings.Repeat("b", 200)
-		h.put("foo", "v1")
-		h.put(bar, "v1")
-
-		snap, err := h.db.GetSnapshot()
-		if err != nil {
-			t.Fatal("GetSnapshot: got error: ", err)
-		}
-
-		h.put("foo", "v2")
-		h.put(bar, "v2")
-
-		h.getVal("foo", "v2")
-		h.getVal(bar, "v2")
-		h.getValr(snap, "foo", "v1")
-		h.getValr(snap, bar, "v1")
-
-		h.compactMem()
-
-		h.getVal("foo", "v2")
-		h.getVal(bar, "v2")
-		h.getValr(snap, "foo", "v1")
-		h.getValr(snap, bar, "v1")
-
-		snap.Release()
-
-		h.reopenDB()
-		h.getVal("foo", "v2")
-		h.getVal(bar, "v2")
-	})
-}
-
-func TestDB_GetLevel0Ordering(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		for i := 0; i < 4; i++ {
-			h.put("bar", fmt.Sprintf("b%d", i))
-			h.put("foo", fmt.Sprintf("v%d", i))
-			h.compactMem()
-		}
-		h.getVal("foo", "v3")
-		h.getVal("bar", "b3")
-
-		v := h.db.s.version()
-		t0len := v.tLen(0)
-		v.release()
-		if t0len < 2 {
-			t.Errorf("level-0 tables is less than 2, got %d", t0len)
-		}
-
-		h.reopenDB()
-		h.getVal("foo", "v3")
-		h.getVal("bar", "b3")
-	})
-}
-
-func TestDB_GetOrderedByLevels(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.compactMem()
-		h.compactRange("a", "z")
-		h.getVal("foo", "v1")
-		h.put("foo", "v2")
-		h.compactMem()
-		h.getVal("foo", "v2")
-	})
-}
-
-func TestDB_GetPicksCorrectFile(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		// Arrange to have multiple files in a non-level-0 level.
-		h.put("a", "va")
-		h.compactMem()
-		h.compactRange("a", "b")
-		h.put("x", "vx")
-		h.compactMem()
-		h.compactRange("x", "y")
-		h.put("f", "vf")
-		h.compactMem()
-		h.compactRange("f", "g")
-
-		h.getVal("a", "va")
-		h.getVal("f", "vf")
-		h.getVal("x", "vx")
-
-		h.compactRange("", "")
-		h.getVal("a", "va")
-		h.getVal("f", "vf")
-		h.getVal("x", "vx")
-	})
-}
-
-func TestDB_GetEncountersEmptyLevel(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		// Arrange for the following to happen:
-		//   * sstable A in level 0
-		//   * nothing in level 1
-		//   * sstable B in level 2
-		// Then do enough Get() calls to arrange for an automatic compaction
-		// of sstable A.  A bug would cause the compaction to be marked as
-		// occuring at level 1 (instead of the correct level 0).
-
-		// Step 1: First place sstables in levels 0 and 2
-		for i := 0; ; i++ {
-			if i >= 100 {
-				t.Fatal("could not fill levels-0 and level-2")
-			}
-			v := h.db.s.version()
-			if v.tLen(0) > 0 && v.tLen(2) > 0 {
-				v.release()
-				break
-			}
-			v.release()
-			h.put("a", "begin")
-			h.put("z", "end")
-			h.compactMem()
-
-			h.getVal("a", "begin")
-			h.getVal("z", "end")
-		}
-
-		// Step 2: clear level 1 if necessary.
-		h.compactRangeAt(1, "", "")
-		h.tablesPerLevel("1,0,1")
-
-		h.getVal("a", "begin")
-		h.getVal("z", "end")
-
-		// Step 3: read a bunch of times
-		for i := 0; i < 200; i++ {
-			h.get("missing", false)
-		}
-
-		// Step 4: Wait for compaction to finish
-		h.waitCompaction()
-
-		v := h.db.s.version()
-		if v.tLen(0) > 0 {
-			t.Errorf("level-0 tables more than 0, got %d", v.tLen(0))
-		}
-		v.release()
-
-		h.getVal("a", "begin")
-		h.getVal("z", "end")
-	})
-}
-
-func TestDB_IterMultiWithDelete(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("a", "va")
-		h.put("b", "vb")
-		h.put("c", "vc")
-		h.delete("b")
-		h.get("b", false)
-
-		iter := h.db.NewIterator(nil, nil)
-		iter.Seek([]byte("c"))
-		testKeyVal(t, iter, "c->vc")
-		iter.Prev()
-		testKeyVal(t, iter, "a->va")
-		iter.Release()
-
-		h.compactMem()
-
-		iter = h.db.NewIterator(nil, nil)
-		iter.Seek([]byte("c"))
-		testKeyVal(t, iter, "c->vc")
-		iter.Prev()
-		testKeyVal(t, iter, "a->va")
-		iter.Release()
-	})
-}
-
-func TestDB_IteratorPinsRef(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.put("foo", "hello")
-
-	// Get iterator that will yield the current contents of the DB.
-	iter := h.db.NewIterator(nil, nil)
-
-	// Write to force compactions
-	h.put("foo", "newvalue1")
-	for i := 0; i < 100; i++ {
-		h.put(numKey(i), strings.Repeat(fmt.Sprintf("v%09d", i), 100000/10))
-	}
-	h.put("foo", "newvalue2")
-
-	iter.First()
-	testKeyVal(t, iter, "foo->hello")
-	if iter.Next() {
-		t.Errorf("expect eof")
-	}
-	iter.Release()
-}
-
-func TestDB_Recover(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.put("baz", "v5")
-
-		h.reopenDB()
-		h.getVal("foo", "v1")
-
-		h.getVal("foo", "v1")
-		h.getVal("baz", "v5")
-		h.put("bar", "v2")
-		h.put("foo", "v3")
-
-		h.reopenDB()
-		h.getVal("foo", "v3")
-		h.put("foo", "v4")
-		h.getVal("foo", "v4")
-		h.getVal("bar", "v2")
-		h.getVal("baz", "v5")
-	})
-}
-
-func TestDB_RecoverWithEmptyJournal(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		h.put("foo", "v2")
-
-		h.reopenDB()
-		h.reopenDB()
-		h.put("foo", "v3")
-
-		h.reopenDB()
-		h.getVal("foo", "v3")
-	})
-}
-
-func TestDB_RecoverDuringMemtableCompaction(t *testing.T) {
-	truno(t, &opt.Options{WriteBuffer: 1000000}, func(h *dbHarness) {
-
-		h.stor.DelaySync(storage.TypeTable)
-		h.put("big1", strings.Repeat("x", 10000000))
-		h.put("big2", strings.Repeat("y", 1000))
-		h.put("bar", "v2")
-		h.stor.ReleaseSync(storage.TypeTable)
-
-		h.reopenDB()
-		h.getVal("bar", "v2")
-		h.getVal("big1", strings.Repeat("x", 10000000))
-		h.getVal("big2", strings.Repeat("y", 1000))
-	})
-}
-
-func TestDB_MinorCompactionsHappen(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{WriteBuffer: 10000})
-	defer h.close()
-
-	n := 500
-
-	key := func(i int) string {
-		return fmt.Sprintf("key%06d", i)
-	}
-
-	for i := 0; i < n; i++ {
-		h.put(key(i), key(i)+strings.Repeat("v", 1000))
-	}
-
-	for i := 0; i < n; i++ {
-		h.getVal(key(i), key(i)+strings.Repeat("v", 1000))
-	}
-
-	h.reopenDB()
-	for i := 0; i < n; i++ {
-		h.getVal(key(i), key(i)+strings.Repeat("v", 1000))
-	}
-}
-
-func TestDB_RecoverWithLargeJournal(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.put("big1", strings.Repeat("1", 200000))
-	h.put("big2", strings.Repeat("2", 200000))
-	h.put("small3", strings.Repeat("3", 10))
-	h.put("small4", strings.Repeat("4", 10))
-	h.tablesPerLevel("")
-
-	// Make sure that if we re-open with a small write buffer size that
-	// we flush table files in the middle of a large journal file.
-	h.o.WriteBuffer = 100000
-	h.reopenDB()
-	h.getVal("big1", strings.Repeat("1", 200000))
-	h.getVal("big2", strings.Repeat("2", 200000))
-	h.getVal("small3", strings.Repeat("3", 10))
-	h.getVal("small4", strings.Repeat("4", 10))
-	v := h.db.s.version()
-	if v.tLen(0) <= 1 {
-		t.Errorf("tables-0 less than one")
-	}
-	v.release()
-}
-
-func TestDB_CompactionsGenerateMultipleFiles(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		WriteBuffer: 10000000,
-		Compression: opt.NoCompression,
-	})
-	defer h.close()
-
-	v := h.db.s.version()
-	if v.tLen(0) > 0 {
-		t.Errorf("level-0 tables more than 0, got %d", v.tLen(0))
-	}
-	v.release()
-
-	n := 80
-
-	// Write 8MB (80 values, each 100K)
-	for i := 0; i < n; i++ {
-		h.put(numKey(i), strings.Repeat(fmt.Sprintf("v%09d", i), 100000/10))
-	}
-
-	// Reopening moves updates to level-0
-	h.reopenDB()
-	h.compactRangeAt(0, "", "")
-
-	v = h.db.s.version()
-	if v.tLen(0) > 0 {
-		t.Errorf("level-0 tables more than 0, got %d", v.tLen(0))
-	}
-	if v.tLen(1) <= 1 {
-		t.Errorf("level-1 tables less than 1, got %d", v.tLen(1))
-	}
-	v.release()
-
-	for i := 0; i < n; i++ {
-		h.getVal(numKey(i), strings.Repeat(fmt.Sprintf("v%09d", i), 100000/10))
-	}
-}
-
-func TestDB_RepeatedWritesToSameKey(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{WriteBuffer: 100000})
-	defer h.close()
-
-	maxTables := h.o.GetNumLevel() + h.o.GetWriteL0PauseTrigger()
-
-	value := strings.Repeat("v", 2*h.o.GetWriteBuffer())
-	for i := 0; i < 5*maxTables; i++ {
-		h.put("key", value)
-		n := h.totalTables()
-		if n > maxTables {
-			t.Errorf("total tables exceed %d, got=%d, iter=%d", maxTables, n, i)
-		}
-	}
-}
-
-func TestDB_RepeatedWritesToSameKeyAfterReopen(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{WriteBuffer: 100000})
-	defer h.close()
-
-	h.reopenDB()
-
-	maxTables := h.o.GetNumLevel() + h.o.GetWriteL0PauseTrigger()
-
-	value := strings.Repeat("v", 2*h.o.GetWriteBuffer())
-	for i := 0; i < 5*maxTables; i++ {
-		h.put("key", value)
-		n := h.totalTables()
-		if n > maxTables {
-			t.Errorf("total tables exceed %d, got=%d, iter=%d", maxTables, n, i)
-		}
-	}
-}
-
-func TestDB_SparseMerge(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{Compression: opt.NoCompression})
-	defer h.close()
-
-	h.putMulti(h.o.GetNumLevel(), "A", "Z")
-
-	// Suppose there is:
-	//    small amount of data with prefix A
-	//    large amount of data with prefix B
-	//    small amount of data with prefix C
-	// and that recent updates have made small changes to all three prefixes.
-	// Check that we do not do a compaction that merges all of B in one shot.
-	h.put("A", "va")
-	value := strings.Repeat("x", 1000)
-	for i := 0; i < 100000; i++ {
-		h.put(fmt.Sprintf("B%010d", i), value)
-	}
-	h.put("C", "vc")
-	h.compactMem()
-	h.compactRangeAt(0, "", "")
-	h.waitCompaction()
-
-	// Make sparse update
-	h.put("A", "va2")
-	h.put("B100", "bvalue2")
-	h.put("C", "vc2")
-	h.compactMem()
-
-	h.waitCompaction()
-	h.maxNextLevelOverlappingBytes(20 * 1048576)
-	h.compactRangeAt(0, "", "")
-	h.waitCompaction()
-	h.maxNextLevelOverlappingBytes(20 * 1048576)
-	h.compactRangeAt(1, "", "")
-	h.waitCompaction()
-	h.maxNextLevelOverlappingBytes(20 * 1048576)
-}
-
-func TestDB_SizeOf(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		Compression: opt.NoCompression,
-		WriteBuffer: 10000000,
-	})
-	defer h.close()
-
-	h.sizeAssert("", "xyz", 0, 0)
-	h.reopenDB()
-	h.sizeAssert("", "xyz", 0, 0)
-
-	// Write 8MB (80 values, each 100K)
-	n := 80
-	s1 := 100000
-	s2 := 105000
-
-	for i := 0; i < n; i++ {
-		h.put(numKey(i), strings.Repeat(fmt.Sprintf("v%09d", i), s1/10))
-	}
-
-	// 0 because SizeOf() does not account for memtable space
-	h.sizeAssert("", numKey(50), 0, 0)
-
-	for r := 0; r < 3; r++ {
-		h.reopenDB()
-
-		for cs := 0; cs < n; cs += 10 {
-			for i := 0; i < n; i += 10 {
-				h.sizeAssert("", numKey(i), uint64(s1*i), uint64(s2*i))
-				h.sizeAssert("", numKey(i)+".suffix", uint64(s1*(i+1)), uint64(s2*(i+1)))
-				h.sizeAssert(numKey(i), numKey(i+10), uint64(s1*10), uint64(s2*10))
-			}
-
-			h.sizeAssert("", numKey(50), uint64(s1*50), uint64(s2*50))
-			h.sizeAssert("", numKey(50)+".suffix", uint64(s1*50), uint64(s2*50))
-
-			h.compactRangeAt(0, numKey(cs), numKey(cs+9))
-		}
-
-		v := h.db.s.version()
-		if v.tLen(0) != 0 {
-			t.Errorf("level-0 tables was not zero, got %d", v.tLen(0))
-		}
-		if v.tLen(1) == 0 {
-			t.Error("level-1 tables was zero")
-		}
-		v.release()
-	}
-}
-
-func TestDB_SizeOf_MixOfSmallAndLarge(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{Compression: opt.NoCompression})
-	defer h.close()
-
-	sizes := []uint64{
-		10000,
-		10000,
-		100000,
-		10000,
-		100000,
-		10000,
-		300000,
-		10000,
-	}
-
-	for i, n := range sizes {
-		h.put(numKey(i), strings.Repeat(fmt.Sprintf("v%09d", i), int(n)/10))
-	}
-
-	for r := 0; r < 3; r++ {
-		h.reopenDB()
-
-		var x uint64
-		for i, n := range sizes {
-			y := x
-			if i > 0 {
-				y += 1000
-			}
-			h.sizeAssert("", numKey(i), x, y)
-			x += n
-		}
-
-		h.sizeAssert(numKey(3), numKey(5), 110000, 111000)
-
-		h.compactRangeAt(0, "", "")
-	}
-}
-
-func TestDB_Snapshot(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		h.put("foo", "v1")
-		s1 := h.getSnapshot()
-		h.put("foo", "v2")
-		s2 := h.getSnapshot()
-		h.put("foo", "v3")
-		s3 := h.getSnapshot()
-		h.put("foo", "v4")
-
-		h.getValr(s1, "foo", "v1")
-		h.getValr(s2, "foo", "v2")
-		h.getValr(s3, "foo", "v3")
-		h.getVal("foo", "v4")
-
-		s3.Release()
-		h.getValr(s1, "foo", "v1")
-		h.getValr(s2, "foo", "v2")
-		h.getVal("foo", "v4")
-
-		s1.Release()
-		h.getValr(s2, "foo", "v2")
-		h.getVal("foo", "v4")
-
-		s2.Release()
-		h.getVal("foo", "v4")
-	})
-}
-
-func TestDB_SnapshotList(t *testing.T) {
-	db := &DB{snapsList: list.New()}
-	e0a := db.acquireSnapshot()
-	e0b := db.acquireSnapshot()
-	db.seq = 1
-	e1 := db.acquireSnapshot()
-	db.seq = 2
-	e2 := db.acquireSnapshot()
-
-	if db.minSeq() != 0 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	db.releaseSnapshot(e0a)
-	if db.minSeq() != 0 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	db.releaseSnapshot(e2)
-	if db.minSeq() != 0 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	db.releaseSnapshot(e0b)
-	if db.minSeq() != 1 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	e2 = db.acquireSnapshot()
-	if db.minSeq() != 1 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	db.releaseSnapshot(e1)
-	if db.minSeq() != 2 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-	db.releaseSnapshot(e2)
-	if db.minSeq() != 2 {
-		t.Fatalf("invalid sequence number, got=%d", db.minSeq())
-	}
-}
-
-func TestDB_HiddenValuesAreRemoved(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		s := h.db.s
-
-		h.put("foo", "v1")
-		h.compactMem()
-		m := h.o.GetMaxMemCompationLevel()
-		v := s.version()
-		num := v.tLen(m)
-		v.release()
-		if num != 1 {
-			t.Errorf("invalid level-%d len, want=1 got=%d", m, num)
-		}
-
-		// Place a table at level last-1 to prevent merging with preceding mutation
-		h.put("a", "begin")
-		h.put("z", "end")
-		h.compactMem()
-		v = s.version()
-		if v.tLen(m) != 1 {
-			t.Errorf("invalid level-%d len, want=1 got=%d", m, v.tLen(m))
-		}
-		if v.tLen(m-1) != 1 {
-			t.Errorf("invalid level-%d len, want=1 got=%d", m-1, v.tLen(m-1))
-		}
-		v.release()
-
-		h.delete("foo")
-		h.put("foo", "v2")
-		h.allEntriesFor("foo", "[ v2, DEL, v1 ]")
-		h.compactMem()
-		h.allEntriesFor("foo", "[ v2, DEL, v1 ]")
-		h.compactRangeAt(m-2, "", "z")
-		// DEL eliminated, but v1 remains because we aren't compacting that level
-		// (DEL can be eliminated because v2 hides v1).
-		h.allEntriesFor("foo", "[ v2, v1 ]")
-		h.compactRangeAt(m-1, "", "")
-		// Merging last-1 w/ last, so we are the base level for "foo", so
-		// DEL is removed.  (as is v1).
-		h.allEntriesFor("foo", "[ v2 ]")
-	})
-}
-
-func TestDB_DeletionMarkers2(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-	s := h.db.s
-
-	h.put("foo", "v1")
-	h.compactMem()
-	m := h.o.GetMaxMemCompationLevel()
-	v := s.version()
-	num := v.tLen(m)
-	v.release()
-	if num != 1 {
-		t.Errorf("invalid level-%d len, want=1 got=%d", m, num)
-	}
-
-	// Place a table at level last-1 to prevent merging with preceding mutation
-	h.put("a", "begin")
-	h.put("z", "end")
-	h.compactMem()
-	v = s.version()
-	if v.tLen(m) != 1 {
-		t.Errorf("invalid level-%d len, want=1 got=%d", m, v.tLen(m))
-	}
-	if v.tLen(m-1) != 1 {
-		t.Errorf("invalid level-%d len, want=1 got=%d", m-1, v.tLen(m-1))
-	}
-	v.release()
-
-	h.delete("foo")
-	h.allEntriesFor("foo", "[ DEL, v1 ]")
-	h.compactMem() // Moves to level last-2
-	h.allEntriesFor("foo", "[ DEL, v1 ]")
-	h.compactRangeAt(m-2, "", "")
-	// DEL kept: "last" file overlaps
-	h.allEntriesFor("foo", "[ DEL, v1 ]")
-	h.compactRangeAt(m-1, "", "")
-	// Merging last-1 w/ last, so we are the base level for "foo", so
-	// DEL is removed.  (as is v1).
-	h.allEntriesFor("foo", "[ ]")
-}
-
-func TestDB_CompactionTableOpenError(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{OpenFilesCacheCapacity: -1})
-	defer h.close()
-
-	im := 10
-	jm := 10
-	for r := 0; r < 2; r++ {
-		for i := 0; i < im; i++ {
-			for j := 0; j < jm; j++ {
-				h.put(fmt.Sprintf("k%d,%d", i, j), fmt.Sprintf("v%d,%d", i, j))
-			}
-			h.compactMem()
-		}
-	}
-
-	if n := h.totalTables(); n != im*2 {
-		t.Errorf("total tables is %d, want %d", n, im)
-	}
-
-	h.stor.SetEmuErr(storage.TypeTable, tsOpOpen)
-	go h.db.CompactRange(util.Range{})
-	if err := h.db.compSendIdle(h.db.tcompCmdC); err != nil {
-		t.Log("compaction error: ", err)
-	}
-	h.closeDB0()
-	h.openDB()
-	h.stor.SetEmuErr(0, tsOpOpen)
-
-	for i := 0; i < im; i++ {
-		for j := 0; j < jm; j++ {
-			h.getVal(fmt.Sprintf("k%d,%d", i, j), fmt.Sprintf("v%d,%d", i, j))
-		}
-	}
-}
-
-func TestDB_OverlapInLevel0(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		if h.o.GetMaxMemCompationLevel() != 2 {
-			t.Fatal("fix test to reflect the config")
-		}
-
-		// Fill levels 1 and 2 to disable the pushing of new memtables to levels > 0.
-		h.put("100", "v100")
-		h.put("999", "v999")
-		h.compactMem()
-		h.delete("100")
-		h.delete("999")
-		h.compactMem()
-		h.tablesPerLevel("0,1,1")
-
-		// Make files spanning the following ranges in level-0:
-		//  files[0]  200 .. 900
-		//  files[1]  300 .. 500
-		// Note that files are sorted by min key.
-		h.put("300", "v300")
-		h.put("500", "v500")
-		h.compactMem()
-		h.put("200", "v200")
-		h.put("600", "v600")
-		h.put("900", "v900")
-		h.compactMem()
-		h.tablesPerLevel("2,1,1")
-
-		// Compact away the placeholder files we created initially
-		h.compactRangeAt(1, "", "")
-		h.compactRangeAt(2, "", "")
-		h.tablesPerLevel("2")
-
-		// Do a memtable compaction.  Before bug-fix, the compaction would
-		// not detect the overlap with level-0 files and would incorrectly place
-		// the deletion in a deeper level.
-		h.delete("600")
-		h.compactMem()
-		h.tablesPerLevel("3")
-		h.get("600", false)
-	})
-}
-
-func TestDB_L0_CompactionBug_Issue44_a(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.reopenDB()
-	h.put("b", "v")
-	h.reopenDB()
-	h.delete("b")
-	h.delete("a")
-	h.reopenDB()
-	h.delete("a")
-	h.reopenDB()
-	h.put("a", "v")
-	h.reopenDB()
-	h.reopenDB()
-	h.getKeyVal("(a->v)")
-	h.waitCompaction()
-	h.getKeyVal("(a->v)")
-}
-
-func TestDB_L0_CompactionBug_Issue44_b(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.reopenDB()
-	h.put("", "")
-	h.reopenDB()
-	h.delete("e")
-	h.put("", "")
-	h.reopenDB()
-	h.put("c", "cv")
-	h.reopenDB()
-	h.put("", "")
-	h.reopenDB()
-	h.put("", "")
-	h.waitCompaction()
-	h.reopenDB()
-	h.put("d", "dv")
-	h.reopenDB()
-	h.put("", "")
-	h.reopenDB()
-	h.delete("d")
-	h.delete("b")
-	h.reopenDB()
-	h.getKeyVal("(->)(c->cv)")
-	h.waitCompaction()
-	h.getKeyVal("(->)(c->cv)")
-}
-
-func TestDB_SingleEntryMemCompaction(t *testing.T) {
-	trun(t, func(h *dbHarness) {
-		for i := 0; i < 10; i++ {
-			h.put("big", strings.Repeat("v", opt.DefaultWriteBuffer))
-			h.compactMem()
-			h.put("key", strings.Repeat("v", opt.DefaultBlockSize))
-			h.compactMem()
-			h.put("k", "v")
-			h.compactMem()
-			h.put("", "")
-			h.compactMem()
-			h.put("verybig", strings.Repeat("v", opt.DefaultWriteBuffer*2))
-			h.compactMem()
-		}
-	})
-}
-
-func TestDB_ManifestWriteError(t *testing.T) {
-	for i := 0; i < 2; i++ {
-		func() {
-			h := newDbHarness(t)
-			defer h.close()
-
-			h.put("foo", "bar")
-			h.getVal("foo", "bar")
-
-			// Mem compaction (will succeed)
-			h.compactMem()
-			h.getVal("foo", "bar")
-			v := h.db.s.version()
-			if n := v.tLen(h.o.GetMaxMemCompationLevel()); n != 1 {
-				t.Errorf("invalid total tables, want=1 got=%d", n)
-			}
-			v.release()
-
-			if i == 0 {
-				h.stor.SetEmuErr(storage.TypeManifest, tsOpWrite)
-			} else {
-				h.stor.SetEmuErr(storage.TypeManifest, tsOpSync)
-			}
-
-			// Merging compaction (will fail)
-			h.compactRangeAtErr(h.o.GetMaxMemCompationLevel(), "", "", true)
-
-			h.db.Close()
-			h.stor.SetEmuErr(0, tsOpWrite)
-			h.stor.SetEmuErr(0, tsOpSync)
-
-			// Should not lose data
-			h.openDB()
-			h.getVal("foo", "bar")
-		}()
-	}
-}
-
-func assertErr(t *testing.T, err error, wanterr bool) {
-	if err != nil {
-		if wanterr {
-			t.Log("AssertErr: got error (expected): ", err)
-		} else {
-			t.Error("AssertErr: got error: ", err)
-		}
-	} else if wanterr {
-		t.Error("AssertErr: expect error")
-	}
-}
-
-func TestDB_ClosedIsClosed(t *testing.T) {
-	h := newDbHarness(t)
-	db := h.db
-
-	var iter, iter2 iterator.Iterator
-	var snap *Snapshot
-	func() {
-		defer h.close()
-
-		h.put("k", "v")
-		h.getVal("k", "v")
-
-		iter = db.NewIterator(nil, h.ro)
-		iter.Seek([]byte("k"))
-		testKeyVal(t, iter, "k->v")
-
-		var err error
-		snap, err = db.GetSnapshot()
-		if err != nil {
-			t.Fatal("GetSnapshot: got error: ", err)
-		}
-
-		h.getValr(snap, "k", "v")
-
-		iter2 = snap.NewIterator(nil, h.ro)
-		iter2.Seek([]byte("k"))
-		testKeyVal(t, iter2, "k->v")
-
-		h.put("foo", "v2")
-		h.delete("foo")
-
-		// closing DB
-		iter.Release()
-		iter2.Release()
-	}()
-
-	assertErr(t, db.Put([]byte("x"), []byte("y"), h.wo), true)
-	_, err := db.Get([]byte("k"), h.ro)
-	assertErr(t, err, true)
-
-	if iter.Valid() {
-		t.Errorf("iter.Valid should false")
-	}
-	assertErr(t, iter.Error(), false)
-	testKeyVal(t, iter, "->")
-	if iter.Seek([]byte("k")) {
-		t.Errorf("iter.Seek should false")
-	}
-	assertErr(t, iter.Error(), true)
-
-	assertErr(t, iter2.Error(), false)
-
-	_, err = snap.Get([]byte("k"), h.ro)
-	assertErr(t, err, true)
-
-	_, err = db.GetSnapshot()
-	assertErr(t, err, true)
-
-	iter3 := db.NewIterator(nil, h.ro)
-	assertErr(t, iter3.Error(), true)
-
-	iter3 = snap.NewIterator(nil, h.ro)
-	assertErr(t, iter3.Error(), true)
-
-	assertErr(t, db.Delete([]byte("k"), h.wo), true)
-
-	_, err = db.GetProperty("leveldb.stats")
-	assertErr(t, err, true)
-
-	_, err = db.SizeOf([]util.Range{{[]byte("a"), []byte("z")}})
-	assertErr(t, err, true)
-
-	assertErr(t, db.CompactRange(util.Range{}), true)
-
-	assertErr(t, db.Close(), true)
-}
-
-type numberComparer struct{}
-
-func (numberComparer) num(x []byte) (n int) {
-	fmt.Sscan(string(x[1:len(x)-1]), &n)
-	return
-}
-
-func (numberComparer) Name() string {
-	return "test.NumberComparer"
-}
-
-func (p numberComparer) Compare(a, b []byte) int {
-	return p.num(a) - p.num(b)
-}
-
-func (numberComparer) Separator(dst, a, b []byte) []byte { return nil }
-func (numberComparer) Successor(dst, b []byte) []byte    { return nil }
-
-func TestDB_CustomComparer(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		Comparer:    numberComparer{},
-		WriteBuffer: 1000,
-	})
-	defer h.close()
-
-	h.put("[10]", "ten")
-	h.put("[0x14]", "twenty")
-	for i := 0; i < 2; i++ {
-		h.getVal("[10]", "ten")
-		h.getVal("[0xa]", "ten")
-		h.getVal("[20]", "twenty")
-		h.getVal("[0x14]", "twenty")
-		h.get("[15]", false)
-		h.get("[0xf]", false)
-		h.compactMem()
-		h.compactRange("[0]", "[9999]")
-	}
-
-	for n := 0; n < 2; n++ {
-		for i := 0; i < 100; i++ {
-			v := fmt.Sprintf("[%d]", i*10)
-			h.put(v, v)
-		}
-		h.compactMem()
-		h.compactRange("[0]", "[1000000]")
-	}
-}
-
-func TestDB_ManualCompaction(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	if h.o.GetMaxMemCompationLevel() != 2 {
-		t.Fatal("fix test to reflect the config")
-	}
-
-	h.putMulti(3, "p", "q")
-	h.tablesPerLevel("1,1,1")
-
-	// Compaction range falls before files
-	h.compactRange("", "c")
-	h.tablesPerLevel("1,1,1")
-
-	// Compaction range falls after files
-	h.compactRange("r", "z")
-	h.tablesPerLevel("1,1,1")
-
-	// Compaction range overlaps files
-	h.compactRange("p1", "p9")
-	h.tablesPerLevel("0,0,1")
-
-	// Populate a different range
-	h.putMulti(3, "c", "e")
-	h.tablesPerLevel("1,1,2")
-
-	// Compact just the new range
-	h.compactRange("b", "f")
-	h.tablesPerLevel("0,0,2")
-
-	// Compact all
-	h.putMulti(1, "a", "z")
-	h.tablesPerLevel("0,1,2")
-	h.compactRange("", "")
-	h.tablesPerLevel("0,0,1")
-}
-
-func TestDB_BloomFilter(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		DisableBlockCache: true,
-		Filter:            filter.NewBloomFilter(10),
-	})
-	defer h.close()
-
-	key := func(i int) string {
-		return fmt.Sprintf("key%06d", i)
-	}
-
-	const n = 10000
-
-	// Populate multiple layers
-	for i := 0; i < n; i++ {
-		h.put(key(i), key(i))
-	}
-	h.compactMem()
-	h.compactRange("a", "z")
-	for i := 0; i < n; i += 100 {
-		h.put(key(i), key(i))
-	}
-	h.compactMem()
-
-	// Prevent auto compactions triggered by seeks
-	h.stor.DelaySync(storage.TypeTable)
-
-	// Lookup present keys. Should rarely read from small sstable.
-	h.stor.SetReadCounter(storage.TypeTable)
-	for i := 0; i < n; i++ {
-		h.getVal(key(i), key(i))
-	}
-	cnt := int(h.stor.ReadCounter())
-	t.Logf("lookup of %d present keys yield %d sstable I/O reads", n, cnt)
-
-	if min, max := n, n+2*n/100; cnt < min || cnt > max {
-		t.Errorf("num of sstable I/O reads of present keys not in range of %d - %d, got %d", min, max, cnt)
-	}
-
-	// Lookup missing keys. Should rarely read from either sstable.
-	h.stor.ResetReadCounter()
-	for i := 0; i < n; i++ {
-		h.get(key(i)+".missing", false)
-	}
-	cnt = int(h.stor.ReadCounter())
-	t.Logf("lookup of %d missing keys yield %d sstable I/O reads", n, cnt)
-	if max := 3 * n / 100; cnt > max {
-		t.Errorf("num of sstable I/O reads of missing keys was more than %d, got %d", max, cnt)
-	}
-
-	h.stor.ReleaseSync(storage.TypeTable)
-}
-
-func TestDB_Concurrent(t *testing.T) {
-	const n, secs, maxkey = 4, 2, 1000
-
-	runtime.GOMAXPROCS(n)
-	trun(t, func(h *dbHarness) {
-		var closeWg sync.WaitGroup
-		var stop uint32
-		var cnt [n]uint32
-
-		for i := 0; i < n; i++ {
-			closeWg.Add(1)
-			go func(i int) {
-				var put, get, found uint
-				defer func() {
-					t.Logf("goroutine %d stopped after %d ops, put=%d get=%d found=%d missing=%d",
-						i, cnt[i], put, get, found, get-found)
-					closeWg.Done()
-				}()
-
-				rnd := rand.New(rand.NewSource(int64(1000 + i)))
-				for atomic.LoadUint32(&stop) == 0 {
-					x := cnt[i]
-
-					k := rnd.Intn(maxkey)
-					kstr := fmt.Sprintf("%016d", k)
-
-					if (rnd.Int() % 2) > 0 {
-						put++
-						h.put(kstr, fmt.Sprintf("%d.%d.%-1000d", k, i, x))
-					} else {
-						get++
-						v, err := h.db.Get([]byte(kstr), h.ro)
-						if err == nil {
-							found++
-							rk, ri, rx := 0, -1, uint32(0)
-							fmt.Sscanf(string(v), "%d.%d.%d", &rk, &ri, &rx)
-							if rk != k {
-								t.Errorf("invalid key want=%d got=%d", k, rk)
-							}
-							if ri < 0 || ri >= n {
-								t.Error("invalid goroutine number: ", ri)
-							} else {
-								tx := atomic.LoadUint32(&(cnt[ri]))
-								if rx > tx {
-									t.Errorf("invalid seq number, %d > %d ", rx, tx)
-								}
-							}
-						} else if err != ErrNotFound {
-							t.Error("Get: got error: ", err)
-							return
-						}
-					}
-					atomic.AddUint32(&cnt[i], 1)
-				}
-			}(i)
-		}
-
-		time.Sleep(secs * time.Second)
-		atomic.StoreUint32(&stop, 1)
-		closeWg.Wait()
-	})
-
-	runtime.GOMAXPROCS(1)
-}
-
-func TestDB_Concurrent2(t *testing.T) {
-	const n, n2 = 4, 4000
-
-	runtime.GOMAXPROCS(n*2 + 2)
-	truno(t, &opt.Options{WriteBuffer: 30}, func(h *dbHarness) {
-		var closeWg sync.WaitGroup
-		var stop uint32
-
-		for i := 0; i < n; i++ {
-			closeWg.Add(1)
-			go func(i int) {
-				for k := 0; atomic.LoadUint32(&stop) == 0; k++ {
-					h.put(fmt.Sprintf("k%d", k), fmt.Sprintf("%d.%d.", k, i)+strings.Repeat("x", 10))
-				}
-				closeWg.Done()
-			}(i)
-		}
-
-		for i := 0; i < n; i++ {
-			closeWg.Add(1)
-			go func(i int) {
-				for k := 1000000; k < 0 || atomic.LoadUint32(&stop) == 0; k-- {
-					h.put(fmt.Sprintf("k%d", k), fmt.Sprintf("%d.%d.", k, i)+strings.Repeat("x", 10))
-				}
-				closeWg.Done()
-			}(i)
-		}
-
-		cmp := comparer.DefaultComparer
-		for i := 0; i < n2; i++ {
-			closeWg.Add(1)
-			go func(i int) {
-				it := h.db.NewIterator(nil, nil)
-				var pk []byte
-				for it.Next() {
-					kk := it.Key()
-					if cmp.Compare(kk, pk) <= 0 {
-						t.Errorf("iter %d: %q is successor of %q", i, pk, kk)
-					}
-					pk = append(pk[:0], kk...)
-					var k, vk, vi int
-					if n, err := fmt.Sscanf(string(it.Key()), "k%d", &k); err != nil {
-						t.Errorf("iter %d: Scanf error on key %q: %v", i, it.Key(), err)
-					} else if n < 1 {
-						t.Errorf("iter %d: Cannot parse key %q", i, it.Key())
-					}
-					if n, err := fmt.Sscanf(string(it.Value()), "%d.%d", &vk, &vi); err != nil {
-						t.Errorf("iter %d: Scanf error on value %q: %v", i, it.Value(), err)
-					} else if n < 2 {
-						t.Errorf("iter %d: Cannot parse value %q", i, it.Value())
-					}
-
-					if vk != k {
-						t.Errorf("iter %d: invalid value i=%d, want=%d got=%d", i, vi, k, vk)
-					}
-				}
-				if err := it.Error(); err != nil {
-					t.Errorf("iter %d: Got error: %v", i, err)
-				}
-				it.Release()
-				closeWg.Done()
-			}(i)
-		}
-
-		atomic.StoreUint32(&stop, 1)
-		closeWg.Wait()
-	})
-
-	runtime.GOMAXPROCS(1)
-}
-
-func TestDB_CreateReopenDbOnFile(t *testing.T) {
-	dbpath := filepath.Join(os.TempDir(), fmt.Sprintf("goleveldbtestCreateReopenDbOnFile-%d", os.Getuid()))
-	if err := os.RemoveAll(dbpath); err != nil {
-		t.Fatal("cannot remove old db: ", err)
-	}
-	defer os.RemoveAll(dbpath)
-
-	for i := 0; i < 3; i++ {
-		stor, err := storage.OpenFile(dbpath)
-		if err != nil {
-			t.Fatalf("(%d) cannot open storage: %s", i, err)
-		}
-		db, err := Open(stor, nil)
-		if err != nil {
-			t.Fatalf("(%d) cannot open db: %s", i, err)
-		}
-		if err := db.Put([]byte("foo"), []byte("bar"), nil); err != nil {
-			t.Fatalf("(%d) cannot write to db: %s", i, err)
-		}
-		if err := db.Close(); err != nil {
-			t.Fatalf("(%d) cannot close db: %s", i, err)
-		}
-		if err := stor.Close(); err != nil {
-			t.Fatalf("(%d) cannot close storage: %s", i, err)
-		}
-	}
-}
-
-func TestDB_CreateReopenDbOnFile2(t *testing.T) {
-	dbpath := filepath.Join(os.TempDir(), fmt.Sprintf("goleveldbtestCreateReopenDbOnFile2-%d", os.Getuid()))
-	if err := os.RemoveAll(dbpath); err != nil {
-		t.Fatal("cannot remove old db: ", err)
-	}
-	defer os.RemoveAll(dbpath)
-
-	for i := 0; i < 3; i++ {
-		db, err := OpenFile(dbpath, nil)
-		if err != nil {
-			t.Fatalf("(%d) cannot open db: %s", i, err)
-		}
-		if err := db.Put([]byte("foo"), []byte("bar"), nil); err != nil {
-			t.Fatalf("(%d) cannot write to db: %s", i, err)
-		}
-		if err := db.Close(); err != nil {
-			t.Fatalf("(%d) cannot close db: %s", i, err)
-		}
-	}
-}
-
-func TestDB_DeletionMarkersOnMemdb(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.put("foo", "v1")
-	h.compactMem()
-	h.delete("foo")
-	h.get("foo", false)
-	h.getKeyVal("")
-}
-
-func TestDB_LeveldbIssue178(t *testing.T) {
-	nKeys := (opt.DefaultCompactionTableSize / 30) * 5
-	key1 := func(i int) string {
-		return fmt.Sprintf("my_key_%d", i)
-	}
-	key2 := func(i int) string {
-		return fmt.Sprintf("my_key_%d_xxx", i)
-	}
-
-	// Disable compression since it affects the creation of layers and the
-	// code below is trying to test against a very specific scenario.
-	h := newDbHarnessWopt(t, &opt.Options{Compression: opt.NoCompression})
-	defer h.close()
-
-	// Create first key range.
-	batch := new(Batch)
-	for i := 0; i < nKeys; i++ {
-		batch.Put([]byte(key1(i)), []byte("value for range 1 key"))
-	}
-	h.write(batch)
-
-	// Create second key range.
-	batch.Reset()
-	for i := 0; i < nKeys; i++ {
-		batch.Put([]byte(key2(i)), []byte("value for range 2 key"))
-	}
-	h.write(batch)
-
-	// Delete second key range.
-	batch.Reset()
-	for i := 0; i < nKeys; i++ {
-		batch.Delete([]byte(key2(i)))
-	}
-	h.write(batch)
-	h.waitMemCompaction()
-
-	// Run manual compaction.
-	h.compactRange(key1(0), key1(nKeys-1))
-
-	// Checking the keys.
-	h.assertNumKeys(nKeys)
-}
-
-func TestDB_LeveldbIssue200(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.put("1", "b")
-	h.put("2", "c")
-	h.put("3", "d")
-	h.put("4", "e")
-	h.put("5", "f")
-
-	iter := h.db.NewIterator(nil, h.ro)
-
-	// Add an element that should not be reflected in the iterator.
-	h.put("25", "cd")
-
-	iter.Seek([]byte("5"))
-	assertBytes(t, []byte("5"), iter.Key())
-	iter.Prev()
-	assertBytes(t, []byte("4"), iter.Key())
-	iter.Prev()
-	assertBytes(t, []byte("3"), iter.Key())
-	iter.Next()
-	assertBytes(t, []byte("4"), iter.Key())
-	iter.Next()
-	assertBytes(t, []byte("5"), iter.Key())
-}
-
-func TestDB_GoleveldbIssue74(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		WriteBuffer: 1 * opt.MiB,
-	})
-	defer h.close()
-
-	const n, dur = 10000, 5 * time.Second
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	until := time.Now().Add(dur)
-	wg := new(sync.WaitGroup)
-	wg.Add(2)
-	var done uint32
-	go func() {
-		var i int
-		defer func() {
-			t.Logf("WRITER DONE #%d", i)
-			atomic.StoreUint32(&done, 1)
-			wg.Done()
-		}()
-
-		b := new(Batch)
-		for ; time.Now().Before(until) && atomic.LoadUint32(&done) == 0; i++ {
-			iv := fmt.Sprintf("VAL%010d", i)
-			for k := 0; k < n; k++ {
-				key := fmt.Sprintf("KEY%06d", k)
-				b.Put([]byte(key), []byte(key+iv))
-				b.Put([]byte(fmt.Sprintf("PTR%06d", k)), []byte(key))
-			}
-			h.write(b)
-
-			b.Reset()
-			snap := h.getSnapshot()
-			iter := snap.NewIterator(util.BytesPrefix([]byte("PTR")), nil)
-			var k int
-			for ; iter.Next(); k++ {
-				ptrKey := iter.Key()
-				key := iter.Value()
-
-				if _, err := snap.Get(ptrKey, nil); err != nil {
-					t.Fatalf("WRITER #%d snapshot.Get %q: %v", i, ptrKey, err)
-				}
-				if value, err := snap.Get(key, nil); err != nil {
-					t.Fatalf("WRITER #%d snapshot.Get %q: %v", i, key, err)
-				} else if string(value) != string(key)+iv {
-					t.Fatalf("WRITER #%d snapshot.Get %q got invalid value, want %q got %q", i, key, string(key)+iv, value)
-				}
-
-				b.Delete(key)
-				b.Delete(ptrKey)
-			}
-			h.write(b)
-			iter.Release()
-			snap.Release()
-			if k != n {
-				t.Fatalf("#%d %d != %d", i, k, n)
-			}
-		}
-	}()
-	go func() {
-		var i int
-		defer func() {
-			t.Logf("READER DONE #%d", i)
-			atomic.StoreUint32(&done, 1)
-			wg.Done()
-		}()
-		for ; time.Now().Before(until) && atomic.LoadUint32(&done) == 0; i++ {
-			snap := h.getSnapshot()
-			iter := snap.NewIterator(util.BytesPrefix([]byte("PTR")), nil)
-			var prevValue string
-			var k int
-			for ; iter.Next(); k++ {
-				ptrKey := iter.Key()
-				key := iter.Value()
-
-				if _, err := snap.Get(ptrKey, nil); err != nil {
-					t.Fatalf("READER #%d snapshot.Get %q: %v", i, ptrKey, err)
-				}
-
-				if value, err := snap.Get(key, nil); err != nil {
-					t.Fatalf("READER #%d snapshot.Get %q: %v", i, key, err)
-				} else if prevValue != "" && string(value) != string(key)+prevValue {
-					t.Fatalf("READER #%d snapshot.Get %q got invalid value, want %q got %q", i, key, string(key)+prevValue, value)
-				} else {
-					prevValue = string(value[len(key):])
-				}
-			}
-			iter.Release()
-			snap.Release()
-			if k > 0 && k != n {
-				t.Fatalf("#%d %d != %d", i, k, n)
-			}
-		}
-	}()
-	wg.Wait()
-}
-
-func TestDB_GetProperties(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	_, err := h.db.GetProperty("leveldb.num-files-at-level")
-	if err == nil {
-		t.Error("GetProperty() failed to detect missing level")
-	}
-
-	_, err = h.db.GetProperty("leveldb.num-files-at-level0")
-	if err != nil {
-		t.Error("got unexpected error", err)
-	}
-
-	_, err = h.db.GetProperty("leveldb.num-files-at-level0x")
-	if err == nil {
-		t.Error("GetProperty() failed to detect invalid level")
-	}
-}
-
-func TestDB_GoleveldbIssue72and83(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		WriteBuffer:            1 * opt.MiB,
-		OpenFilesCacheCapacity: 3,
-	})
-	defer h.close()
-
-	const n, wn, dur = 10000, 100, 30 * time.Second
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	randomData := func(prefix byte, i int) []byte {
-		data := make([]byte, 1+4+32+64+32)
-		_, err := crand.Reader.Read(data[1 : len(data)-8])
-		if err != nil {
-			panic(err)
-		}
-		data[0] = prefix
-		binary.LittleEndian.PutUint32(data[len(data)-8:], uint32(i))
-		binary.LittleEndian.PutUint32(data[len(data)-4:], util.NewCRC(data[:len(data)-4]).Value())
-		return data
-	}
-
-	keys := make([][]byte, n)
-	for i := range keys {
-		keys[i] = randomData(1, 0)
-	}
-
-	until := time.Now().Add(dur)
-	wg := new(sync.WaitGroup)
-	wg.Add(3)
-	var done uint32
-	go func() {
-		i := 0
-		defer func() {
-			t.Logf("WRITER DONE #%d", i)
-			wg.Done()
-		}()
-
-		b := new(Batch)
-		for ; i < wn && atomic.LoadUint32(&done) == 0; i++ {
-			b.Reset()
-			for _, k1 := range keys {
-				k2 := randomData(2, i)
-				b.Put(k2, randomData(42, i))
-				b.Put(k1, k2)
-			}
-			if err := h.db.Write(b, h.wo); err != nil {
-				atomic.StoreUint32(&done, 1)
-				t.Fatalf("WRITER #%d db.Write: %v", i, err)
-			}
-		}
-	}()
-	go func() {
-		var i int
-		defer func() {
-			t.Logf("READER0 DONE #%d", i)
-			atomic.StoreUint32(&done, 1)
-			wg.Done()
-		}()
-		for ; time.Now().Before(until) && atomic.LoadUint32(&done) == 0; i++ {
-			snap := h.getSnapshot()
-			seq := snap.elem.seq
-			if seq == 0 {
-				snap.Release()
-				continue
-			}
-			iter := snap.NewIterator(util.BytesPrefix([]byte{1}), nil)
-			writei := int(seq/(n*2) - 1)
-			var k int
-			for ; iter.Next(); k++ {
-				k1 := iter.Key()
-				k2 := iter.Value()
-				k1checksum0 := binary.LittleEndian.Uint32(k1[len(k1)-4:])
-				k1checksum1 := util.NewCRC(k1[:len(k1)-4]).Value()
-				if k1checksum0 != k1checksum1 {
-					t.Fatalf("READER0 #%d.%d W#%d invalid K1 checksum: %#x != %#x", i, k, k1checksum0, k1checksum0)
-				}
-				k2checksum0 := binary.LittleEndian.Uint32(k2[len(k2)-4:])
-				k2checksum1 := util.NewCRC(k2[:len(k2)-4]).Value()
-				if k2checksum0 != k2checksum1 {
-					t.Fatalf("READER0 #%d.%d W#%d invalid K2 checksum: %#x != %#x", i, k, k2checksum0, k2checksum1)
-				}
-				kwritei := int(binary.LittleEndian.Uint32(k2[len(k2)-8:]))
-				if writei != kwritei {
-					t.Fatalf("READER0 #%d.%d W#%d invalid write iteration num: %d", i, k, writei, kwritei)
-				}
-				if _, err := snap.Get(k2, nil); err != nil {
-					t.Fatalf("READER0 #%d.%d W#%d snap.Get: %v\nk1: %x\n -> k2: %x", i, k, writei, err, k1, k2)
-				}
-			}
-			if err := iter.Error(); err != nil {
-				t.Fatalf("READER0 #%d.%d W#%d snap.Iterator: %v", i, k, writei, err)
-			}
-			iter.Release()
-			snap.Release()
-			if k > 0 && k != n {
-				t.Fatalf("READER0 #%d W#%d short read, got=%d want=%d", i, writei, k, n)
-			}
-		}
-	}()
-	go func() {
-		var i int
-		defer func() {
-			t.Logf("READER1 DONE #%d", i)
-			atomic.StoreUint32(&done, 1)
-			wg.Done()
-		}()
-		for ; time.Now().Before(until) && atomic.LoadUint32(&done) == 0; i++ {
-			iter := h.db.NewIterator(nil, nil)
-			seq := iter.(*dbIter).seq
-			if seq == 0 {
-				iter.Release()
-				continue
-			}
-			writei := int(seq/(n*2) - 1)
-			var k int
-			for ok := iter.Last(); ok; ok = iter.Prev() {
-				k++
-			}
-			if err := iter.Error(); err != nil {
-				t.Fatalf("READER1 #%d.%d W#%d db.Iterator: %v", i, k, writei, err)
-			}
-			iter.Release()
-			if m := (writei+1)*n + n; k != m {
-				t.Fatalf("READER1 #%d W#%d short read, got=%d want=%d", i, writei, k, m)
-			}
-		}
-	}()
-
-	wg.Wait()
-}
-
-func TestDB_TransientError(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		WriteBuffer:              128 * opt.KiB,
-		OpenFilesCacheCapacity:   3,
-		DisableCompactionBackoff: true,
-	})
-	defer h.close()
-
-	const (
-		nSnap = 20
-		nKey  = 10000
-	)
-
-	var (
-		snaps [nSnap]*Snapshot
-		b     = &Batch{}
-	)
-	for i := range snaps {
-		vtail := fmt.Sprintf("VAL%030d", i)
-		b.Reset()
-		for k := 0; k < nKey; k++ {
-			key := fmt.Sprintf("KEY%8d", k)
-			b.Put([]byte(key), []byte(key+vtail))
-		}
-		h.stor.SetEmuRandErr(storage.TypeTable, tsOpOpen, tsOpRead, tsOpReadAt)
-		if err := h.db.Write(b, nil); err != nil {
-			t.Logf("WRITE #%d error: %v", i, err)
-			h.stor.SetEmuRandErr(0, tsOpOpen, tsOpRead, tsOpReadAt, tsOpWrite)
-			for {
-				if err := h.db.Write(b, nil); err == nil {
-					break
-				} else if errors.IsCorrupted(err) {
-					t.Fatalf("WRITE #%d corrupted: %v", i, err)
-				}
-			}
-		}
-
-		snaps[i] = h.db.newSnapshot()
-		b.Reset()
-		for k := 0; k < nKey; k++ {
-			key := fmt.Sprintf("KEY%8d", k)
-			b.Delete([]byte(key))
-		}
-		h.stor.SetEmuRandErr(storage.TypeTable, tsOpOpen, tsOpRead, tsOpReadAt)
-		if err := h.db.Write(b, nil); err != nil {
-			t.Logf("WRITE #%d  error: %v", i, err)
-			h.stor.SetEmuRandErr(0, tsOpOpen, tsOpRead, tsOpReadAt)
-			for {
-				if err := h.db.Write(b, nil); err == nil {
-					break
-				} else if errors.IsCorrupted(err) {
-					t.Fatalf("WRITE #%d corrupted: %v", i, err)
-				}
-			}
-		}
-	}
-	h.stor.SetEmuRandErr(0, tsOpOpen, tsOpRead, tsOpReadAt)
-
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	rnd := rand.New(rand.NewSource(0xecafdaed))
-	wg := &sync.WaitGroup{}
-	for i, snap := range snaps {
-		wg.Add(2)
-
-		go func(i int, snap *Snapshot, sk []int) {
-			defer wg.Done()
-
-			vtail := fmt.Sprintf("VAL%030d", i)
-			for _, k := range sk {
-				key := fmt.Sprintf("KEY%8d", k)
-				xvalue, err := snap.Get([]byte(key), nil)
-				if err != nil {
-					t.Fatalf("READER_GET #%d SEQ=%d K%d error: %v", i, snap.elem.seq, k, err)
-				}
-				value := key + vtail
-				if !bytes.Equal([]byte(value), xvalue) {
-					t.Fatalf("READER_GET #%d SEQ=%d K%d invalid value: want %q, got %q", i, snap.elem.seq, k, value, xvalue)
-				}
-			}
-		}(i, snap, rnd.Perm(nKey))
-
-		go func(i int, snap *Snapshot) {
-			defer wg.Done()
-
-			vtail := fmt.Sprintf("VAL%030d", i)
-			iter := snap.NewIterator(nil, nil)
-			defer iter.Release()
-			for k := 0; k < nKey; k++ {
-				if !iter.Next() {
-					if err := iter.Error(); err != nil {
-						t.Fatalf("READER_ITER #%d K%d error: %v", i, k, err)
-					} else {
-						t.Fatalf("READER_ITER #%d K%d eoi", i, k)
-					}
-				}
-				key := fmt.Sprintf("KEY%8d", k)
-				xkey := iter.Key()
-				if !bytes.Equal([]byte(key), xkey) {
-					t.Fatalf("READER_ITER #%d K%d invalid key: want %q, got %q", i, k, key, xkey)
-				}
-				value := key + vtail
-				xvalue := iter.Value()
-				if !bytes.Equal([]byte(value), xvalue) {
-					t.Fatalf("READER_ITER #%d K%d invalid value: want %q, got %q", i, k, value, xvalue)
-				}
-			}
-		}(i, snap)
-	}
-
-	wg.Wait()
-}
-
-func TestDB_UkeyShouldntHopAcrossTable(t *testing.T) {
-	h := newDbHarnessWopt(t, &opt.Options{
-		WriteBuffer:                 112 * opt.KiB,
-		CompactionTableSize:         90 * opt.KiB,
-		CompactionExpandLimitFactor: 1,
-	})
-	defer h.close()
-
-	const (
-		nSnap = 190
-		nKey  = 140
-	)
-
-	var (
-		snaps [nSnap]*Snapshot
-		b     = &Batch{}
-	)
-	for i := range snaps {
-		vtail := fmt.Sprintf("VAL%030d", i)
-		b.Reset()
-		for k := 0; k < nKey; k++ {
-			key := fmt.Sprintf("KEY%08d", k)
-			b.Put([]byte(key), []byte(key+vtail))
-		}
-		if err := h.db.Write(b, nil); err != nil {
-			t.Fatalf("WRITE #%d error: %v", i, err)
-		}
-
-		snaps[i] = h.db.newSnapshot()
-		b.Reset()
-		for k := 0; k < nKey; k++ {
-			key := fmt.Sprintf("KEY%08d", k)
-			b.Delete([]byte(key))
-		}
-		if err := h.db.Write(b, nil); err != nil {
-			t.Fatalf("WRITE #%d  error: %v", i, err)
-		}
-	}
-
-	h.compactMem()
-
-	h.waitCompaction()
-	for level, tables := range h.db.s.stVersion.tables {
-		for _, table := range tables {
-			t.Logf("L%d@%d %q:%q", level, table.file.Num(), table.imin, table.imax)
-		}
-	}
-
-	h.compactRangeAt(0, "", "")
-	h.waitCompaction()
-	for level, tables := range h.db.s.stVersion.tables {
-		for _, table := range tables {
-			t.Logf("L%d@%d %q:%q", level, table.file.Num(), table.imin, table.imax)
-		}
-	}
-	h.compactRangeAt(1, "", "")
-	h.waitCompaction()
-	for level, tables := range h.db.s.stVersion.tables {
-		for _, table := range tables {
-			t.Logf("L%d@%d %q:%q", level, table.file.Num(), table.imin, table.imax)
-		}
-	}
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	wg := &sync.WaitGroup{}
-	for i, snap := range snaps {
-		wg.Add(1)
-
-		go func(i int, snap *Snapshot) {
-			defer wg.Done()
-
-			vtail := fmt.Sprintf("VAL%030d", i)
-			for k := 0; k < nKey; k++ {
-				key := fmt.Sprintf("KEY%08d", k)
-				xvalue, err := snap.Get([]byte(key), nil)
-				if err != nil {
-					t.Fatalf("READER_GET #%d SEQ=%d K%d error: %v", i, snap.elem.seq, k, err)
-				}
-				value := key + vtail
-				if !bytes.Equal([]byte(value), xvalue) {
-					t.Fatalf("READER_GET #%d SEQ=%d K%d invalid value: want %q, got %q", i, snap.elem.seq, k, value, xvalue)
-				}
-			}
-		}(i, snap)
-	}
-
-	wg.Wait()
-}
-
-func TestDB_TableCompactionBuilder(t *testing.T) {
-	stor := newTestStorage(t)
-	defer stor.Close()
-
-	const nSeq = 99
-
-	o := &opt.Options{
-		WriteBuffer:                 112 * opt.KiB,
-		CompactionTableSize:         43 * opt.KiB,
-		CompactionExpandLimitFactor: 1,
-		CompactionGPOverlapsFactor:  1,
-		DisableBlockCache:           true,
-	}
-	s, err := newSession(stor, o)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := s.create(); err != nil {
-		t.Fatal(err)
-	}
-	defer s.close()
-	var (
-		seq        uint64
-		targetSize = 5 * o.CompactionTableSize
-		value      = bytes.Repeat([]byte{'0'}, 100)
-	)
-	for i := 0; i < 2; i++ {
-		tw, err := s.tops.create()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for k := 0; tw.tw.BytesLen() < targetSize; k++ {
-			key := []byte(fmt.Sprintf("%09d", k))
-			seq += nSeq - 1
-			for x := uint64(0); x < nSeq; x++ {
-				if err := tw.append(newIkey(key, seq-x, ktVal), value); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-		tf, err := tw.finish()
-		if err != nil {
-			t.Fatal(err)
-		}
-		rec := &sessionRecord{}
-		rec.addTableFile(i, tf)
-		if err := s.commit(rec); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Build grandparent.
-	v := s.version()
-	c := newCompaction(s, v, 1, append(tFiles{}, v.tables[1]...))
-	rec := &sessionRecord{}
-	b := &tableCompactionBuilder{
-		s:         s,
-		c:         c,
-		rec:       rec,
-		stat1:     new(cStatsStaging),
-		minSeq:    0,
-		strict:    true,
-		tableSize: o.CompactionTableSize/3 + 961,
-	}
-	if err := b.run(new(compactionTransactCounter)); err != nil {
-		t.Fatal(err)
-	}
-	for _, t := range c.tables[0] {
-		rec.delTable(c.level, t.file.Num())
-	}
-	if err := s.commit(rec); err != nil {
-		t.Fatal(err)
-	}
-	c.release()
-
-	// Build level-1.
-	v = s.version()
-	c = newCompaction(s, v, 0, append(tFiles{}, v.tables[0]...))
-	rec = &sessionRecord{}
-	b = &tableCompactionBuilder{
-		s:         s,
-		c:         c,
-		rec:       rec,
-		stat1:     new(cStatsStaging),
-		minSeq:    0,
-		strict:    true,
-		tableSize: o.CompactionTableSize,
-	}
-	if err := b.run(new(compactionTransactCounter)); err != nil {
-		t.Fatal(err)
-	}
-	for _, t := range c.tables[0] {
-		rec.delTable(c.level, t.file.Num())
-	}
-	// Move grandparent to level-3
-	for _, t := range v.tables[2] {
-		rec.delTable(2, t.file.Num())
-		rec.addTableFile(3, t)
-	}
-	if err := s.commit(rec); err != nil {
-		t.Fatal(err)
-	}
-	c.release()
-
-	v = s.version()
-	for level, want := range []bool{false, true, false, true, false} {
-		got := len(v.tables[level]) > 0
-		if want != got {
-			t.Fatalf("invalid level-%d tables len: want %v, got %v", level, want, got)
-		}
-	}
-	for i, f := range v.tables[1][:len(v.tables[1])-1] {
-		nf := v.tables[1][i+1]
-		if bytes.Equal(f.imax.ukey(), nf.imin.ukey()) {
-			t.Fatalf("KEY %q hop across table %d .. %d", f.imax.ukey(), f.file.Num(), nf.file.Num())
-		}
-	}
-	v.release()
-
-	// Compaction with transient error.
-	v = s.version()
-	c = newCompaction(s, v, 1, append(tFiles{}, v.tables[1]...))
-	rec = &sessionRecord{}
-	b = &tableCompactionBuilder{
-		s:         s,
-		c:         c,
-		rec:       rec,
-		stat1:     new(cStatsStaging),
-		minSeq:    0,
-		strict:    true,
-		tableSize: o.CompactionTableSize,
-	}
-	stor.SetEmuErrOnce(storage.TypeTable, tsOpSync)
-	stor.SetEmuRandErr(storage.TypeTable, tsOpRead, tsOpReadAt, tsOpWrite)
-	stor.SetEmuRandErrProb(0xf0)
-	for {
-		if err := b.run(new(compactionTransactCounter)); err != nil {
-			t.Logf("(expected) b.run: %v", err)
-		} else {
-			break
-		}
-	}
-	if err := s.commit(rec); err != nil {
-		t.Fatal(err)
-	}
-	c.release()
-
-	stor.SetEmuErrOnce(0, tsOpSync)
-	stor.SetEmuRandErr(0, tsOpRead, tsOpReadAt, tsOpWrite)
-
-	v = s.version()
-	if len(v.tables[1]) != len(v.tables[2]) {
-		t.Fatalf("invalid tables length, want %d, got %d", len(v.tables[1]), len(v.tables[2]))
-	}
-	for i, f0 := range v.tables[1] {
-		f1 := v.tables[2][i]
-		iter0 := s.tops.newIterator(f0, nil, nil)
-		iter1 := s.tops.newIterator(f1, nil, nil)
-		for j := 0; true; j++ {
-			next0 := iter0.Next()
-			next1 := iter1.Next()
-			if next0 != next1 {
-				t.Fatalf("#%d.%d invalid eoi: want %v, got %v", i, j, next0, next1)
-			}
-			key0 := iter0.Key()
-			key1 := iter1.Key()
-			if !bytes.Equal(key0, key1) {
-				t.Fatalf("#%d.%d invalid key: want %q, got %q", i, j, key0, key1)
-			}
-			if next0 == false {
-				break
-			}
-		}
-		iter0.Release()
-		iter1.Release()
-	}
-	v.release()
-}
-
-func testDB_IterTriggeredCompaction(t *testing.T, limitDiv int) {
-	const (
-		vSize = 200 * opt.KiB
-		tSize = 100 * opt.MiB
-		mIter = 100
-		n     = tSize / vSize
-	)
-
-	h := newDbHarnessWopt(t, &opt.Options{
-		Compression:       opt.NoCompression,
-		DisableBlockCache: true,
-	})
-	defer h.close()
-
-	key := func(x int) string {
-		return fmt.Sprintf("v%06d", x)
-	}
-
-	// Fill.
-	value := strings.Repeat("x", vSize)
-	for i := 0; i < n; i++ {
-		h.put(key(i), value)
-	}
-	h.compactMem()
-
-	// Delete all.
-	for i := 0; i < n; i++ {
-		h.delete(key(i))
-	}
-	h.compactMem()
-
-	var (
-		limit = n / limitDiv
-
-		startKey = key(0)
-		limitKey = key(limit)
-		maxKey   = key(n)
-		slice    = &util.Range{Limit: []byte(limitKey)}
-
-		initialSize0 = h.sizeOf(startKey, limitKey)
-		initialSize1 = h.sizeOf(limitKey, maxKey)
-	)
-
-	t.Logf("inital size %s [rest %s]", shortenb(int(initialSize0)), shortenb(int(initialSize1)))
-
-	for r := 0; true; r++ {
-		if r >= mIter {
-			t.Fatal("taking too long to compact")
-		}
-
-		// Iterates.
-		iter := h.db.NewIterator(slice, h.ro)
-		for iter.Next() {
-		}
-		if err := iter.Error(); err != nil {
-			t.Fatalf("Iter err: %v", err)
-		}
-		iter.Release()
-
-		// Wait compaction.
-		h.waitCompaction()
-
-		// Check size.
-		size0 := h.sizeOf(startKey, limitKey)
-		size1 := h.sizeOf(limitKey, maxKey)
-		t.Logf("#%03d size %s [rest %s]", r, shortenb(int(size0)), shortenb(int(size1)))
-		if size0 < initialSize0/10 {
-			break
-		}
-	}
-
-	if initialSize1 > 0 {
-		h.sizeAssert(limitKey, maxKey, initialSize1/4-opt.MiB, initialSize1+opt.MiB)
-	}
-}
-
-func TestDB_IterTriggeredCompaction(t *testing.T) {
-	testDB_IterTriggeredCompaction(t, 1)
-}
-
-func TestDB_IterTriggeredCompactionHalf(t *testing.T) {
-	testDB_IterTriggeredCompaction(t, 2)
-}
-
-func TestDB_ReadOnly(t *testing.T) {
-	h := newDbHarness(t)
-	defer h.close()
-
-	h.put("foo", "v1")
-	h.put("bar", "v2")
-	h.compactMem()
-
-	h.put("xfoo", "v1")
-	h.put("xbar", "v2")
-
-	t.Log("Trigger read-only")
-	if err := h.db.SetReadOnly(); err != nil {
-		h.close()
-		t.Fatalf("SetReadOnly error: %v", err)
-	}
-
-	h.stor.SetEmuErr(storage.TypeAll, tsOpCreate, tsOpReplace, tsOpRemove, tsOpWrite, tsOpWrite, tsOpSync)
-
-	ro := func(key, value, wantValue string) {
-		if err := h.db.Put([]byte(key), []byte(value), h.wo); err != ErrReadOnly {
-			t.Fatalf("unexpected error: %v", err)
-		}
-		h.getVal(key, wantValue)
-	}
-
-	ro("foo", "vx", "v1")
-
-	h.o.ReadOnly = true
-	h.reopenDB()
-
-	ro("foo", "vx", "v1")
-	ro("bar", "vx", "v2")
-	h.assertNumKeys(4)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_util.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_util.go
deleted file mode 100644
index a8a2bdf72..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_util.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// Reader is the interface that wraps basic Get and NewIterator methods.
-// This interface implemented by both DB and Snapshot.
-type Reader interface {
-	Get(key []byte, ro *opt.ReadOptions) (value []byte, err error)
-	NewIterator(slice *util.Range, ro *opt.ReadOptions) iterator.Iterator
-}
-
-type Sizes []uint64
-
-// Sum returns sum of the sizes.
-func (p Sizes) Sum() (n uint64) {
-	for _, s := range p {
-		n += s
-	}
-	return n
-}
-
-// Logging.
-func (db *DB) log(v ...interface{})                 { db.s.log(v...) }
-func (db *DB) logf(format string, v ...interface{}) { db.s.logf(format, v...) }
-
-// Check and clean files.
-func (db *DB) checkAndCleanFiles() error {
-	v := db.s.version()
-	defer v.release()
-
-	tablesMap := make(map[uint64]bool)
-	for _, tables := range v.tables {
-		for _, t := range tables {
-			tablesMap[t.file.Num()] = false
-		}
-	}
-
-	files, err := db.s.getFiles(storage.TypeAll)
-	if err != nil {
-		return err
-	}
-
-	var nTables int
-	var rem []storage.File
-	for _, f := range files {
-		keep := true
-		switch f.Type() {
-		case storage.TypeManifest:
-			keep = f.Num() >= db.s.manifestFile.Num()
-		case storage.TypeJournal:
-			if db.frozenJournalFile != nil {
-				keep = f.Num() >= db.frozenJournalFile.Num()
-			} else {
-				keep = f.Num() >= db.journalFile.Num()
-			}
-		case storage.TypeTable:
-			_, keep = tablesMap[f.Num()]
-			if keep {
-				tablesMap[f.Num()] = true
-				nTables++
-			}
-		}
-
-		if !keep {
-			rem = append(rem, f)
-		}
-	}
-
-	if nTables != len(tablesMap) {
-		var missing []*storage.FileInfo
-		for num, present := range tablesMap {
-			if !present {
-				missing = append(missing, &storage.FileInfo{Type: storage.TypeTable, Num: num})
-				db.logf("db@janitor table missing @%d", num)
-			}
-		}
-		return errors.NewErrCorrupted(nil, &errors.ErrMissingFiles{Files: missing})
-	}
-
-	db.logf("db@janitor F·%d G·%d", len(files), len(rem))
-	for _, f := range rem {
-		db.logf("db@janitor removing %s-%d", f.Type(), f.Num())
-		if err := f.Remove(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/db_write.go b/vendor/github.com/syndtr/goleveldb/leveldb/db_write.go
deleted file mode 100644
index 176ee893f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/db_write.go
+++ /dev/null
@@ -1,338 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func (db *DB) writeJournal(b *Batch) error {
-	w, err := db.journal.Next()
-	if err != nil {
-		return err
-	}
-	if _, err := w.Write(b.encode()); err != nil {
-		return err
-	}
-	if err := db.journal.Flush(); err != nil {
-		return err
-	}
-	if b.sync {
-		return db.journalWriter.Sync()
-	}
-	return nil
-}
-
-func (db *DB) jWriter() {
-	defer db.closeW.Done()
-	for {
-		select {
-		case b := <-db.journalC:
-			if b != nil {
-				db.journalAckC <- db.writeJournal(b)
-			}
-		case _, _ = <-db.closeC:
-			return
-		}
-	}
-}
-
-func (db *DB) rotateMem(n int) (mem *memDB, err error) {
-	// Wait for pending memdb compaction.
-	err = db.compSendIdle(db.mcompCmdC)
-	if err != nil {
-		return
-	}
-
-	// Create new memdb and journal.
-	mem, err = db.newMem(n)
-	if err != nil {
-		return
-	}
-
-	// Schedule memdb compaction.
-	db.compSendTrigger(db.mcompCmdC)
-	return
-}
-
-func (db *DB) flush(n int) (mdb *memDB, mdbFree int, err error) {
-	delayed := false
-	flush := func() (retry bool) {
-		v := db.s.version()
-		defer v.release()
-		mdb = db.getEffectiveMem()
-		defer func() {
-			if retry {
-				mdb.decref()
-				mdb = nil
-			}
-		}()
-		mdbFree = mdb.Free()
-		switch {
-		case v.tLen(0) >= db.s.o.GetWriteL0SlowdownTrigger() && !delayed:
-			delayed = true
-			time.Sleep(time.Millisecond)
-		case mdbFree >= n:
-			return false
-		case v.tLen(0) >= db.s.o.GetWriteL0PauseTrigger():
-			delayed = true
-			err = db.compSendIdle(db.tcompCmdC)
-			if err != nil {
-				return false
-			}
-		default:
-			// Allow memdb to grow if it has no entry.
-			if mdb.Len() == 0 {
-				mdbFree = n
-			} else {
-				mdb.decref()
-				mdb, err = db.rotateMem(n)
-				if err == nil {
-					mdbFree = mdb.Free()
-				} else {
-					mdbFree = 0
-				}
-			}
-			return false
-		}
-		return true
-	}
-	start := time.Now()
-	for flush() {
-	}
-	if delayed {
-		db.writeDelay += time.Since(start)
-		db.writeDelayN++
-	} else if db.writeDelayN > 0 {
-		db.logf("db@write was delayed N·%d T·%v", db.writeDelayN, db.writeDelay)
-		db.writeDelay = 0
-		db.writeDelayN = 0
-	}
-	return
-}
-
-// Write apply the given batch to the DB. The batch will be applied
-// sequentially.
-//
-// It is safe to modify the contents of the arguments after Write returns.
-func (db *DB) Write(b *Batch, wo *opt.WriteOptions) (err error) {
-	err = db.ok()
-	if err != nil || b == nil || b.Len() == 0 {
-		return
-	}
-
-	b.init(wo.GetSync())
-
-	// The write happen synchronously.
-	select {
-	case db.writeC <- b:
-		if <-db.writeMergedC {
-			return <-db.writeAckC
-		}
-	case db.writeLockC <- struct{}{}:
-	case err = <-db.compPerErrC:
-		return
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-
-	merged := 0
-	danglingMerge := false
-	defer func() {
-		if danglingMerge {
-			db.writeMergedC <- false
-		} else {
-			<-db.writeLockC
-		}
-		for i := 0; i < merged; i++ {
-			db.writeAckC <- err
-		}
-	}()
-
-	mdb, mdbFree, err := db.flush(b.size())
-	if err != nil {
-		return
-	}
-	defer mdb.decref()
-
-	// Calculate maximum size of the batch.
-	m := 1 << 20
-	if x := b.size(); x <= 128<<10 {
-		m = x + (128 << 10)
-	}
-	m = minInt(m, mdbFree)
-
-	// Merge with other batch.
-drain:
-	for b.size() < m && !b.sync {
-		select {
-		case nb := <-db.writeC:
-			if b.size()+nb.size() <= m {
-				b.append(nb)
-				db.writeMergedC <- true
-				merged++
-			} else {
-				danglingMerge = true
-				break drain
-			}
-		default:
-			break drain
-		}
-	}
-
-	// Set batch first seq number relative from last seq.
-	b.seq = db.seq + 1
-
-	// Write journal concurrently if it is large enough.
-	if b.size() >= (128 << 10) {
-		// Push the write batch to the journal writer
-		select {
-		case db.journalC <- b:
-			// Write into memdb
-			if berr := b.memReplay(mdb.DB); berr != nil {
-				panic(berr)
-			}
-		case err = <-db.compPerErrC:
-			return
-		case _, _ = <-db.closeC:
-			err = ErrClosed
-			return
-		}
-		// Wait for journal writer
-		select {
-		case err = <-db.journalAckC:
-			if err != nil {
-				// Revert memdb if error detected
-				if berr := b.revertMemReplay(mdb.DB); berr != nil {
-					panic(berr)
-				}
-				return
-			}
-		case _, _ = <-db.closeC:
-			err = ErrClosed
-			return
-		}
-	} else {
-		err = db.writeJournal(b)
-		if err != nil {
-			return
-		}
-		if berr := b.memReplay(mdb.DB); berr != nil {
-			panic(berr)
-		}
-	}
-
-	// Set last seq number.
-	db.addSeq(uint64(b.Len()))
-
-	if b.size() >= mdbFree {
-		db.rotateMem(0)
-	}
-	return
-}
-
-// Put sets the value for the given key. It overwrites any previous value
-// for that key; a DB is not a multi-map.
-//
-// It is safe to modify the contents of the arguments after Put returns.
-func (db *DB) Put(key, value []byte, wo *opt.WriteOptions) error {
-	b := new(Batch)
-	b.Put(key, value)
-	return db.Write(b, wo)
-}
-
-// Delete deletes the value for the given key.
-//
-// It is safe to modify the contents of the arguments after Delete returns.
-func (db *DB) Delete(key []byte, wo *opt.WriteOptions) error {
-	b := new(Batch)
-	b.Delete(key)
-	return db.Write(b, wo)
-}
-
-func isMemOverlaps(icmp *iComparer, mem *memdb.DB, min, max []byte) bool {
-	iter := mem.NewIterator(nil)
-	defer iter.Release()
-	return (max == nil || (iter.First() && icmp.uCompare(max, iKey(iter.Key()).ukey()) >= 0)) &&
-		(min == nil || (iter.Last() && icmp.uCompare(min, iKey(iter.Key()).ukey()) <= 0))
-}
-
-// CompactRange compacts the underlying DB for the given key range.
-// In particular, deleted and overwritten versions are discarded,
-// and the data is rearranged to reduce the cost of operations
-// needed to access the data. This operation should typically only
-// be invoked by users who understand the underlying implementation.
-//
-// A nil Range.Start is treated as a key before all keys in the DB.
-// And a nil Range.Limit is treated as a key after all keys in the DB.
-// Therefore if both is nil then it will compact entire DB.
-func (db *DB) CompactRange(r util.Range) error {
-	if err := db.ok(); err != nil {
-		return err
-	}
-
-	// Lock writer.
-	select {
-	case db.writeLockC <- struct{}{}:
-	case err := <-db.compPerErrC:
-		return err
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-
-	// Check for overlaps in memdb.
-	mdb := db.getEffectiveMem()
-	defer mdb.decref()
-	if isMemOverlaps(db.s.icmp, mdb.DB, r.Start, r.Limit) {
-		// Memdb compaction.
-		if _, err := db.rotateMem(0); err != nil {
-			<-db.writeLockC
-			return err
-		}
-		<-db.writeLockC
-		if err := db.compSendIdle(db.mcompCmdC); err != nil {
-			return err
-		}
-	} else {
-		<-db.writeLockC
-	}
-
-	// Table compaction.
-	return db.compSendRange(db.tcompCmdC, -1, r.Start, r.Limit)
-}
-
-// SetReadOnly makes DB read-only. It will stay read-only until reopened.
-func (db *DB) SetReadOnly() error {
-	if err := db.ok(); err != nil {
-		return err
-	}
-
-	// Lock writer.
-	select {
-	case db.writeLockC <- struct{}{}:
-		db.compWriteLocking = true
-	case err := <-db.compPerErrC:
-		return err
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-
-	// Set compaction read-only.
-	select {
-	case db.compErrSetC <- ErrReadOnly:
-	case perr := <-db.compPerErrC:
-		return perr
-	case _, _ = <-db.closeC:
-		return ErrClosed
-	}
-
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/doc.go b/vendor/github.com/syndtr/goleveldb/leveldb/doc.go
deleted file mode 100644
index 53f13bb24..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/doc.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package leveldb provides implementation of LevelDB key/value database.
-//
-// Create or open a database:
-//
-//	db, err := leveldb.OpenFile("path/to/db", nil)
-//	...
-//	defer db.Close()
-//	...
-//
-// Read or modify the database content:
-//
-//	// Remember that the contents of the returned slice should not be modified.
-//	data, err := db.Get([]byte("key"), nil)
-//	...
-//	err = db.Put([]byte("key"), []byte("value"), nil)
-//	...
-//	err = db.Delete([]byte("key"), nil)
-//	...
-//
-// Iterate over database content:
-//
-//	iter := db.NewIterator(nil, nil)
-//	for iter.Next() {
-//		// Remember that the contents of the returned slice should not be modified, and
-//		// only valid until the next call to Next.
-//		key := iter.Key()
-//		value := iter.Value()
-//		...
-//	}
-//	iter.Release()
-//	err = iter.Error()
-//	...
-//
-// Iterate over subset of database content with a particular prefix:
-//	iter := db.NewIterator(util.BytesPrefix([]byte("foo-")), nil)
-//	for iter.Next() {
-//		// Use key/value.
-//		...
-//	}
-//	iter.Release()
-//	err = iter.Error()
-//	...
-//
-// Seek-then-Iterate:
-//
-// 	iter := db.NewIterator(nil, nil)
-// 	for ok := iter.Seek(key); ok; ok = iter.Next() {
-// 		// Use key/value.
-// 		...
-// 	}
-// 	iter.Release()
-// 	err = iter.Error()
-// 	...
-//
-// Iterate over subset of database content:
-//
-// 	iter := db.NewIterator(&util.Range{Start: []byte("foo"), Limit: []byte("xoo")}, nil)
-// 	for iter.Next() {
-// 		// Use key/value.
-// 		...
-// 	}
-// 	iter.Release()
-// 	err = iter.Error()
-// 	...
-//
-// Batch writes:
-//
-//	batch := new(leveldb.Batch)
-//	batch.Put([]byte("foo"), []byte("value"))
-//	batch.Put([]byte("bar"), []byte("another value"))
-//	batch.Delete([]byte("baz"))
-//	err = db.Write(batch, nil)
-//	...
-//
-// Use bloom filter:
-//
-//	o := &opt.Options{
-//		Filter: filter.NewBloomFilter(10),
-//	}
-//	db, err := leveldb.OpenFile("path/to/db", o)
-//	...
-//	defer db.Close()
-//	...
-package leveldb
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/errors.go b/vendor/github.com/syndtr/goleveldb/leveldb/errors.go
deleted file mode 100644
index c8bd66a5a..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/errors.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/errors"
-)
-
-var (
-	ErrNotFound         = errors.ErrNotFound
-	ErrReadOnly         = errors.New("leveldb: read-only mode")
-	ErrSnapshotReleased = errors.New("leveldb: snapshot released")
-	ErrIterReleased     = errors.New("leveldb: iterator released")
-	ErrClosed           = errors.New("leveldb: closed")
-)
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/errors/errors.go b/vendor/github.com/syndtr/goleveldb/leveldb/errors/errors.go
deleted file mode 100644
index 84b5d6b7b..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/errors/errors.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package errors provides common error types used throughout leveldb.
-package errors
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	ErrNotFound    = New("leveldb: not found")
-	ErrReleased    = util.ErrReleased
-	ErrHasReleaser = util.ErrHasReleaser
-)
-
-// New returns an error that formats as the given text.
-func New(text string) error {
-	return errors.New(text)
-}
-
-// ErrCorrupted is the type that wraps errors that indicate corruption in
-// the database.
-type ErrCorrupted struct {
-	File *storage.FileInfo
-	Err  error
-}
-
-func (e *ErrCorrupted) Error() string {
-	if e.File != nil {
-		return fmt.Sprintf("%v [file=%v]", e.Err, e.File)
-	} else {
-		return e.Err.Error()
-	}
-}
-
-// NewErrCorrupted creates new ErrCorrupted error.
-func NewErrCorrupted(f storage.File, err error) error {
-	return &ErrCorrupted{storage.NewFileInfo(f), err}
-}
-
-// IsCorrupted returns a boolean indicating whether the error is indicating
-// a corruption.
-func IsCorrupted(err error) bool {
-	switch err.(type) {
-	case *ErrCorrupted:
-		return true
-	}
-	return false
-}
-
-// ErrMissingFiles is the type that indicating a corruption due to missing
-// files.
-type ErrMissingFiles struct {
-	Files []*storage.FileInfo
-}
-
-func (e *ErrMissingFiles) Error() string { return "file missing" }
-
-// SetFile sets 'file info' of the given error with the given file.
-// Currently only ErrCorrupted is supported, otherwise will do nothing.
-func SetFile(err error, f storage.File) error {
-	switch x := err.(type) {
-	case *ErrCorrupted:
-		x.File = storage.NewFileInfo(f)
-		return x
-	}
-	return err
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/external_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/external_test.go
deleted file mode 100644
index b328ece4e..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/external_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-var _ = testutil.Defer(func() {
-	Describe("Leveldb external", func() {
-		o := &opt.Options{
-			DisableBlockCache:      true,
-			BlockRestartInterval:   5,
-			BlockSize:              80,
-			Compression:            opt.NoCompression,
-			OpenFilesCacheCapacity: -1,
-			Strict:                 opt.StrictAll,
-			WriteBuffer:            1000,
-			CompactionTableSize:    2000,
-		}
-
-		Describe("write test", func() {
-			It("should do write correctly", func(done Done) {
-				db := newTestingDB(o, nil, nil)
-				t := testutil.DBTesting{
-					DB:      db,
-					Deleted: testutil.KeyValue_Generate(nil, 500, 1, 50, 5, 5).Clone(),
-				}
-				testutil.DoDBTesting(&t)
-				db.TestClose()
-				done <- true
-			}, 20.0)
-		})
-
-		Describe("read test", func() {
-			testutil.AllKeyValueTesting(nil, nil, func(kv testutil.KeyValue) testutil.DB {
-				// Building the DB.
-				db := newTestingDB(o, nil, nil)
-				kv.IterateShuffled(nil, func(i int, key, value []byte) {
-					err := db.TestPut(key, value)
-					Expect(err).NotTo(HaveOccurred())
-				})
-
-				return db
-			}, func(db testutil.DB) {
-				db.(*testingDB).TestClose()
-			})
-		})
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/filter.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter.go
deleted file mode 100644
index 37c1e146b..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/filter.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/filter"
-)
-
-type iFilter struct {
-	filter.Filter
-}
-
-func (f iFilter) Contains(filter, key []byte) bool {
-	return f.Filter.Contains(filter, iKey(key).ukey())
-}
-
-func (f iFilter) NewGenerator() filter.FilterGenerator {
-	return iFilterGenerator{f.Filter.NewGenerator()}
-}
-
-type iFilterGenerator struct {
-	filter.FilterGenerator
-}
-
-func (g iFilterGenerator) Add(key []byte) {
-	g.FilterGenerator.Add(iKey(key).ukey())
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom.go
deleted file mode 100644
index bab0e9970..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package filter
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func bloomHash(key []byte) uint32 {
-	return util.Hash(key, 0xbc9f1d34)
-}
-
-type bloomFilter int
-
-// The bloom filter serializes its parameters and is backward compatible
-// with respect to them. Therefor, its parameters are not added to its
-// name.
-func (bloomFilter) Name() string {
-	return "leveldb.BuiltinBloomFilter"
-}
-
-func (f bloomFilter) Contains(filter, key []byte) bool {
-	nBytes := len(filter) - 1
-	if nBytes < 1 {
-		return false
-	}
-	nBits := uint32(nBytes * 8)
-
-	// Use the encoded k so that we can read filters generated by
-	// bloom filters created using different parameters.
-	k := filter[nBytes]
-	if k > 30 {
-		// Reserved for potentially new encodings for short bloom filters.
-		// Consider it a match.
-		return true
-	}
-
-	kh := bloomHash(key)
-	delta := (kh >> 17) | (kh << 15) // Rotate right 17 bits
-	for j := uint8(0); j < k; j++ {
-		bitpos := kh % nBits
-		if (uint32(filter[bitpos/8]) & (1 << (bitpos % 8))) == 0 {
-			return false
-		}
-		kh += delta
-	}
-	return true
-}
-
-func (f bloomFilter) NewGenerator() FilterGenerator {
-	// Round down to reduce probing cost a little bit.
-	k := uint8(f * 69 / 100) // 0.69 =~ ln(2)
-	if k < 1 {
-		k = 1
-	} else if k > 30 {
-		k = 30
-	}
-	return &bloomFilterGenerator{
-		n: int(f),
-		k: k,
-	}
-}
-
-type bloomFilterGenerator struct {
-	n int
-	k uint8
-
-	keyHashes []uint32
-}
-
-func (g *bloomFilterGenerator) Add(key []byte) {
-	// Use double-hashing to generate a sequence of hash values.
-	// See analysis in [Kirsch,Mitzenmacher 2006].
-	g.keyHashes = append(g.keyHashes, bloomHash(key))
-}
-
-func (g *bloomFilterGenerator) Generate(b Buffer) {
-	// Compute bloom filter size (in both bits and bytes)
-	nBits := uint32(len(g.keyHashes) * g.n)
-	// For small n, we can see a very high false positive rate.  Fix it
-	// by enforcing a minimum bloom filter length.
-	if nBits < 64 {
-		nBits = 64
-	}
-	nBytes := (nBits + 7) / 8
-	nBits = nBytes * 8
-
-	dest := b.Alloc(int(nBytes) + 1)
-	dest[nBytes] = g.k
-	for _, kh := range g.keyHashes {
-		delta := (kh >> 17) | (kh << 15) // Rotate right 17 bits
-		for j := uint8(0); j < g.k; j++ {
-			bitpos := kh % nBits
-			dest[bitpos/8] |= (1 << (bitpos % 8))
-			kh += delta
-		}
-	}
-
-	g.keyHashes = g.keyHashes[:0]
-}
-
-// NewBloomFilter creates a new initialized bloom filter for given
-// bitsPerKey.
-//
-// Since bitsPerKey is persisted individually for each bloom filter
-// serialization, bloom filters are backwards compatible with respect to
-// changing bitsPerKey. This means that no big performance penalty will
-// be experienced when changing the parameter. See documentation for
-// opt.Options.Filter for more information.
-func NewBloomFilter(bitsPerKey int) Filter {
-	return bloomFilter(bitsPerKey)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go
deleted file mode 100644
index 1fb56f071..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/filter/bloom_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package filter
-
-import (
-	"encoding/binary"
-	"github.com/syndtr/goleveldb/leveldb/util"
-	"testing"
-)
-
-type harness struct {
-	t *testing.T
-
-	bloom     Filter
-	generator FilterGenerator
-	filter    []byte
-}
-
-func newHarness(t *testing.T) *harness {
-	bloom := NewBloomFilter(10)
-	return &harness{
-		t:         t,
-		bloom:     bloom,
-		generator: bloom.NewGenerator(),
-	}
-}
-
-func (h *harness) add(key []byte) {
-	h.generator.Add(key)
-}
-
-func (h *harness) addNum(key uint32) {
-	var b [4]byte
-	binary.LittleEndian.PutUint32(b[:], key)
-	h.add(b[:])
-}
-
-func (h *harness) build() {
-	b := &util.Buffer{}
-	h.generator.Generate(b)
-	h.filter = b.Bytes()
-}
-
-func (h *harness) reset() {
-	h.filter = nil
-}
-
-func (h *harness) filterLen() int {
-	return len(h.filter)
-}
-
-func (h *harness) assert(key []byte, want, silent bool) bool {
-	got := h.bloom.Contains(h.filter, key)
-	if !silent && got != want {
-		h.t.Errorf("assert on '%v' failed got '%v', want '%v'", key, got, want)
-	}
-	return got
-}
-
-func (h *harness) assertNum(key uint32, want, silent bool) bool {
-	var b [4]byte
-	binary.LittleEndian.PutUint32(b[:], key)
-	return h.assert(b[:], want, silent)
-}
-
-func TestBloomFilter_Empty(t *testing.T) {
-	h := newHarness(t)
-	h.build()
-	h.assert([]byte("hello"), false, false)
-	h.assert([]byte("world"), false, false)
-}
-
-func TestBloomFilter_Small(t *testing.T) {
-	h := newHarness(t)
-	h.add([]byte("hello"))
-	h.add([]byte("world"))
-	h.build()
-	h.assert([]byte("hello"), true, false)
-	h.assert([]byte("world"), true, false)
-	h.assert([]byte("x"), false, false)
-	h.assert([]byte("foo"), false, false)
-}
-
-func nextN(n int) int {
-	switch {
-	case n < 10:
-		n += 1
-	case n < 100:
-		n += 10
-	case n < 1000:
-		n += 100
-	default:
-		n += 1000
-	}
-	return n
-}
-
-func TestBloomFilter_VaryingLengths(t *testing.T) {
-	h := newHarness(t)
-	var mediocre, good int
-	for n := 1; n < 10000; n = nextN(n) {
-		h.reset()
-		for i := 0; i < n; i++ {
-			h.addNum(uint32(i))
-		}
-		h.build()
-
-		got := h.filterLen()
-		want := (n * 10 / 8) + 40
-		if got > want {
-			t.Errorf("filter len test failed, '%d' > '%d'", got, want)
-		}
-
-		for i := 0; i < n; i++ {
-			h.assertNum(uint32(i), true, false)
-		}
-
-		var rate float32
-		for i := 0; i < 10000; i++ {
-			if h.assertNum(uint32(i+1000000000), true, true) {
-				rate++
-			}
-		}
-		rate /= 10000
-		if rate > 0.02 {
-			t.Errorf("false positive rate is more than 2%%, got %v, at len %d", rate, n)
-		}
-		if rate > 0.0125 {
-			mediocre++
-		} else {
-			good++
-		}
-	}
-	t.Logf("false positive rate: %d good, %d mediocre", good, mediocre)
-	if mediocre > good/5 {
-		t.Error("mediocre false positive rate is more than expected")
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/filter/filter.go b/vendor/github.com/syndtr/goleveldb/leveldb/filter/filter.go
deleted file mode 100644
index 7a925c5a8..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/filter/filter.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package filter provides interface and implementation of probabilistic
-// data structure.
-//
-// The filter is resposible for creating small filter from a set of keys.
-// These filter will then used to test whether a key is a member of the set.
-// In many cases, a filter can cut down the number of disk seeks from a
-// handful to a single disk seek per DB.Get call.
-package filter
-
-// Buffer is the interface that wraps basic Alloc, Write and WriteByte methods.
-type Buffer interface {
-	// Alloc allocs n bytes of slice from the buffer. This also advancing
-	// write offset.
-	Alloc(n int) []byte
-
-	// Write appends the contents of p to the buffer.
-	Write(p []byte) (n int, err error)
-
-	// WriteByte appends the byte c to the buffer.
-	WriteByte(c byte) error
-}
-
-// Filter is the filter.
-type Filter interface {
-	// Name returns the name of this policy.
-	//
-	// Note that if the filter encoding changes in an incompatible way,
-	// the name returned by this method must be changed. Otherwise, old
-	// incompatible filters may be passed to methods of this type.
-	Name() string
-
-	// NewGenerator creates a new filter generator.
-	NewGenerator() FilterGenerator
-
-	// Contains returns true if the filter contains the given key.
-	//
-	// The filter are filters generated by the filter generator.
-	Contains(filter, key []byte) bool
-}
-
-// FilterGenerator is the filter generator.
-type FilterGenerator interface {
-	// Add adds a key to the filter generator.
-	//
-	// The key may become invalid after call to this method end, therefor
-	// key must be copied if implementation require keeping key for later
-	// use. The key should not modified directly, doing so may cause
-	// undefined results.
-	Add(key []byte)
-
-	// Generate generates filters based on keys passed so far. After call
-	// to Generate the filter generator maybe resetted, depends on implementation.
-	Generate(b Buffer)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go
deleted file mode 100644
index a23ab05f7..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// BasicArray is the interface that wraps basic Len and Search method.
-type BasicArray interface {
-	// Len returns length of the array.
-	Len() int
-
-	// Search finds smallest index that point to a key that is greater
-	// than or equal to the given key.
-	Search(key []byte) int
-}
-
-// Array is the interface that wraps BasicArray and basic Index method.
-type Array interface {
-	BasicArray
-
-	// Index returns key/value pair with index of i.
-	Index(i int) (key, value []byte)
-}
-
-// Array is the interface that wraps BasicArray and basic Get method.
-type ArrayIndexer interface {
-	BasicArray
-
-	// Get returns a new data iterator with index of i.
-	Get(i int) Iterator
-}
-
-type basicArrayIterator struct {
-	util.BasicReleaser
-	array BasicArray
-	pos   int
-	err   error
-}
-
-func (i *basicArrayIterator) Valid() bool {
-	return i.pos >= 0 && i.pos < i.array.Len() && !i.Released()
-}
-
-func (i *basicArrayIterator) First() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.array.Len() == 0 {
-		i.pos = -1
-		return false
-	}
-	i.pos = 0
-	return true
-}
-
-func (i *basicArrayIterator) Last() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	n := i.array.Len()
-	if n == 0 {
-		i.pos = 0
-		return false
-	}
-	i.pos = n - 1
-	return true
-}
-
-func (i *basicArrayIterator) Seek(key []byte) bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	n := i.array.Len()
-	if n == 0 {
-		i.pos = 0
-		return false
-	}
-	i.pos = i.array.Search(key)
-	if i.pos >= n {
-		return false
-	}
-	return true
-}
-
-func (i *basicArrayIterator) Next() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	i.pos++
-	if n := i.array.Len(); i.pos >= n {
-		i.pos = n
-		return false
-	}
-	return true
-}
-
-func (i *basicArrayIterator) Prev() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	i.pos--
-	if i.pos < 0 {
-		i.pos = -1
-		return false
-	}
-	return true
-}
-
-func (i *basicArrayIterator) Error() error { return i.err }
-
-type arrayIterator struct {
-	basicArrayIterator
-	array      Array
-	pos        int
-	key, value []byte
-}
-
-func (i *arrayIterator) updateKV() {
-	if i.pos == i.basicArrayIterator.pos {
-		return
-	}
-	i.pos = i.basicArrayIterator.pos
-	if i.Valid() {
-		i.key, i.value = i.array.Index(i.pos)
-	} else {
-		i.key = nil
-		i.value = nil
-	}
-}
-
-func (i *arrayIterator) Key() []byte {
-	i.updateKV()
-	return i.key
-}
-
-func (i *arrayIterator) Value() []byte {
-	i.updateKV()
-	return i.value
-}
-
-type arrayIteratorIndexer struct {
-	basicArrayIterator
-	array ArrayIndexer
-}
-
-func (i *arrayIteratorIndexer) Get() Iterator {
-	if i.Valid() {
-		return i.array.Get(i.basicArrayIterator.pos)
-	}
-	return nil
-}
-
-// NewArrayIterator returns an iterator from the given array.
-func NewArrayIterator(array Array) Iterator {
-	return &arrayIterator{
-		basicArrayIterator: basicArrayIterator{array: array, pos: -1},
-		array:              array,
-		pos:                -1,
-	}
-}
-
-// NewArrayIndexer returns an index iterator from the given array.
-func NewArrayIndexer(array ArrayIndexer) IteratorIndexer {
-	return &arrayIteratorIndexer{
-		basicArrayIterator: basicArrayIterator{array: array, pos: -1},
-		array:              array,
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go
deleted file mode 100644
index 1ed6d07cb..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/array_iter_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator_test
-
-import (
-	. "github.com/onsi/ginkgo"
-
-	. "github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-var _ = testutil.Defer(func() {
-	Describe("Array iterator", func() {
-		It("Should iterates and seeks correctly", func() {
-			// Build key/value.
-			kv := testutil.KeyValue_Generate(nil, 70, 1, 5, 3, 3)
-
-			// Test the iterator.
-			t := testutil.IteratorTesting{
-				KeyValue: kv.Clone(),
-				Iter:     NewArrayIterator(kv),
-			}
-			testutil.DoIteratorTesting(&t)
-		})
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go
deleted file mode 100644
index 939adbb93..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// IteratorIndexer is the interface that wraps CommonIterator and basic Get
-// method. IteratorIndexer provides index for indexed iterator.
-type IteratorIndexer interface {
-	CommonIterator
-
-	// Get returns a new data iterator for the current position, or nil if
-	// done.
-	Get() Iterator
-}
-
-type indexedIterator struct {
-	util.BasicReleaser
-	index  IteratorIndexer
-	strict bool
-
-	data   Iterator
-	err    error
-	errf   func(err error)
-	closed bool
-}
-
-func (i *indexedIterator) setData() {
-	if i.data != nil {
-		i.data.Release()
-	}
-	i.data = i.index.Get()
-}
-
-func (i *indexedIterator) clearData() {
-	if i.data != nil {
-		i.data.Release()
-	}
-	i.data = nil
-}
-
-func (i *indexedIterator) indexErr() {
-	if err := i.index.Error(); err != nil {
-		if i.errf != nil {
-			i.errf(err)
-		}
-		i.err = err
-	}
-}
-
-func (i *indexedIterator) dataErr() bool {
-	if err := i.data.Error(); err != nil {
-		if i.errf != nil {
-			i.errf(err)
-		}
-		if i.strict || !errors.IsCorrupted(err) {
-			i.err = err
-			return true
-		}
-	}
-	return false
-}
-
-func (i *indexedIterator) Valid() bool {
-	return i.data != nil && i.data.Valid()
-}
-
-func (i *indexedIterator) First() bool {
-	if i.err != nil {
-		return false
-	} else if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if !i.index.First() {
-		i.indexErr()
-		i.clearData()
-		return false
-	}
-	i.setData()
-	return i.Next()
-}
-
-func (i *indexedIterator) Last() bool {
-	if i.err != nil {
-		return false
-	} else if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if !i.index.Last() {
-		i.indexErr()
-		i.clearData()
-		return false
-	}
-	i.setData()
-	if !i.data.Last() {
-		if i.dataErr() {
-			return false
-		}
-		i.clearData()
-		return i.Prev()
-	}
-	return true
-}
-
-func (i *indexedIterator) Seek(key []byte) bool {
-	if i.err != nil {
-		return false
-	} else if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if !i.index.Seek(key) {
-		i.indexErr()
-		i.clearData()
-		return false
-	}
-	i.setData()
-	if !i.data.Seek(key) {
-		if i.dataErr() {
-			return false
-		}
-		i.clearData()
-		return i.Next()
-	}
-	return true
-}
-
-func (i *indexedIterator) Next() bool {
-	if i.err != nil {
-		return false
-	} else if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	switch {
-	case i.data != nil && !i.data.Next():
-		if i.dataErr() {
-			return false
-		}
-		i.clearData()
-		fallthrough
-	case i.data == nil:
-		if !i.index.Next() {
-			i.indexErr()
-			return false
-		}
-		i.setData()
-		return i.Next()
-	}
-	return true
-}
-
-func (i *indexedIterator) Prev() bool {
-	if i.err != nil {
-		return false
-	} else if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	switch {
-	case i.data != nil && !i.data.Prev():
-		if i.dataErr() {
-			return false
-		}
-		i.clearData()
-		fallthrough
-	case i.data == nil:
-		if !i.index.Prev() {
-			i.indexErr()
-			return false
-		}
-		i.setData()
-		if !i.data.Last() {
-			if i.dataErr() {
-				return false
-			}
-			i.clearData()
-			return i.Prev()
-		}
-	}
-	return true
-}
-
-func (i *indexedIterator) Key() []byte {
-	if i.data == nil {
-		return nil
-	}
-	return i.data.Key()
-}
-
-func (i *indexedIterator) Value() []byte {
-	if i.data == nil {
-		return nil
-	}
-	return i.data.Value()
-}
-
-func (i *indexedIterator) Release() {
-	i.clearData()
-	i.index.Release()
-	i.BasicReleaser.Release()
-}
-
-func (i *indexedIterator) Error() error {
-	if i.err != nil {
-		return i.err
-	}
-	if err := i.index.Error(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (i *indexedIterator) SetErrorCallback(f func(err error)) {
-	i.errf = f
-}
-
-// NewIndexedIterator returns an 'indexed iterator'. An index is iterator
-// that returns another iterator, a 'data iterator'. A 'data iterator' is the
-// iterator that contains actual key/value pairs.
-//
-// If strict is true the any 'corruption errors' (i.e errors.IsCorrupted(err) == true)
-// won't be ignored and will halt 'indexed iterator', otherwise the iterator will
-// continue to the next 'data iterator'. Corruption on 'index iterator' will not be
-// ignored and will halt the iterator.
-func NewIndexedIterator(index IteratorIndexer, strict bool) Iterator {
-	return &indexedIterator{index: index, strict: strict}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go
deleted file mode 100644
index 72a797892..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/indexed_iter_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator_test
-
-import (
-	"sort"
-
-	. "github.com/onsi/ginkgo"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	. "github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-type keyValue struct {
-	key []byte
-	testutil.KeyValue
-}
-
-type keyValueIndex []keyValue
-
-func (x keyValueIndex) Search(key []byte) int {
-	return sort.Search(x.Len(), func(i int) bool {
-		return comparer.DefaultComparer.Compare(x[i].key, key) >= 0
-	})
-}
-
-func (x keyValueIndex) Len() int                        { return len(x) }
-func (x keyValueIndex) Index(i int) (key, value []byte) { return x[i].key, nil }
-func (x keyValueIndex) Get(i int) Iterator              { return NewArrayIterator(x[i]) }
-
-var _ = testutil.Defer(func() {
-	Describe("Indexed iterator", func() {
-		Test := func(n ...int) func() {
-			if len(n) == 0 {
-				rnd := testutil.NewRand()
-				n = make([]int, rnd.Intn(17)+3)
-				for i := range n {
-					n[i] = rnd.Intn(19) + 1
-				}
-			}
-
-			return func() {
-				It("Should iterates and seeks correctly", func(done Done) {
-					// Build key/value.
-					index := make(keyValueIndex, len(n))
-					sum := 0
-					for _, x := range n {
-						sum += x
-					}
-					kv := testutil.KeyValue_Generate(nil, sum, 1, 10, 4, 4)
-					for i, j := 0, 0; i < len(n); i++ {
-						for x := n[i]; x > 0; x-- {
-							key, value := kv.Index(j)
-							index[i].key = key
-							index[i].Put(key, value)
-							j++
-						}
-					}
-
-					// Test the iterator.
-					t := testutil.IteratorTesting{
-						KeyValue: kv.Clone(),
-						Iter:     NewIndexedIterator(NewArrayIndexer(index), true),
-					}
-					testutil.DoIteratorTesting(&t)
-					done <- true
-				}, 1.5)
-			}
-		}
-
-		Describe("with 100 keys", Test(100))
-		Describe("with 50-50 keys", Test(50, 50))
-		Describe("with 50-1 keys", Test(50, 1))
-		Describe("with 50-1-50 keys", Test(50, 1, 50))
-		Describe("with 1-50 keys", Test(1, 50))
-		Describe("with random N-keys", Test())
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter.go
deleted file mode 100644
index c2522860b..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package iterator provides interface and implementation to traverse over
-// contents of a database.
-package iterator
-
-import (
-	"errors"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	ErrIterReleased = errors.New("leveldb/iterator: iterator released")
-)
-
-// IteratorSeeker is the interface that wraps the 'seeks method'.
-type IteratorSeeker interface {
-	// First moves the iterator to the first key/value pair. If the iterator
-	// only contains one key/value pair then First and Last whould moves
-	// to the same key/value pair.
-	// It returns whether such pair exist.
-	First() bool
-
-	// Last moves the iterator to the last key/value pair. If the iterator
-	// only contains one key/value pair then First and Last whould moves
-	// to the same key/value pair.
-	// It returns whether such pair exist.
-	Last() bool
-
-	// Seek moves the iterator to the first key/value pair whose key is greater
-	// than or equal to the given key.
-	// It returns whether such pair exist.
-	//
-	// It is safe to modify the contents of the argument after Seek returns.
-	Seek(key []byte) bool
-
-	// Next moves the iterator to the next key/value pair.
-	// It returns whether the iterator is exhausted.
-	Next() bool
-
-	// Prev moves the iterator to the previous key/value pair.
-	// It returns whether the iterator is exhausted.
-	Prev() bool
-}
-
-// CommonIterator is the interface that wraps common interator methods.
-type CommonIterator interface {
-	IteratorSeeker
-
-	// util.Releaser is the interface that wraps basic Release method.
-	// When called Release will releases any resources associated with the
-	// iterator.
-	util.Releaser
-
-	// util.ReleaseSetter is the interface that wraps the basic SetReleaser
-	// method.
-	util.ReleaseSetter
-
-	// TODO: Remove this when ready.
-	Valid() bool
-
-	// Error returns any accumulated error. Exhausting all the key/value pairs
-	// is not considered to be an error.
-	Error() error
-}
-
-// Iterator iterates over a DB's key/value pairs in key order.
-//
-// When encouter an error any 'seeks method' will return false and will
-// yield no key/value pairs. The error can be queried by calling the Error
-// method. Calling Release is still necessary.
-//
-// An iterator must be released after use, but it is not necessary to read
-// an iterator until exhaustion.
-// Also, an iterator is not necessarily goroutine-safe, but it is safe to use
-// multiple iterators concurrently, with each in a dedicated goroutine.
-type Iterator interface {
-	CommonIterator
-
-	// Key returns the key of the current key/value pair, or nil if done.
-	// The caller should not modify the contents of the returned slice, and
-	// its contents may change on the next call to any 'seeks method'.
-	Key() []byte
-
-	// Value returns the key of the current key/value pair, or nil if done.
-	// The caller should not modify the contents of the returned slice, and
-	// its contents may change on the next call to any 'seeks method'.
-	Value() []byte
-}
-
-// ErrorCallbackSetter is the interface that wraps basic SetErrorCallback
-// method.
-//
-// ErrorCallbackSetter implemented by indexed and merged iterator.
-type ErrorCallbackSetter interface {
-	// SetErrorCallback allows set an error callback of the coresponding
-	// iterator. Use nil to clear the callback.
-	SetErrorCallback(f func(err error))
-}
-
-type emptyIterator struct {
-	util.BasicReleaser
-	err error
-}
-
-func (i *emptyIterator) rErr() {
-	if i.err == nil && i.Released() {
-		i.err = ErrIterReleased
-	}
-}
-
-func (*emptyIterator) Valid() bool            { return false }
-func (i *emptyIterator) First() bool          { i.rErr(); return false }
-func (i *emptyIterator) Last() bool           { i.rErr(); return false }
-func (i *emptyIterator) Seek(key []byte) bool { i.rErr(); return false }
-func (i *emptyIterator) Next() bool           { i.rErr(); return false }
-func (i *emptyIterator) Prev() bool           { i.rErr(); return false }
-func (*emptyIterator) Key() []byte            { return nil }
-func (*emptyIterator) Value() []byte          { return nil }
-func (i *emptyIterator) Error() error         { return i.err }
-
-// NewEmptyIterator creates an empty iterator. The err parameter can be
-// nil, but if not nil the given err will be returned by Error method.
-func NewEmptyIterator(err error) Iterator {
-	return &emptyIterator{err: err}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go
deleted file mode 100644
index 5ef8d5baf..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/iter_suite_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package iterator_test
-
-import (
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-func TestIterator(t *testing.T) {
-	testutil.RunSuite(t, "Iterator Suite")
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go
deleted file mode 100644
index 1a7e29df8..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type dir int
-
-const (
-	dirReleased dir = iota - 1
-	dirSOI
-	dirEOI
-	dirBackward
-	dirForward
-)
-
-type mergedIterator struct {
-	cmp    comparer.Comparer
-	iters  []Iterator
-	strict bool
-
-	keys     [][]byte
-	index    int
-	dir      dir
-	err      error
-	errf     func(err error)
-	releaser util.Releaser
-}
-
-func assertKey(key []byte) []byte {
-	if key == nil {
-		panic("leveldb/iterator: nil key")
-	}
-	return key
-}
-
-func (i *mergedIterator) iterErr(iter Iterator) bool {
-	if err := iter.Error(); err != nil {
-		if i.errf != nil {
-			i.errf(err)
-		}
-		if i.strict || !errors.IsCorrupted(err) {
-			i.err = err
-			return true
-		}
-	}
-	return false
-}
-
-func (i *mergedIterator) Valid() bool {
-	return i.err == nil && i.dir > dirEOI
-}
-
-func (i *mergedIterator) First() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	for x, iter := range i.iters {
-		switch {
-		case iter.First():
-			i.keys[x] = assertKey(iter.Key())
-		case i.iterErr(iter):
-			return false
-		default:
-			i.keys[x] = nil
-		}
-	}
-	i.dir = dirSOI
-	return i.next()
-}
-
-func (i *mergedIterator) Last() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	for x, iter := range i.iters {
-		switch {
-		case iter.Last():
-			i.keys[x] = assertKey(iter.Key())
-		case i.iterErr(iter):
-			return false
-		default:
-			i.keys[x] = nil
-		}
-	}
-	i.dir = dirEOI
-	return i.prev()
-}
-
-func (i *mergedIterator) Seek(key []byte) bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	for x, iter := range i.iters {
-		switch {
-		case iter.Seek(key):
-			i.keys[x] = assertKey(iter.Key())
-		case i.iterErr(iter):
-			return false
-		default:
-			i.keys[x] = nil
-		}
-	}
-	i.dir = dirSOI
-	return i.next()
-}
-
-func (i *mergedIterator) next() bool {
-	var key []byte
-	if i.dir == dirForward {
-		key = i.keys[i.index]
-	}
-	for x, tkey := range i.keys {
-		if tkey != nil && (key == nil || i.cmp.Compare(tkey, key) < 0) {
-			key = tkey
-			i.index = x
-		}
-	}
-	if key == nil {
-		i.dir = dirEOI
-		return false
-	}
-	i.dir = dirForward
-	return true
-}
-
-func (i *mergedIterator) Next() bool {
-	if i.dir == dirEOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	switch i.dir {
-	case dirSOI:
-		return i.First()
-	case dirBackward:
-		key := append([]byte{}, i.keys[i.index]...)
-		if !i.Seek(key) {
-			return false
-		}
-		return i.Next()
-	}
-
-	x := i.index
-	iter := i.iters[x]
-	switch {
-	case iter.Next():
-		i.keys[x] = assertKey(iter.Key())
-	case i.iterErr(iter):
-		return false
-	default:
-		i.keys[x] = nil
-	}
-	return i.next()
-}
-
-func (i *mergedIterator) prev() bool {
-	var key []byte
-	if i.dir == dirBackward {
-		key = i.keys[i.index]
-	}
-	for x, tkey := range i.keys {
-		if tkey != nil && (key == nil || i.cmp.Compare(tkey, key) > 0) {
-			key = tkey
-			i.index = x
-		}
-	}
-	if key == nil {
-		i.dir = dirSOI
-		return false
-	}
-	i.dir = dirBackward
-	return true
-}
-
-func (i *mergedIterator) Prev() bool {
-	if i.dir == dirSOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	switch i.dir {
-	case dirEOI:
-		return i.Last()
-	case dirForward:
-		key := append([]byte{}, i.keys[i.index]...)
-		for x, iter := range i.iters {
-			if x == i.index {
-				continue
-			}
-			seek := iter.Seek(key)
-			switch {
-			case seek && iter.Prev(), !seek && iter.Last():
-				i.keys[x] = assertKey(iter.Key())
-			case i.iterErr(iter):
-				return false
-			default:
-				i.keys[x] = nil
-			}
-		}
-	}
-
-	x := i.index
-	iter := i.iters[x]
-	switch {
-	case iter.Prev():
-		i.keys[x] = assertKey(iter.Key())
-	case i.iterErr(iter):
-		return false
-	default:
-		i.keys[x] = nil
-	}
-	return i.prev()
-}
-
-func (i *mergedIterator) Key() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.keys[i.index]
-}
-
-func (i *mergedIterator) Value() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.iters[i.index].Value()
-}
-
-func (i *mergedIterator) Release() {
-	if i.dir != dirReleased {
-		i.dir = dirReleased
-		for _, iter := range i.iters {
-			iter.Release()
-		}
-		i.iters = nil
-		i.keys = nil
-		if i.releaser != nil {
-			i.releaser.Release()
-			i.releaser = nil
-		}
-	}
-}
-
-func (i *mergedIterator) SetReleaser(releaser util.Releaser) {
-	if i.dir == dirReleased {
-		panic(util.ErrReleased)
-	}
-	if i.releaser != nil && releaser != nil {
-		panic(util.ErrHasReleaser)
-	}
-	i.releaser = releaser
-}
-
-func (i *mergedIterator) Error() error {
-	return i.err
-}
-
-func (i *mergedIterator) SetErrorCallback(f func(err error)) {
-	i.errf = f
-}
-
-// NewMergedIterator returns an iterator that merges its input. Walking the
-// resultant iterator will return all key/value pairs of all input iterators
-// in strictly increasing key order, as defined by cmp.
-// The input's key ranges may overlap, but there are assumed to be no duplicate
-// keys: if iters[i] contains a key k then iters[j] will not contain that key k.
-// None of the iters may be nil.
-//
-// If strict is true the any 'corruption errors' (i.e errors.IsCorrupted(err) == true)
-// won't be ignored and will halt 'merged iterator', otherwise the iterator will
-// continue to the next 'input iterator'.
-func NewMergedIterator(iters []Iterator, cmp comparer.Comparer, strict bool) Iterator {
-	return &mergedIterator{
-		iters:  iters,
-		cmp:    cmp,
-		strict: strict,
-		keys:   make([][]byte, len(iters)),
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go
deleted file mode 100644
index e523b63e4..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/iterator/merged_iter_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package iterator_test
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	. "github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-var _ = testutil.Defer(func() {
-	Describe("Merged iterator", func() {
-		Test := func(filled int, empty int) func() {
-			return func() {
-				It("Should iterates and seeks correctly", func(done Done) {
-					rnd := testutil.NewRand()
-
-					// Build key/value.
-					filledKV := make([]testutil.KeyValue, filled)
-					kv := testutil.KeyValue_Generate(nil, 100, 1, 10, 4, 4)
-					kv.Iterate(func(i int, key, value []byte) {
-						filledKV[rnd.Intn(filled)].Put(key, value)
-					})
-
-					// Create itearators.
-					iters := make([]Iterator, filled+empty)
-					for i := range iters {
-						if empty == 0 || (rnd.Int()%2 == 0 && filled > 0) {
-							filled--
-							Expect(filledKV[filled].Len()).ShouldNot(BeZero())
-							iters[i] = NewArrayIterator(filledKV[filled])
-						} else {
-							empty--
-							iters[i] = NewEmptyIterator(nil)
-						}
-					}
-
-					// Test the iterator.
-					t := testutil.IteratorTesting{
-						KeyValue: kv.Clone(),
-						Iter:     NewMergedIterator(iters, comparer.DefaultComparer, true),
-					}
-					testutil.DoIteratorTesting(&t)
-					done <- true
-				}, 1.5)
-			}
-		}
-
-		Describe("with three, all filled iterators", Test(3, 0))
-		Describe("with one filled, one empty iterators", Test(1, 1))
-		Describe("with one filled, two empty iterators", Test(1, 2))
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal.go b/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal.go
deleted file mode 100644
index 6519ec660..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal.go
+++ /dev/null
@@ -1,520 +0,0 @@
-// Copyright 2011 The LevelDB-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.
-
-// Taken from: https://code.google.com/p/leveldb-go/source/browse/leveldb/record/record.go?r=1d5ccbe03246da926391ee12d1c6caae054ff4b0
-// License, authors and contributors informations can be found at bellow URLs respectively:
-// 	https://code.google.com/p/leveldb-go/source/browse/LICENSE
-//	https://code.google.com/p/leveldb-go/source/browse/AUTHORS
-//  https://code.google.com/p/leveldb-go/source/browse/CONTRIBUTORS
-
-// Package journal reads and writes sequences of journals. Each journal is a stream
-// of bytes that completes before the next journal starts.
-//
-// When reading, call Next to obtain an io.Reader for the next journal. Next will
-// return io.EOF when there are no more journals. It is valid to call Next
-// without reading the current journal to exhaustion.
-//
-// When writing, call Next to obtain an io.Writer for the next journal. Calling
-// Next finishes the current journal. Call Close to finish the final journal.
-//
-// Optionally, call Flush to finish the current journal and flush the underlying
-// writer without starting a new journal. To start a new journal after flushing,
-// call Next.
-//
-// Neither Readers or Writers are safe to use concurrently.
-//
-// Example code:
-//	func read(r io.Reader) ([]string, error) {
-//		var ss []string
-//		journals := journal.NewReader(r, nil, true, true)
-//		for {
-//			j, err := journals.Next()
-//			if err == io.EOF {
-//				break
-//			}
-//			if err != nil {
-//				return nil, err
-//			}
-//			s, err := ioutil.ReadAll(j)
-//			if err != nil {
-//				return nil, err
-//			}
-//			ss = append(ss, string(s))
-//		}
-//		return ss, nil
-//	}
-//
-//	func write(w io.Writer, ss []string) error {
-//		journals := journal.NewWriter(w)
-//		for _, s := range ss {
-//			j, err := journals.Next()
-//			if err != nil {
-//				return err
-//			}
-//			if _, err := j.Write([]byte(s)), err != nil {
-//				return err
-//			}
-//		}
-//		return journals.Close()
-//	}
-//
-// The wire format is that the stream is divided into 32KiB blocks, and each
-// block contains a number of tightly packed chunks. Chunks cannot cross block
-// boundaries. The last block may be shorter than 32 KiB. Any unused bytes in a
-// block must be zero.
-//
-// A journal maps to one or more chunks. Each chunk has a 7 byte header (a 4
-// byte checksum, a 2 byte little-endian uint16 length, and a 1 byte chunk type)
-// followed by a payload. The checksum is over the chunk type and the payload.
-//
-// There are four chunk types: whether the chunk is the full journal, or the
-// first, middle or last chunk of a multi-chunk journal. A multi-chunk journal
-// has one first chunk, zero or more middle chunks, and one last chunk.
-//
-// The wire format allows for limited recovery in the face of data corruption:
-// on a format error (such as a checksum mismatch), the reader moves to the
-// next block and looks for the next full or first chunk.
-package journal
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// These constants are part of the wire format and should not be changed.
-const (
-	fullChunkType   = 1
-	firstChunkType  = 2
-	middleChunkType = 3
-	lastChunkType   = 4
-)
-
-const (
-	blockSize  = 32 * 1024
-	headerSize = 7
-)
-
-type flusher interface {
-	Flush() error
-}
-
-// ErrCorrupted is the error type that generated by corrupted block or chunk.
-type ErrCorrupted struct {
-	Size   int
-	Reason string
-}
-
-func (e *ErrCorrupted) Error() string {
-	return fmt.Sprintf("leveldb/journal: block/chunk corrupted: %s (%d bytes)", e.Reason, e.Size)
-}
-
-// Dropper is the interface that wrap simple Drop method. The Drop
-// method will be called when the journal reader dropping a block or chunk.
-type Dropper interface {
-	Drop(err error)
-}
-
-// Reader reads journals from an underlying io.Reader.
-type Reader struct {
-	// r is the underlying reader.
-	r io.Reader
-	// the dropper.
-	dropper Dropper
-	// strict flag.
-	strict bool
-	// checksum flag.
-	checksum bool
-	// seq is the sequence number of the current journal.
-	seq int
-	// buf[i:j] is the unread portion of the current chunk's payload.
-	// The low bound, i, excludes the chunk header.
-	i, j int
-	// n is the number of bytes of buf that are valid. Once reading has started,
-	// only the final block can have n < blockSize.
-	n int
-	// last is whether the current chunk is the last chunk of the journal.
-	last bool
-	// err is any accumulated error.
-	err error
-	// buf is the buffer.
-	buf [blockSize]byte
-}
-
-// NewReader returns a new reader. The dropper may be nil, and if
-// strict is true then corrupted or invalid chunk will halt the journal
-// reader entirely.
-func NewReader(r io.Reader, dropper Dropper, strict, checksum bool) *Reader {
-	return &Reader{
-		r:        r,
-		dropper:  dropper,
-		strict:   strict,
-		checksum: checksum,
-		last:     true,
-	}
-}
-
-var errSkip = errors.New("leveldb/journal: skipped")
-
-func (r *Reader) corrupt(n int, reason string, skip bool) error {
-	if r.dropper != nil {
-		r.dropper.Drop(&ErrCorrupted{n, reason})
-	}
-	if r.strict && !skip {
-		r.err = errors.NewErrCorrupted(nil, &ErrCorrupted{n, reason})
-		return r.err
-	}
-	return errSkip
-}
-
-// nextChunk sets r.buf[r.i:r.j] to hold the next chunk's payload, reading the
-// next block into the buffer if necessary.
-func (r *Reader) nextChunk(first bool) error {
-	for {
-		if r.j+headerSize <= r.n {
-			checksum := binary.LittleEndian.Uint32(r.buf[r.j+0 : r.j+4])
-			length := binary.LittleEndian.Uint16(r.buf[r.j+4 : r.j+6])
-			chunkType := r.buf[r.j+6]
-
-			if checksum == 0 && length == 0 && chunkType == 0 {
-				// Drop entire block.
-				m := r.n - r.j
-				r.i = r.n
-				r.j = r.n
-				return r.corrupt(m, "zero header", false)
-			} else {
-				m := r.n - r.j
-				r.i = r.j + headerSize
-				r.j = r.j + headerSize + int(length)
-				if r.j > r.n {
-					// Drop entire block.
-					r.i = r.n
-					r.j = r.n
-					return r.corrupt(m, "chunk length overflows block", false)
-				} else if r.checksum && checksum != util.NewCRC(r.buf[r.i-1:r.j]).Value() {
-					// Drop entire block.
-					r.i = r.n
-					r.j = r.n
-					return r.corrupt(m, "checksum mismatch", false)
-				}
-			}
-			if first && chunkType != fullChunkType && chunkType != firstChunkType {
-				m := r.j - r.i
-				r.i = r.j
-				// Report the error, but skip it.
-				return r.corrupt(m+headerSize, "orphan chunk", true)
-			}
-			r.last = chunkType == fullChunkType || chunkType == lastChunkType
-			return nil
-		}
-
-		// The last block.
-		if r.n < blockSize && r.n > 0 {
-			if !first {
-				return r.corrupt(0, "missing chunk part", false)
-			}
-			r.err = io.EOF
-			return r.err
-		}
-
-		// Read block.
-		n, err := io.ReadFull(r.r, r.buf[:])
-		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return err
-		}
-		if n == 0 {
-			if !first {
-				return r.corrupt(0, "missing chunk part", false)
-			}
-			r.err = io.EOF
-			return r.err
-		}
-		r.i, r.j, r.n = 0, 0, n
-	}
-}
-
-// Next returns a reader for the next journal. It returns io.EOF if there are no
-// more journals. The reader returned becomes stale after the next Next call,
-// and should no longer be used. If strict is false, the reader will returns
-// io.ErrUnexpectedEOF error when found corrupted journal.
-func (r *Reader) Next() (io.Reader, error) {
-	r.seq++
-	if r.err != nil {
-		return nil, r.err
-	}
-	r.i = r.j
-	for {
-		if err := r.nextChunk(true); err == nil {
-			break
-		} else if err != errSkip {
-			return nil, err
-		}
-	}
-	return &singleReader{r, r.seq, nil}, nil
-}
-
-// Reset resets the journal reader, allows reuse of the journal reader. Reset returns
-// last accumulated error.
-func (r *Reader) Reset(reader io.Reader, dropper Dropper, strict, checksum bool) error {
-	r.seq++
-	err := r.err
-	r.r = reader
-	r.dropper = dropper
-	r.strict = strict
-	r.checksum = checksum
-	r.i = 0
-	r.j = 0
-	r.n = 0
-	r.last = true
-	r.err = nil
-	return err
-}
-
-type singleReader struct {
-	r   *Reader
-	seq int
-	err error
-}
-
-func (x *singleReader) Read(p []byte) (int, error) {
-	r := x.r
-	if r.seq != x.seq {
-		return 0, errors.New("leveldb/journal: stale reader")
-	}
-	if x.err != nil {
-		return 0, x.err
-	}
-	if r.err != nil {
-		return 0, r.err
-	}
-	for r.i == r.j {
-		if r.last {
-			return 0, io.EOF
-		}
-		x.err = r.nextChunk(false)
-		if x.err != nil {
-			if x.err == errSkip {
-				x.err = io.ErrUnexpectedEOF
-			}
-			return 0, x.err
-		}
-	}
-	n := copy(p, r.buf[r.i:r.j])
-	r.i += n
-	return n, nil
-}
-
-func (x *singleReader) ReadByte() (byte, error) {
-	r := x.r
-	if r.seq != x.seq {
-		return 0, errors.New("leveldb/journal: stale reader")
-	}
-	if x.err != nil {
-		return 0, x.err
-	}
-	if r.err != nil {
-		return 0, r.err
-	}
-	for r.i == r.j {
-		if r.last {
-			return 0, io.EOF
-		}
-		x.err = r.nextChunk(false)
-		if x.err != nil {
-			if x.err == errSkip {
-				x.err = io.ErrUnexpectedEOF
-			}
-			return 0, x.err
-		}
-	}
-	c := r.buf[r.i]
-	r.i++
-	return c, nil
-}
-
-// Writer writes journals to an underlying io.Writer.
-type Writer struct {
-	// w is the underlying writer.
-	w io.Writer
-	// seq is the sequence number of the current journal.
-	seq int
-	// f is w as a flusher.
-	f flusher
-	// buf[i:j] is the bytes that will become the current chunk.
-	// The low bound, i, includes the chunk header.
-	i, j int
-	// buf[:written] has already been written to w.
-	// written is zero unless Flush has been called.
-	written int
-	// first is whether the current chunk is the first chunk of the journal.
-	first bool
-	// pending is whether a chunk is buffered but not yet written.
-	pending bool
-	// err is any accumulated error.
-	err error
-	// buf is the buffer.
-	buf [blockSize]byte
-}
-
-// NewWriter returns a new Writer.
-func NewWriter(w io.Writer) *Writer {
-	f, _ := w.(flusher)
-	return &Writer{
-		w: w,
-		f: f,
-	}
-}
-
-// fillHeader fills in the header for the pending chunk.
-func (w *Writer) fillHeader(last bool) {
-	if w.i+headerSize > w.j || w.j > blockSize {
-		panic("leveldb/journal: bad writer state")
-	}
-	if last {
-		if w.first {
-			w.buf[w.i+6] = fullChunkType
-		} else {
-			w.buf[w.i+6] = lastChunkType
-		}
-	} else {
-		if w.first {
-			w.buf[w.i+6] = firstChunkType
-		} else {
-			w.buf[w.i+6] = middleChunkType
-		}
-	}
-	binary.LittleEndian.PutUint32(w.buf[w.i+0:w.i+4], util.NewCRC(w.buf[w.i+6:w.j]).Value())
-	binary.LittleEndian.PutUint16(w.buf[w.i+4:w.i+6], uint16(w.j-w.i-headerSize))
-}
-
-// writeBlock writes the buffered block to the underlying writer, and reserves
-// space for the next chunk's header.
-func (w *Writer) writeBlock() {
-	_, w.err = w.w.Write(w.buf[w.written:])
-	w.i = 0
-	w.j = headerSize
-	w.written = 0
-}
-
-// writePending finishes the current journal and writes the buffer to the
-// underlying writer.
-func (w *Writer) writePending() {
-	if w.err != nil {
-		return
-	}
-	if w.pending {
-		w.fillHeader(true)
-		w.pending = false
-	}
-	_, w.err = w.w.Write(w.buf[w.written:w.j])
-	w.written = w.j
-}
-
-// Close finishes the current journal and closes the writer.
-func (w *Writer) Close() error {
-	w.seq++
-	w.writePending()
-	if w.err != nil {
-		return w.err
-	}
-	w.err = errors.New("leveldb/journal: closed Writer")
-	return nil
-}
-
-// Flush finishes the current journal, writes to the underlying writer, and
-// flushes it if that writer implements interface{ Flush() error }.
-func (w *Writer) Flush() error {
-	w.seq++
-	w.writePending()
-	if w.err != nil {
-		return w.err
-	}
-	if w.f != nil {
-		w.err = w.f.Flush()
-		return w.err
-	}
-	return nil
-}
-
-// Reset resets the journal writer, allows reuse of the journal writer. Reset
-// will also closes the journal writer if not already.
-func (w *Writer) Reset(writer io.Writer) (err error) {
-	w.seq++
-	if w.err == nil {
-		w.writePending()
-		err = w.err
-	}
-	w.w = writer
-	w.f, _ = writer.(flusher)
-	w.i = 0
-	w.j = 0
-	w.written = 0
-	w.first = false
-	w.pending = false
-	w.err = nil
-	return
-}
-
-// Next returns a writer for the next journal. The writer returned becomes stale
-// after the next Close, Flush or Next call, and should no longer be used.
-func (w *Writer) Next() (io.Writer, error) {
-	w.seq++
-	if w.err != nil {
-		return nil, w.err
-	}
-	if w.pending {
-		w.fillHeader(true)
-	}
-	w.i = w.j
-	w.j = w.j + headerSize
-	// Check if there is room in the block for the header.
-	if w.j > blockSize {
-		// Fill in the rest of the block with zeroes.
-		for k := w.i; k < blockSize; k++ {
-			w.buf[k] = 0
-		}
-		w.writeBlock()
-		if w.err != nil {
-			return nil, w.err
-		}
-	}
-	w.first = true
-	w.pending = true
-	return singleWriter{w, w.seq}, nil
-}
-
-type singleWriter struct {
-	w   *Writer
-	seq int
-}
-
-func (x singleWriter) Write(p []byte) (int, error) {
-	w := x.w
-	if w.seq != x.seq {
-		return 0, errors.New("leveldb/journal: stale writer")
-	}
-	if w.err != nil {
-		return 0, w.err
-	}
-	n0 := len(p)
-	for len(p) > 0 {
-		// Write a block, if it is full.
-		if w.j == blockSize {
-			w.fillHeader(false)
-			w.writeBlock()
-			if w.err != nil {
-				return 0, w.err
-			}
-			w.first = false
-		}
-		// Copy bytes into the buffer.
-		n := copy(w.buf[w.j:], p)
-		w.j += n
-		p = p[n:]
-	}
-	return n0, nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal_test.go
deleted file mode 100644
index 0fcf22599..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/journal/journal_test.go
+++ /dev/null
@@ -1,818 +0,0 @@
-// Copyright 2011 The LevelDB-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.
-
-// Taken from: https://code.google.com/p/leveldb-go/source/browse/leveldb/record/record_test.go?r=df1fa28f7f3be6c3935548169002309c12967135
-// License, authors and contributors informations can be found at bellow URLs respectively:
-// 	https://code.google.com/p/leveldb-go/source/browse/LICENSE
-//	https://code.google.com/p/leveldb-go/source/browse/AUTHORS
-//  https://code.google.com/p/leveldb-go/source/browse/CONTRIBUTORS
-
-package journal
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"strings"
-	"testing"
-)
-
-type dropper struct {
-	t *testing.T
-}
-
-func (d dropper) Drop(err error) {
-	d.t.Log(err)
-}
-
-func short(s string) string {
-	if len(s) < 64 {
-		return s
-	}
-	return fmt.Sprintf("%s...(skipping %d bytes)...%s", s[:20], len(s)-40, s[len(s)-20:])
-}
-
-// big returns a string of length n, composed of repetitions of partial.
-func big(partial string, n int) string {
-	return strings.Repeat(partial, n/len(partial)+1)[:n]
-}
-
-func TestEmpty(t *testing.T) {
-	buf := new(bytes.Buffer)
-	r := NewReader(buf, dropper{t}, true, true)
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("got %v, want %v", err, io.EOF)
-	}
-}
-
-func testGenerator(t *testing.T, reset func(), gen func() (string, bool)) {
-	buf := new(bytes.Buffer)
-
-	reset()
-	w := NewWriter(buf)
-	for {
-		s, ok := gen()
-		if !ok {
-			break
-		}
-		ww, err := w.Next()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := ww.Write([]byte(s)); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	reset()
-	r := NewReader(buf, dropper{t}, true, true)
-	for {
-		s, ok := gen()
-		if !ok {
-			break
-		}
-		rr, err := r.Next()
-		if err != nil {
-			t.Fatal(err)
-		}
-		x, err := ioutil.ReadAll(rr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(x) != s {
-			t.Fatalf("got %q, want %q", short(string(x)), short(s))
-		}
-	}
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("got %v, want %v", err, io.EOF)
-	}
-}
-
-func testLiterals(t *testing.T, s []string) {
-	var i int
-	reset := func() {
-		i = 0
-	}
-	gen := func() (string, bool) {
-		if i == len(s) {
-			return "", false
-		}
-		i++
-		return s[i-1], true
-	}
-	testGenerator(t, reset, gen)
-}
-
-func TestMany(t *testing.T) {
-	const n = 1e5
-	var i int
-	reset := func() {
-		i = 0
-	}
-	gen := func() (string, bool) {
-		if i == n {
-			return "", false
-		}
-		i++
-		return fmt.Sprintf("%d.", i-1), true
-	}
-	testGenerator(t, reset, gen)
-}
-
-func TestRandom(t *testing.T) {
-	const n = 1e2
-	var (
-		i int
-		r *rand.Rand
-	)
-	reset := func() {
-		i, r = 0, rand.New(rand.NewSource(0))
-	}
-	gen := func() (string, bool) {
-		if i == n {
-			return "", false
-		}
-		i++
-		return strings.Repeat(string(uint8(i)), r.Intn(2*blockSize+16)), true
-	}
-	testGenerator(t, reset, gen)
-}
-
-func TestBasic(t *testing.T) {
-	testLiterals(t, []string{
-		strings.Repeat("a", 1000),
-		strings.Repeat("b", 97270),
-		strings.Repeat("c", 8000),
-	})
-}
-
-func TestBoundary(t *testing.T) {
-	for i := blockSize - 16; i < blockSize+16; i++ {
-		s0 := big("abcd", i)
-		for j := blockSize - 16; j < blockSize+16; j++ {
-			s1 := big("ABCDE", j)
-			testLiterals(t, []string{s0, s1})
-			testLiterals(t, []string{s0, "", s1})
-			testLiterals(t, []string{s0, "x", s1})
-		}
-	}
-}
-
-func TestFlush(t *testing.T) {
-	buf := new(bytes.Buffer)
-	w := NewWriter(buf)
-	// Write a couple of records. Everything should still be held
-	// in the record.Writer buffer, so that buf.Len should be 0.
-	w0, _ := w.Next()
-	w0.Write([]byte("0"))
-	w1, _ := w.Next()
-	w1.Write([]byte("11"))
-	if got, want := buf.Len(), 0; got != want {
-		t.Fatalf("buffer length #0: got %d want %d", got, want)
-	}
-	// Flush the record.Writer buffer, which should yield 17 bytes.
-	// 17 = 2*7 + 1 + 2, which is two headers and 1 + 2 payload bytes.
-	if err := w.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if got, want := buf.Len(), 17; got != want {
-		t.Fatalf("buffer length #1: got %d want %d", got, want)
-	}
-	// Do another write, one that isn't large enough to complete the block.
-	// The write should not have flowed through to buf.
-	w2, _ := w.Next()
-	w2.Write(bytes.Repeat([]byte("2"), 10000))
-	if got, want := buf.Len(), 17; got != want {
-		t.Fatalf("buffer length #2: got %d want %d", got, want)
-	}
-	// Flushing should get us up to 10024 bytes written.
-	// 10024 = 17 + 7 + 10000.
-	if err := w.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if got, want := buf.Len(), 10024; got != want {
-		t.Fatalf("buffer length #3: got %d want %d", got, want)
-	}
-	// Do a bigger write, one that completes the current block.
-	// We should now have 32768 bytes (a complete block), without
-	// an explicit flush.
-	w3, _ := w.Next()
-	w3.Write(bytes.Repeat([]byte("3"), 40000))
-	if got, want := buf.Len(), 32768; got != want {
-		t.Fatalf("buffer length #4: got %d want %d", got, want)
-	}
-	// Flushing should get us up to 50038 bytes written.
-	// 50038 = 10024 + 2*7 + 40000. There are two headers because
-	// the one record was split into two chunks.
-	if err := w.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if got, want := buf.Len(), 50038; got != want {
-		t.Fatalf("buffer length #5: got %d want %d", got, want)
-	}
-	// Check that reading those records give the right lengths.
-	r := NewReader(buf, dropper{t}, true, true)
-	wants := []int64{1, 2, 10000, 40000}
-	for i, want := range wants {
-		rr, _ := r.Next()
-		n, err := io.Copy(ioutil.Discard, rr)
-		if err != nil {
-			t.Fatalf("read #%d: %v", i, err)
-		}
-		if n != want {
-			t.Fatalf("read #%d: got %d bytes want %d", i, n, want)
-		}
-	}
-}
-
-func TestNonExhaustiveRead(t *testing.T) {
-	const n = 100
-	buf := new(bytes.Buffer)
-	p := make([]byte, 10)
-	rnd := rand.New(rand.NewSource(1))
-
-	w := NewWriter(buf)
-	for i := 0; i < n; i++ {
-		length := len(p) + rnd.Intn(3*blockSize)
-		s := string(uint8(i)) + "123456789abcdefgh"
-		ww, _ := w.Next()
-		ww.Write([]byte(big(s, length)))
-	}
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	r := NewReader(buf, dropper{t}, true, true)
-	for i := 0; i < n; i++ {
-		rr, _ := r.Next()
-		_, err := io.ReadFull(rr, p)
-		if err != nil {
-			t.Fatal(err)
-		}
-		want := string(uint8(i)) + "123456789"
-		if got := string(p); got != want {
-			t.Fatalf("read #%d: got %q want %q", i, got, want)
-		}
-	}
-}
-
-func TestStaleReader(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-	w0, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	w0.Write([]byte("0"))
-	w1, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	w1.Write([]byte("11"))
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	r := NewReader(buf, dropper{t}, true, true)
-	r0, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	r1, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := make([]byte, 1)
-	if _, err := r0.Read(p); err == nil || !strings.Contains(err.Error(), "stale") {
-		t.Fatalf("stale read #0: unexpected error: %v", err)
-	}
-	if _, err := r1.Read(p); err != nil {
-		t.Fatalf("fresh read #1: got %v want nil error", err)
-	}
-	if p[0] != '1' {
-		t.Fatalf("fresh read #1: byte contents: got '%c' want '1'", p[0])
-	}
-}
-
-func TestStaleWriter(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-	w0, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	w1, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := w0.Write([]byte("0")); err == nil || !strings.Contains(err.Error(), "stale") {
-		t.Fatalf("stale write #0: unexpected error: %v", err)
-	}
-	if _, err := w1.Write([]byte("11")); err != nil {
-		t.Fatalf("fresh write #1: got %v want nil error", err)
-	}
-	if err := w.Flush(); err != nil {
-		t.Fatalf("flush: %v", err)
-	}
-	if _, err := w1.Write([]byte("0")); err == nil || !strings.Contains(err.Error(), "stale") {
-		t.Fatalf("stale write #1: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_MissingLastBlock(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-1024)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Cut the last block.
-	b := buf.Bytes()[:blockSize]
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read.
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if n != blockSize-1024 {
-		t.Fatalf("read #0: got %d bytes want %d", n, blockSize-1024)
-	}
-
-	// Second read.
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != io.ErrUnexpectedEOF {
-		t.Fatalf("read #1: unexpected error: %v", err)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_CorruptedFirstBlock(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize/2)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	// Third record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+1)); err != nil {
-		t.Fatalf("write #2: unexpected error: %v", err)
-	}
-
-	// Fourth record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+2)); err != nil {
-		t.Fatalf("write #3: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	b := buf.Bytes()
-	// Corrupting block #0.
-	for i := 0; i < 1024; i++ {
-		b[i] = '1'
-	}
-
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read (third record).
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if want := int64(blockSize-headerSize) + 1; n != want {
-		t.Fatalf("read #0: got %d bytes want %d", n, want)
-	}
-
-	// Second read (fourth record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #1: %v", err)
-	}
-	if want := int64(blockSize-headerSize) + 2; n != want {
-		t.Fatalf("read #1: got %d bytes want %d", n, want)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_CorruptedMiddleBlock(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize/2)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	// Third record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+1)); err != nil {
-		t.Fatalf("write #2: unexpected error: %v", err)
-	}
-
-	// Fourth record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+2)); err != nil {
-		t.Fatalf("write #3: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	b := buf.Bytes()
-	// Corrupting block #1.
-	for i := 0; i < 1024; i++ {
-		b[blockSize+i] = '1'
-	}
-
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read (first record).
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if want := int64(blockSize / 2); n != want {
-		t.Fatalf("read #0: got %d bytes want %d", n, want)
-	}
-
-	// Second read (second record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != io.ErrUnexpectedEOF {
-		t.Fatalf("read #1: unexpected error: %v", err)
-	}
-
-	// Third read (fourth record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #2: %v", err)
-	}
-	if want := int64(blockSize-headerSize) + 2; n != want {
-		t.Fatalf("read #2: got %d bytes want %d", n, want)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_CorruptedLastBlock(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize/2)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	// Third record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+1)); err != nil {
-		t.Fatalf("write #2: unexpected error: %v", err)
-	}
-
-	// Fourth record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+2)); err != nil {
-		t.Fatalf("write #3: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	b := buf.Bytes()
-	// Corrupting block #3.
-	for i := len(b) - 1; i > len(b)-1024; i-- {
-		b[i] = '1'
-	}
-
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read (first record).
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if want := int64(blockSize / 2); n != want {
-		t.Fatalf("read #0: got %d bytes want %d", n, want)
-	}
-
-	// Second read (second record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #1: %v", err)
-	}
-	if want := int64(blockSize - headerSize); n != want {
-		t.Fatalf("read #1: got %d bytes want %d", n, want)
-	}
-
-	// Third read (third record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #2: %v", err)
-	}
-	if want := int64(blockSize-headerSize) + 1; n != want {
-		t.Fatalf("read #2: got %d bytes want %d", n, want)
-	}
-
-	// Fourth read (fourth record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != io.ErrUnexpectedEOF {
-		t.Fatalf("read #3: unexpected error: %v", err)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_FirstChuckLengthOverflow(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize/2)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	// Third record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+1)); err != nil {
-		t.Fatalf("write #2: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	b := buf.Bytes()
-	// Corrupting record #1.
-	x := blockSize
-	binary.LittleEndian.PutUint16(b[x+4:], 0xffff)
-
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read (first record).
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if want := int64(blockSize / 2); n != want {
-		t.Fatalf("read #0: got %d bytes want %d", n, want)
-	}
-
-	// Second read (second record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != io.ErrUnexpectedEOF {
-		t.Fatalf("read #1: unexpected error: %v", err)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
-
-func TestCorrupt_MiddleChuckLengthOverflow(t *testing.T) {
-	buf := new(bytes.Buffer)
-
-	w := NewWriter(buf)
-
-	// First record.
-	ww, err := w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize/2)); err != nil {
-		t.Fatalf("write #0: unexpected error: %v", err)
-	}
-
-	// Second record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), blockSize-headerSize)); err != nil {
-		t.Fatalf("write #1: unexpected error: %v", err)
-	}
-
-	// Third record.
-	ww, err = w.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ww.Write(bytes.Repeat([]byte("0"), (blockSize-headerSize)+1)); err != nil {
-		t.Fatalf("write #2: unexpected error: %v", err)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	b := buf.Bytes()
-	// Corrupting record #1.
-	x := blockSize/2 + headerSize
-	binary.LittleEndian.PutUint16(b[x+4:], 0xffff)
-
-	r := NewReader(bytes.NewReader(b), dropper{t}, false, true)
-
-	// First read (first record).
-	rr, err := r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err := io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #0: %v", err)
-	}
-	if want := int64(blockSize / 2); n != want {
-		t.Fatalf("read #0: got %d bytes want %d", n, want)
-	}
-
-	// Second read (third record).
-	rr, err = r.Next()
-	if err != nil {
-		t.Fatal(err)
-	}
-	n, err = io.Copy(ioutil.Discard, rr)
-	if err != nil {
-		t.Fatalf("read #1: %v", err)
-	}
-	if want := int64(blockSize-headerSize) + 1; n != want {
-		t.Fatalf("read #1: got %d bytes want %d", n, want)
-	}
-
-	if _, err := r.Next(); err != io.EOF {
-		t.Fatalf("last next: unexpected error: %v", err)
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/key.go b/vendor/github.com/syndtr/goleveldb/leveldb/key.go
deleted file mode 100644
index 572ae8150..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/key.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-)
-
-type ErrIkeyCorrupted struct {
-	Ikey   []byte
-	Reason string
-}
-
-func (e *ErrIkeyCorrupted) Error() string {
-	return fmt.Sprintf("leveldb: iKey %q corrupted: %s", e.Ikey, e.Reason)
-}
-
-func newErrIkeyCorrupted(ikey []byte, reason string) error {
-	return errors.NewErrCorrupted(nil, &ErrIkeyCorrupted{append([]byte{}, ikey...), reason})
-}
-
-type kType int
-
-func (kt kType) String() string {
-	switch kt {
-	case ktDel:
-		return "d"
-	case ktVal:
-		return "v"
-	}
-	return "x"
-}
-
-// Value types encoded as the last component of internal keys.
-// Don't modify; this value are saved to disk.
-const (
-	ktDel kType = iota
-	ktVal
-)
-
-// ktSeek defines the kType that should be passed when constructing an
-// internal key for seeking to a particular sequence number (since we
-// sort sequence numbers in decreasing order and the value type is
-// embedded as the low 8 bits in the sequence number in internal keys,
-// we need to use the highest-numbered ValueType, not the lowest).
-const ktSeek = ktVal
-
-const (
-	// Maximum value possible for sequence number; the 8-bits are
-	// used by value type, so its can packed together in single
-	// 64-bit integer.
-	kMaxSeq uint64 = (uint64(1) << 56) - 1
-	// Maximum value possible for packed sequence number and type.
-	kMaxNum uint64 = (kMaxSeq << 8) | uint64(ktSeek)
-)
-
-// Maximum number encoded in bytes.
-var kMaxNumBytes = make([]byte, 8)
-
-func init() {
-	binary.LittleEndian.PutUint64(kMaxNumBytes, kMaxNum)
-}
-
-type iKey []byte
-
-func newIkey(ukey []byte, seq uint64, kt kType) iKey {
-	if seq > kMaxSeq {
-		panic("leveldb: invalid sequence number")
-	} else if kt > ktVal {
-		panic("leveldb: invalid type")
-	}
-
-	ik := make(iKey, len(ukey)+8)
-	copy(ik, ukey)
-	binary.LittleEndian.PutUint64(ik[len(ukey):], (seq<<8)|uint64(kt))
-	return ik
-}
-
-func parseIkey(ik []byte) (ukey []byte, seq uint64, kt kType, err error) {
-	if len(ik) < 8 {
-		return nil, 0, 0, newErrIkeyCorrupted(ik, "invalid length")
-	}
-	num := binary.LittleEndian.Uint64(ik[len(ik)-8:])
-	seq, kt = uint64(num>>8), kType(num&0xff)
-	if kt > ktVal {
-		return nil, 0, 0, newErrIkeyCorrupted(ik, "invalid type")
-	}
-	ukey = ik[:len(ik)-8]
-	return
-}
-
-func validIkey(ik []byte) bool {
-	_, _, _, err := parseIkey(ik)
-	return err == nil
-}
-
-func (ik iKey) assert() {
-	if ik == nil {
-		panic("leveldb: nil iKey")
-	}
-	if len(ik) < 8 {
-		panic(fmt.Sprintf("leveldb: iKey %q, len=%d: invalid length", []byte(ik), len(ik)))
-	}
-}
-
-func (ik iKey) ukey() []byte {
-	ik.assert()
-	return ik[:len(ik)-8]
-}
-
-func (ik iKey) num() uint64 {
-	ik.assert()
-	return binary.LittleEndian.Uint64(ik[len(ik)-8:])
-}
-
-func (ik iKey) parseNum() (seq uint64, kt kType) {
-	num := ik.num()
-	seq, kt = uint64(num>>8), kType(num&0xff)
-	if kt > ktVal {
-		panic(fmt.Sprintf("leveldb: iKey %q, len=%d: invalid type %#x", []byte(ik), len(ik), kt))
-	}
-	return
-}
-
-func (ik iKey) String() string {
-	if ik == nil {
-		return "<nil>"
-	}
-
-	if ukey, seq, kt, err := parseIkey(ik); err == nil {
-		return fmt.Sprintf("%s,%s%d", shorten(string(ukey)), kt, seq)
-	} else {
-		return "<invalid>"
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/key_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/key_test.go
deleted file mode 100644
index 30eadf784..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/key_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-)
-
-var defaultIComparer = &iComparer{comparer.DefaultComparer}
-
-func ikey(key string, seq uint64, kt kType) iKey {
-	return newIkey([]byte(key), uint64(seq), kt)
-}
-
-func shortSep(a, b []byte) []byte {
-	dst := make([]byte, len(a))
-	dst = defaultIComparer.Separator(dst[:0], a, b)
-	if dst == nil {
-		return a
-	}
-	return dst
-}
-
-func shortSuccessor(b []byte) []byte {
-	dst := make([]byte, len(b))
-	dst = defaultIComparer.Successor(dst[:0], b)
-	if dst == nil {
-		return b
-	}
-	return dst
-}
-
-func testSingleKey(t *testing.T, key string, seq uint64, kt kType) {
-	ik := ikey(key, seq, kt)
-
-	if !bytes.Equal(ik.ukey(), []byte(key)) {
-		t.Errorf("user key does not equal, got %v, want %v", string(ik.ukey()), key)
-	}
-
-	rseq, rt := ik.parseNum()
-	if rseq != seq {
-		t.Errorf("seq number does not equal, got %v, want %v", rseq, seq)
-	}
-	if rt != kt {
-		t.Errorf("type does not equal, got %v, want %v", rt, kt)
-	}
-
-	if rukey, rseq, rt, kerr := parseIkey(ik); kerr == nil {
-		if !bytes.Equal(rukey, []byte(key)) {
-			t.Errorf("user key does not equal, got %v, want %v", string(ik.ukey()), key)
-		}
-		if rseq != seq {
-			t.Errorf("seq number does not equal, got %v, want %v", rseq, seq)
-		}
-		if rt != kt {
-			t.Errorf("type does not equal, got %v, want %v", rt, kt)
-		}
-	} else {
-		t.Errorf("key error: %v", kerr)
-	}
-}
-
-func TestIkey_EncodeDecode(t *testing.T) {
-	keys := []string{"", "k", "hello", "longggggggggggggggggggggg"}
-	seqs := []uint64{
-		1, 2, 3,
-		(1 << 8) - 1, 1 << 8, (1 << 8) + 1,
-		(1 << 16) - 1, 1 << 16, (1 << 16) + 1,
-		(1 << 32) - 1, 1 << 32, (1 << 32) + 1,
-	}
-	for _, key := range keys {
-		for _, seq := range seqs {
-			testSingleKey(t, key, seq, ktVal)
-			testSingleKey(t, "hello", 1, ktDel)
-		}
-	}
-}
-
-func assertBytes(t *testing.T, want, got []byte) {
-	if !bytes.Equal(got, want) {
-		t.Errorf("assert failed, got %v, want %v", got, want)
-	}
-}
-
-func TestIkeyShortSeparator(t *testing.T) {
-	// When user keys are same
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("foo", 99, ktVal)))
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("foo", 101, ktVal)))
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("foo", 100, ktVal)))
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("foo", 100, ktDel)))
-
-	// When user keys are misordered
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("bar", 99, ktVal)))
-
-	// When user keys are different, but correctly ordered
-	assertBytes(t, ikey("g", uint64(kMaxSeq), ktSeek),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("hello", 200, ktVal)))
-
-	// When start user key is prefix of limit user key
-	assertBytes(t, ikey("foo", 100, ktVal),
-		shortSep(ikey("foo", 100, ktVal),
-			ikey("foobar", 200, ktVal)))
-
-	// When limit user key is prefix of start user key
-	assertBytes(t, ikey("foobar", 100, ktVal),
-		shortSep(ikey("foobar", 100, ktVal),
-			ikey("foo", 200, ktVal)))
-}
-
-func TestIkeyShortestSuccessor(t *testing.T) {
-	assertBytes(t, ikey("g", uint64(kMaxSeq), ktSeek),
-		shortSuccessor(ikey("foo", 100, ktVal)))
-	assertBytes(t, ikey("\xff\xff", 100, ktVal),
-		shortSuccessor(ikey("\xff\xff", 100, ktVal)))
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go
deleted file mode 100644
index fefa007a7..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/leveldb_suite_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package leveldb
-
-import (
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-func TestLevelDB(t *testing.T) {
-	testutil.RunSuite(t, "LevelDB Suite")
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go
deleted file mode 100644
index b05084caa..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/bench_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package memdb
-
-import (
-	"encoding/binary"
-	"math/rand"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-)
-
-func BenchmarkPut(b *testing.B) {
-	buf := make([][4]byte, b.N)
-	for i := range buf {
-		binary.LittleEndian.PutUint32(buf[i][:], uint32(i))
-	}
-
-	b.ResetTimer()
-	p := New(comparer.DefaultComparer, 0)
-	for i := range buf {
-		p.Put(buf[i][:], nil)
-	}
-}
-
-func BenchmarkPutRandom(b *testing.B) {
-	buf := make([][4]byte, b.N)
-	for i := range buf {
-		binary.LittleEndian.PutUint32(buf[i][:], uint32(rand.Int()))
-	}
-
-	b.ResetTimer()
-	p := New(comparer.DefaultComparer, 0)
-	for i := range buf {
-		p.Put(buf[i][:], nil)
-	}
-}
-
-func BenchmarkGet(b *testing.B) {
-	buf := make([][4]byte, b.N)
-	for i := range buf {
-		binary.LittleEndian.PutUint32(buf[i][:], uint32(i))
-	}
-
-	p := New(comparer.DefaultComparer, 0)
-	for i := range buf {
-		p.Put(buf[i][:], nil)
-	}
-
-	b.ResetTimer()
-	for i := range buf {
-		p.Get(buf[i][:])
-	}
-}
-
-func BenchmarkGetRandom(b *testing.B) {
-	buf := make([][4]byte, b.N)
-	for i := range buf {
-		binary.LittleEndian.PutUint32(buf[i][:], uint32(i))
-	}
-
-	p := New(comparer.DefaultComparer, 0)
-	for i := range buf {
-		p.Put(buf[i][:], nil)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		p.Get(buf[rand.Int()%b.N][:])
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go b/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
deleted file mode 100644
index 1395bd928..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb.go
+++ /dev/null
@@ -1,471 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package memdb provides in-memory key/value database implementation.
-package memdb
-
-import (
-	"math/rand"
-	"sync"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	ErrNotFound     = errors.ErrNotFound
-	ErrIterReleased = errors.New("leveldb/memdb: iterator released")
-)
-
-const tMaxHeight = 12
-
-type dbIter struct {
-	util.BasicReleaser
-	p          *DB
-	slice      *util.Range
-	node       int
-	forward    bool
-	key, value []byte
-	err        error
-}
-
-func (i *dbIter) fill(checkStart, checkLimit bool) bool {
-	if i.node != 0 {
-		n := i.p.nodeData[i.node]
-		m := n + i.p.nodeData[i.node+nKey]
-		i.key = i.p.kvData[n:m]
-		if i.slice != nil {
-			switch {
-			case checkLimit && i.slice.Limit != nil && i.p.cmp.Compare(i.key, i.slice.Limit) >= 0:
-				fallthrough
-			case checkStart && i.slice.Start != nil && i.p.cmp.Compare(i.key, i.slice.Start) < 0:
-				i.node = 0
-				goto bail
-			}
-		}
-		i.value = i.p.kvData[m : m+i.p.nodeData[i.node+nVal]]
-		return true
-	}
-bail:
-	i.key = nil
-	i.value = nil
-	return false
-}
-
-func (i *dbIter) Valid() bool {
-	return i.node != 0
-}
-
-func (i *dbIter) First() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	i.forward = true
-	i.p.mu.RLock()
-	defer i.p.mu.RUnlock()
-	if i.slice != nil && i.slice.Start != nil {
-		i.node, _ = i.p.findGE(i.slice.Start, false)
-	} else {
-		i.node = i.p.nodeData[nNext]
-	}
-	return i.fill(false, true)
-}
-
-func (i *dbIter) Last() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	i.forward = false
-	i.p.mu.RLock()
-	defer i.p.mu.RUnlock()
-	if i.slice != nil && i.slice.Limit != nil {
-		i.node = i.p.findLT(i.slice.Limit)
-	} else {
-		i.node = i.p.findLast()
-	}
-	return i.fill(true, false)
-}
-
-func (i *dbIter) Seek(key []byte) bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	i.forward = true
-	i.p.mu.RLock()
-	defer i.p.mu.RUnlock()
-	if i.slice != nil && i.slice.Start != nil && i.p.cmp.Compare(key, i.slice.Start) < 0 {
-		key = i.slice.Start
-	}
-	i.node, _ = i.p.findGE(key, false)
-	return i.fill(false, true)
-}
-
-func (i *dbIter) Next() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.node == 0 {
-		if !i.forward {
-			return i.First()
-		}
-		return false
-	}
-	i.forward = true
-	i.p.mu.RLock()
-	defer i.p.mu.RUnlock()
-	i.node = i.p.nodeData[i.node+nNext]
-	return i.fill(false, true)
-}
-
-func (i *dbIter) Prev() bool {
-	if i.Released() {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.node == 0 {
-		if i.forward {
-			return i.Last()
-		}
-		return false
-	}
-	i.forward = false
-	i.p.mu.RLock()
-	defer i.p.mu.RUnlock()
-	i.node = i.p.findLT(i.key)
-	return i.fill(true, false)
-}
-
-func (i *dbIter) Key() []byte {
-	return i.key
-}
-
-func (i *dbIter) Value() []byte {
-	return i.value
-}
-
-func (i *dbIter) Error() error { return i.err }
-
-func (i *dbIter) Release() {
-	if !i.Released() {
-		i.p = nil
-		i.node = 0
-		i.key = nil
-		i.value = nil
-		i.BasicReleaser.Release()
-	}
-}
-
-const (
-	nKV = iota
-	nKey
-	nVal
-	nHeight
-	nNext
-)
-
-// DB is an in-memory key/value database.
-type DB struct {
-	cmp comparer.BasicComparer
-	rnd *rand.Rand
-
-	mu     sync.RWMutex
-	kvData []byte
-	// Node data:
-	// [0]         : KV offset
-	// [1]         : Key length
-	// [2]         : Value length
-	// [3]         : Height
-	// [3..height] : Next nodes
-	nodeData  []int
-	prevNode  [tMaxHeight]int
-	maxHeight int
-	n         int
-	kvSize    int
-}
-
-func (p *DB) randHeight() (h int) {
-	const branching = 4
-	h = 1
-	for h < tMaxHeight && p.rnd.Int()%branching == 0 {
-		h++
-	}
-	return
-}
-
-// Must hold RW-lock if prev == true, as it use shared prevNode slice.
-func (p *DB) findGE(key []byte, prev bool) (int, bool) {
-	node := 0
-	h := p.maxHeight - 1
-	for {
-		next := p.nodeData[node+nNext+h]
-		cmp := 1
-		if next != 0 {
-			o := p.nodeData[next]
-			cmp = p.cmp.Compare(p.kvData[o:o+p.nodeData[next+nKey]], key)
-		}
-		if cmp < 0 {
-			// Keep searching in this list
-			node = next
-		} else {
-			if prev {
-				p.prevNode[h] = node
-			} else if cmp == 0 {
-				return next, true
-			}
-			if h == 0 {
-				return next, cmp == 0
-			}
-			h--
-		}
-	}
-}
-
-func (p *DB) findLT(key []byte) int {
-	node := 0
-	h := p.maxHeight - 1
-	for {
-		next := p.nodeData[node+nNext+h]
-		o := p.nodeData[next]
-		if next == 0 || p.cmp.Compare(p.kvData[o:o+p.nodeData[next+nKey]], key) >= 0 {
-			if h == 0 {
-				break
-			}
-			h--
-		} else {
-			node = next
-		}
-	}
-	return node
-}
-
-func (p *DB) findLast() int {
-	node := 0
-	h := p.maxHeight - 1
-	for {
-		next := p.nodeData[node+nNext+h]
-		if next == 0 {
-			if h == 0 {
-				break
-			}
-			h--
-		} else {
-			node = next
-		}
-	}
-	return node
-}
-
-// Put sets the value for the given key. It overwrites any previous value
-// for that key; a DB is not a multi-map.
-//
-// It is safe to modify the contents of the arguments after Put returns.
-func (p *DB) Put(key []byte, value []byte) error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if node, exact := p.findGE(key, true); exact {
-		kvOffset := len(p.kvData)
-		p.kvData = append(p.kvData, key...)
-		p.kvData = append(p.kvData, value...)
-		p.nodeData[node] = kvOffset
-		m := p.nodeData[node+nVal]
-		p.nodeData[node+nVal] = len(value)
-		p.kvSize += len(value) - m
-		return nil
-	}
-
-	h := p.randHeight()
-	if h > p.maxHeight {
-		for i := p.maxHeight; i < h; i++ {
-			p.prevNode[i] = 0
-		}
-		p.maxHeight = h
-	}
-
-	kvOffset := len(p.kvData)
-	p.kvData = append(p.kvData, key...)
-	p.kvData = append(p.kvData, value...)
-	// Node
-	node := len(p.nodeData)
-	p.nodeData = append(p.nodeData, kvOffset, len(key), len(value), h)
-	for i, n := range p.prevNode[:h] {
-		m := n + nNext + i
-		p.nodeData = append(p.nodeData, p.nodeData[m])
-		p.nodeData[m] = node
-	}
-
-	p.kvSize += len(key) + len(value)
-	p.n++
-	return nil
-}
-
-// Delete deletes the value for the given key. It returns ErrNotFound if
-// the DB does not contain the key.
-//
-// It is safe to modify the contents of the arguments after Delete returns.
-func (p *DB) Delete(key []byte) error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	node, exact := p.findGE(key, true)
-	if !exact {
-		return ErrNotFound
-	}
-
-	h := p.nodeData[node+nHeight]
-	for i, n := range p.prevNode[:h] {
-		m := n + 4 + i
-		p.nodeData[m] = p.nodeData[p.nodeData[m]+nNext+i]
-	}
-
-	p.kvSize -= p.nodeData[node+nKey] + p.nodeData[node+nVal]
-	p.n--
-	return nil
-}
-
-// Contains returns true if the given key are in the DB.
-//
-// It is safe to modify the contents of the arguments after Contains returns.
-func (p *DB) Contains(key []byte) bool {
-	p.mu.RLock()
-	_, exact := p.findGE(key, false)
-	p.mu.RUnlock()
-	return exact
-}
-
-// Get gets the value for the given key. It returns error.ErrNotFound if the
-// DB does not contain the key.
-//
-// The caller should not modify the contents of the returned slice, but
-// it is safe to modify the contents of the argument after Get returns.
-func (p *DB) Get(key []byte) (value []byte, err error) {
-	p.mu.RLock()
-	if node, exact := p.findGE(key, false); exact {
-		o := p.nodeData[node] + p.nodeData[node+nKey]
-		value = p.kvData[o : o+p.nodeData[node+nVal]]
-	} else {
-		err = ErrNotFound
-	}
-	p.mu.RUnlock()
-	return
-}
-
-// Find finds key/value pair whose key is greater than or equal to the
-// given key. It returns ErrNotFound if the table doesn't contain
-// such pair.
-//
-// The caller should not modify the contents of the returned slice, but
-// it is safe to modify the contents of the argument after Find returns.
-func (p *DB) Find(key []byte) (rkey, value []byte, err error) {
-	p.mu.RLock()
-	if node, _ := p.findGE(key, false); node != 0 {
-		n := p.nodeData[node]
-		m := n + p.nodeData[node+nKey]
-		rkey = p.kvData[n:m]
-		value = p.kvData[m : m+p.nodeData[node+nVal]]
-	} else {
-		err = ErrNotFound
-	}
-	p.mu.RUnlock()
-	return
-}
-
-// NewIterator returns an iterator of the DB.
-// The returned iterator is not goroutine-safe, but it is safe to use
-// multiple iterators concurrently, with each in a dedicated goroutine.
-// It is also safe to use an iterator concurrently with modifying its
-// underlying DB. However, the resultant key/value pairs are not guaranteed
-// to be a consistent snapshot of the DB at a particular point in time.
-//
-// Slice allows slicing the iterator to only contains keys in the given
-// range. A nil Range.Start is treated as a key before all keys in the
-// DB. And a nil Range.Limit is treated as a key after all keys in
-// the DB.
-//
-// The iterator must be released after use, by calling Release method.
-//
-// Also read Iterator documentation of the leveldb/iterator package.
-func (p *DB) NewIterator(slice *util.Range) iterator.Iterator {
-	return &dbIter{p: p, slice: slice}
-}
-
-// Capacity returns keys/values buffer capacity.
-func (p *DB) Capacity() int {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-	return cap(p.kvData)
-}
-
-// Size returns sum of keys and values length. Note that deleted
-// key/value will not be accouted for, but it will still consume
-// the buffer, since the buffer is append only.
-func (p *DB) Size() int {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-	return p.kvSize
-}
-
-// Free returns keys/values free buffer before need to grow.
-func (p *DB) Free() int {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-	return cap(p.kvData) - len(p.kvData)
-}
-
-// Len returns the number of entries in the DB.
-func (p *DB) Len() int {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-	return p.n
-}
-
-// Reset resets the DB to initial empty state. Allows reuse the buffer.
-func (p *DB) Reset() {
-	p.mu.Lock()
-	p.rnd = rand.New(rand.NewSource(0xdeadbeef))
-	p.maxHeight = 1
-	p.n = 0
-	p.kvSize = 0
-	p.kvData = p.kvData[:0]
-	p.nodeData = p.nodeData[:nNext+tMaxHeight]
-	p.nodeData[nKV] = 0
-	p.nodeData[nKey] = 0
-	p.nodeData[nVal] = 0
-	p.nodeData[nHeight] = tMaxHeight
-	for n := 0; n < tMaxHeight; n++ {
-		p.nodeData[nNext+n] = 0
-		p.prevNode[n] = 0
-	}
-	p.mu.Unlock()
-}
-
-// New creates a new initalized in-memory key/value DB. The capacity
-// is the initial key/value buffer capacity. The capacity is advisory,
-// not enforced.
-//
-// The returned DB instance is goroutine-safe.
-func New(cmp comparer.BasicComparer, capacity int) *DB {
-	p := &DB{
-		cmp:       cmp,
-		rnd:       rand.New(rand.NewSource(0xdeadbeef)),
-		maxHeight: 1,
-		kvData:    make([]byte, 0, capacity),
-		nodeData:  make([]int, 4+tMaxHeight),
-	}
-	p.nodeData[nHeight] = tMaxHeight
-	return p
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go
deleted file mode 100644
index 18c304b7f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_suite_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package memdb
-
-import (
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-func TestMemDB(t *testing.T) {
-	testutil.RunSuite(t, "MemDB Suite")
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go
deleted file mode 100644
index 5dd6dbc7b..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/memdb/memdb_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package memdb
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func (p *DB) TestFindLT(key []byte) (rkey, value []byte, err error) {
-	p.mu.RLock()
-	if node := p.findLT(key); node != 0 {
-		n := p.nodeData[node]
-		m := n + p.nodeData[node+nKey]
-		rkey = p.kvData[n:m]
-		value = p.kvData[m : m+p.nodeData[node+nVal]]
-	} else {
-		err = ErrNotFound
-	}
-	p.mu.RUnlock()
-	return
-}
-
-func (p *DB) TestFindLast() (rkey, value []byte, err error) {
-	p.mu.RLock()
-	if node := p.findLast(); node != 0 {
-		n := p.nodeData[node]
-		m := n + p.nodeData[node+nKey]
-		rkey = p.kvData[n:m]
-		value = p.kvData[m : m+p.nodeData[node+nVal]]
-	} else {
-		err = ErrNotFound
-	}
-	p.mu.RUnlock()
-	return
-}
-
-func (p *DB) TestPut(key []byte, value []byte) error {
-	p.Put(key, value)
-	return nil
-}
-
-func (p *DB) TestDelete(key []byte) error {
-	p.Delete(key)
-	return nil
-}
-
-func (p *DB) TestFind(key []byte) (rkey, rvalue []byte, err error) {
-	return p.Find(key)
-}
-
-func (p *DB) TestGet(key []byte) (value []byte, err error) {
-	return p.Get(key)
-}
-
-func (p *DB) TestNewIterator(slice *util.Range) iterator.Iterator {
-	return p.NewIterator(slice)
-}
-
-var _ = testutil.Defer(func() {
-	Describe("Memdb", func() {
-		Describe("write test", func() {
-			It("should do write correctly", func() {
-				db := New(comparer.DefaultComparer, 0)
-				t := testutil.DBTesting{
-					DB:      db,
-					Deleted: testutil.KeyValue_Generate(nil, 1000, 1, 30, 5, 5).Clone(),
-					PostFn: func(t *testutil.DBTesting) {
-						Expect(db.Len()).Should(Equal(t.Present.Len()))
-						Expect(db.Size()).Should(Equal(t.Present.Size()))
-						switch t.Act {
-						case testutil.DBPut, testutil.DBOverwrite:
-							Expect(db.Contains(t.ActKey)).Should(BeTrue())
-						default:
-							Expect(db.Contains(t.ActKey)).Should(BeFalse())
-						}
-					},
-				}
-				testutil.DoDBTesting(&t)
-			})
-		})
-
-		Describe("read test", func() {
-			testutil.AllKeyValueTesting(nil, func(kv testutil.KeyValue) testutil.DB {
-				// Building the DB.
-				db := New(comparer.DefaultComparer, 0)
-				kv.IterateShuffled(nil, func(i int, key, value []byte) {
-					db.Put(key, value)
-				})
-
-				if kv.Len() > 1 {
-					It("Should find correct keys with findLT", func() {
-						testutil.ShuffledIndex(nil, kv.Len()-1, 1, func(i int) {
-							key_, key, _ := kv.IndexInexact(i + 1)
-							expectedKey, expectedValue := kv.Index(i)
-
-							// Using key that exist.
-							rkey, rvalue, err := db.TestFindLT(key)
-							Expect(err).ShouldNot(HaveOccurred(), "Error for key %q -> %q", key, expectedKey)
-							Expect(rkey).Should(Equal(expectedKey), "Key")
-							Expect(rvalue).Should(Equal(expectedValue), "Value for key %q -> %q", key, expectedKey)
-
-							// Using key that doesn't exist.
-							rkey, rvalue, err = db.TestFindLT(key_)
-							Expect(err).ShouldNot(HaveOccurred(), "Error for key %q (%q) -> %q", key_, key, expectedKey)
-							Expect(rkey).Should(Equal(expectedKey))
-							Expect(rvalue).Should(Equal(expectedValue), "Value for key %q (%q) -> %q", key_, key, expectedKey)
-						})
-					})
-				}
-
-				if kv.Len() > 0 {
-					It("Should find last key with findLast", func() {
-						key, value := kv.Index(kv.Len() - 1)
-						rkey, rvalue, err := db.TestFindLast()
-						Expect(err).ShouldNot(HaveOccurred())
-						Expect(rkey).Should(Equal(key))
-						Expect(rvalue).Should(Equal(value))
-					})
-				}
-
-				return db
-			}, nil, nil)
-		})
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/opt/options.go b/vendor/github.com/syndtr/goleveldb/leveldb/opt/options.go
deleted file mode 100644
index f9a309dac..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/opt/options.go
+++ /dev/null
@@ -1,670 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package opt provides sets of options used by LevelDB.
-package opt
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/cache"
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"math"
-)
-
-const (
-	KiB = 1024
-	MiB = KiB * 1024
-	GiB = MiB * 1024
-)
-
-var (
-	DefaultBlockCacher                   = LRUCacher
-	DefaultBlockCacheCapacity            = 8 * MiB
-	DefaultBlockRestartInterval          = 16
-	DefaultBlockSize                     = 4 * KiB
-	DefaultCompactionExpandLimitFactor   = 25
-	DefaultCompactionGPOverlapsFactor    = 10
-	DefaultCompactionL0Trigger           = 4
-	DefaultCompactionSourceLimitFactor   = 1
-	DefaultCompactionTableSize           = 2 * MiB
-	DefaultCompactionTableSizeMultiplier = 1.0
-	DefaultCompactionTotalSize           = 10 * MiB
-	DefaultCompactionTotalSizeMultiplier = 10.0
-	DefaultCompressionType               = SnappyCompression
-	DefaultIteratorSamplingRate          = 1 * MiB
-	DefaultMaxMemCompationLevel          = 2
-	DefaultNumLevel                      = 7
-	DefaultOpenFilesCacher               = LRUCacher
-	DefaultOpenFilesCacheCapacity        = 500
-	DefaultWriteBuffer                   = 4 * MiB
-	DefaultWriteL0PauseTrigger           = 12
-	DefaultWriteL0SlowdownTrigger        = 8
-)
-
-// Cacher is a caching algorithm.
-type Cacher interface {
-	New(capacity int) cache.Cacher
-}
-
-type CacherFunc struct {
-	NewFunc func(capacity int) cache.Cacher
-}
-
-func (f *CacherFunc) New(capacity int) cache.Cacher {
-	if f.NewFunc != nil {
-		return f.NewFunc(capacity)
-	}
-	return nil
-}
-
-func noCacher(int) cache.Cacher { return nil }
-
-var (
-	// LRUCacher is the LRU-cache algorithm.
-	LRUCacher = &CacherFunc{cache.NewLRU}
-
-	// NoCacher is the value to disable caching algorithm.
-	NoCacher = &CacherFunc{}
-)
-
-// Compression is the 'sorted table' block compression algorithm to use.
-type Compression uint
-
-func (c Compression) String() string {
-	switch c {
-	case DefaultCompression:
-		return "default"
-	case NoCompression:
-		return "none"
-	case SnappyCompression:
-		return "snappy"
-	}
-	return "invalid"
-}
-
-const (
-	DefaultCompression Compression = iota
-	NoCompression
-	SnappyCompression
-	nCompression
-)
-
-// Strict is the DB 'strict level'.
-type Strict uint
-
-const (
-	// If present then a corrupted or invalid chunk or block in manifest
-	// journal will cause an error instead of being dropped.
-	// This will prevent database with corrupted manifest to be opened.
-	StrictManifest Strict = 1 << iota
-
-	// If present then journal chunk checksum will be verified.
-	StrictJournalChecksum
-
-	// If present then a corrupted or invalid chunk or block in journal
-	// will cause an error instead of being dropped.
-	// This will prevent database with corrupted journal to be opened.
-	StrictJournal
-
-	// If present then 'sorted table' block checksum will be verified.
-	// This has effect on both 'read operation' and compaction.
-	StrictBlockChecksum
-
-	// If present then a corrupted 'sorted table' will fails compaction.
-	// The database will enter read-only mode.
-	StrictCompaction
-
-	// If present then a corrupted 'sorted table' will halts 'read operation'.
-	StrictReader
-
-	// If present then leveldb.Recover will drop corrupted 'sorted table'.
-	StrictRecovery
-
-	// This only applicable for ReadOptions, if present then this ReadOptions
-	// 'strict level' will override global ones.
-	StrictOverride
-
-	// StrictAll enables all strict flags.
-	StrictAll = StrictManifest | StrictJournalChecksum | StrictJournal | StrictBlockChecksum | StrictCompaction | StrictReader | StrictRecovery
-
-	// DefaultStrict is the default strict flags. Specify any strict flags
-	// will override default strict flags as whole (i.e. not OR'ed).
-	DefaultStrict = StrictJournalChecksum | StrictBlockChecksum | StrictCompaction | StrictReader
-
-	// NoStrict disables all strict flags. Override default strict flags.
-	NoStrict = ^StrictAll
-)
-
-// Options holds the optional parameters for the DB at large.
-type Options struct {
-	// AltFilters defines one or more 'alternative filters'.
-	// 'alternative filters' will be used during reads if a filter block
-	// does not match with the 'effective filter'.
-	//
-	// The default value is nil
-	AltFilters []filter.Filter
-
-	// BlockCacher provides cache algorithm for LevelDB 'sorted table' block caching.
-	// Specify NoCacher to disable caching algorithm.
-	//
-	// The default value is LRUCacher.
-	BlockCacher Cacher
-
-	// BlockCacheCapacity defines the capacity of the 'sorted table' block caching.
-	// Use -1 for zero, this has same effect as specifying NoCacher to BlockCacher.
-	//
-	// The default value is 8MiB.
-	BlockCacheCapacity int
-
-	// BlockRestartInterval is the number of keys between restart points for
-	// delta encoding of keys.
-	//
-	// The default value is 16.
-	BlockRestartInterval int
-
-	// BlockSize is the minimum uncompressed size in bytes of each 'sorted table'
-	// block.
-	//
-	// The default value is 4KiB.
-	BlockSize int
-
-	// CompactionExpandLimitFactor limits compaction size after expanded.
-	// This will be multiplied by table size limit at compaction target level.
-	//
-	// The default value is 25.
-	CompactionExpandLimitFactor int
-
-	// CompactionGPOverlapsFactor limits overlaps in grandparent (Level + 2) that a
-	// single 'sorted table' generates.
-	// This will be multiplied by table size limit at grandparent level.
-	//
-	// The default value is 10.
-	CompactionGPOverlapsFactor int
-
-	// CompactionL0Trigger defines number of 'sorted table' at level-0 that will
-	// trigger compaction.
-	//
-	// The default value is 4.
-	CompactionL0Trigger int
-
-	// CompactionSourceLimitFactor limits compaction source size. This doesn't apply to
-	// level-0.
-	// This will be multiplied by table size limit at compaction target level.
-	//
-	// The default value is 1.
-	CompactionSourceLimitFactor int
-
-	// CompactionTableSize limits size of 'sorted table' that compaction generates.
-	// The limits for each level will be calculated as:
-	//   CompactionTableSize * (CompactionTableSizeMultiplier ^ Level)
-	// The multiplier for each level can also fine-tuned using CompactionTableSizeMultiplierPerLevel.
-	//
-	// The default value is 2MiB.
-	CompactionTableSize int
-
-	// CompactionTableSizeMultiplier defines multiplier for CompactionTableSize.
-	//
-	// The default value is 1.
-	CompactionTableSizeMultiplier float64
-
-	// CompactionTableSizeMultiplierPerLevel defines per-level multiplier for
-	// CompactionTableSize.
-	// Use zero to skip a level.
-	//
-	// The default value is nil.
-	CompactionTableSizeMultiplierPerLevel []float64
-
-	// CompactionTotalSize limits total size of 'sorted table' for each level.
-	// The limits for each level will be calculated as:
-	//   CompactionTotalSize * (CompactionTotalSizeMultiplier ^ Level)
-	// The multiplier for each level can also fine-tuned using
-	// CompactionTotalSizeMultiplierPerLevel.
-	//
-	// The default value is 10MiB.
-	CompactionTotalSize int
-
-	// CompactionTotalSizeMultiplier defines multiplier for CompactionTotalSize.
-	//
-	// The default value is 10.
-	CompactionTotalSizeMultiplier float64
-
-	// CompactionTotalSizeMultiplierPerLevel defines per-level multiplier for
-	// CompactionTotalSize.
-	// Use zero to skip a level.
-	//
-	// The default value is nil.
-	CompactionTotalSizeMultiplierPerLevel []float64
-
-	// Comparer defines a total ordering over the space of []byte keys: a 'less
-	// than' relationship. The same comparison algorithm must be used for reads
-	// and writes over the lifetime of the DB.
-	//
-	// The default value uses the same ordering as bytes.Compare.
-	Comparer comparer.Comparer
-
-	// Compression defines the 'sorted table' block compression to use.
-	//
-	// The default value (DefaultCompression) uses snappy compression.
-	Compression Compression
-
-	// DisableBufferPool allows disable use of util.BufferPool functionality.
-	//
-	// The default value is false.
-	DisableBufferPool bool
-
-	// DisableBlockCache allows disable use of cache.Cache functionality on
-	// 'sorted table' block.
-	//
-	// The default value is false.
-	DisableBlockCache bool
-
-	// DisableCompactionBackoff allows disable compaction retry backoff.
-	//
-	// The default value is false.
-	DisableCompactionBackoff bool
-
-	// ErrorIfExist defines whether an error should returned if the DB already
-	// exist.
-	//
-	// The default value is false.
-	ErrorIfExist bool
-
-	// ErrorIfMissing defines whether an error should returned if the DB is
-	// missing. If false then the database will be created if missing, otherwise
-	// an error will be returned.
-	//
-	// The default value is false.
-	ErrorIfMissing bool
-
-	// Filter defines an 'effective filter' to use. An 'effective filter'
-	// if defined will be used to generate per-table filter block.
-	// The filter name will be stored on disk.
-	// During reads LevelDB will try to find matching filter from
-	// 'effective filter' and 'alternative filters'.
-	//
-	// Filter can be changed after a DB has been created. It is recommended
-	// to put old filter to the 'alternative filters' to mitigate lack of
-	// filter during transition period.
-	//
-	// A filter is used to reduce disk reads when looking for a specific key.
-	//
-	// The default value is nil.
-	Filter filter.Filter
-
-	// IteratorSamplingRate defines approximate gap (in bytes) between read
-	// sampling of an iterator. The samples will be used to determine when
-	// compaction should be triggered.
-	//
-	// The default is 1MiB.
-	IteratorSamplingRate int
-
-	// MaxMemCompationLevel defines maximum level a newly compacted 'memdb'
-	// will be pushed into if doesn't creates overlap. This should less than
-	// NumLevel. Use -1 for level-0.
-	//
-	// The default is 2.
-	MaxMemCompationLevel int
-
-	// NumLevel defines number of database level. The level shouldn't changed
-	// between opens, or the database will panic.
-	//
-	// The default is 7.
-	NumLevel int
-
-	// OpenFilesCacher provides cache algorithm for open files caching.
-	// Specify NoCacher to disable caching algorithm.
-	//
-	// The default value is LRUCacher.
-	OpenFilesCacher Cacher
-
-	// OpenFilesCacheCapacity defines the capacity of the open files caching.
-	// Use -1 for zero, this has same effect as specifying NoCacher to OpenFilesCacher.
-	//
-	// The default value is 500.
-	OpenFilesCacheCapacity int
-
-	// If true then opens DB in read-only mode.
-	//
-	// The default value is false.
-	ReadOnly bool
-
-	// Strict defines the DB strict level.
-	Strict Strict
-
-	// WriteBuffer defines maximum size of a 'memdb' before flushed to
-	// 'sorted table'. 'memdb' is an in-memory DB backed by an on-disk
-	// unsorted journal.
-	//
-	// LevelDB may held up to two 'memdb' at the same time.
-	//
-	// The default value is 4MiB.
-	WriteBuffer int
-
-	// WriteL0StopTrigger defines number of 'sorted table' at level-0 that will
-	// pause write.
-	//
-	// The default value is 12.
-	WriteL0PauseTrigger int
-
-	// WriteL0SlowdownTrigger defines number of 'sorted table' at level-0 that
-	// will trigger write slowdown.
-	//
-	// The default value is 8.
-	WriteL0SlowdownTrigger int
-}
-
-func (o *Options) GetAltFilters() []filter.Filter {
-	if o == nil {
-		return nil
-	}
-	return o.AltFilters
-}
-
-func (o *Options) GetBlockCacher() Cacher {
-	if o == nil || o.BlockCacher == nil {
-		return DefaultBlockCacher
-	} else if o.BlockCacher == NoCacher {
-		return nil
-	}
-	return o.BlockCacher
-}
-
-func (o *Options) GetBlockCacheCapacity() int {
-	if o == nil || o.BlockCacheCapacity == 0 {
-		return DefaultBlockCacheCapacity
-	} else if o.BlockCacheCapacity < 0 {
-		return 0
-	}
-	return o.BlockCacheCapacity
-}
-
-func (o *Options) GetBlockRestartInterval() int {
-	if o == nil || o.BlockRestartInterval <= 0 {
-		return DefaultBlockRestartInterval
-	}
-	return o.BlockRestartInterval
-}
-
-func (o *Options) GetBlockSize() int {
-	if o == nil || o.BlockSize <= 0 {
-		return DefaultBlockSize
-	}
-	return o.BlockSize
-}
-
-func (o *Options) GetCompactionExpandLimit(level int) int {
-	factor := DefaultCompactionExpandLimitFactor
-	if o != nil && o.CompactionExpandLimitFactor > 0 {
-		factor = o.CompactionExpandLimitFactor
-	}
-	return o.GetCompactionTableSize(level+1) * factor
-}
-
-func (o *Options) GetCompactionGPOverlaps(level int) int {
-	factor := DefaultCompactionGPOverlapsFactor
-	if o != nil && o.CompactionGPOverlapsFactor > 0 {
-		factor = o.CompactionGPOverlapsFactor
-	}
-	return o.GetCompactionTableSize(level+2) * factor
-}
-
-func (o *Options) GetCompactionL0Trigger() int {
-	if o == nil || o.CompactionL0Trigger == 0 {
-		return DefaultCompactionL0Trigger
-	}
-	return o.CompactionL0Trigger
-}
-
-func (o *Options) GetCompactionSourceLimit(level int) int {
-	factor := DefaultCompactionSourceLimitFactor
-	if o != nil && o.CompactionSourceLimitFactor > 0 {
-		factor = o.CompactionSourceLimitFactor
-	}
-	return o.GetCompactionTableSize(level+1) * factor
-}
-
-func (o *Options) GetCompactionTableSize(level int) int {
-	var (
-		base = DefaultCompactionTableSize
-		mult float64
-	)
-	if o != nil {
-		if o.CompactionTableSize > 0 {
-			base = o.CompactionTableSize
-		}
-		if len(o.CompactionTableSizeMultiplierPerLevel) > level && o.CompactionTableSizeMultiplierPerLevel[level] > 0 {
-			mult = o.CompactionTableSizeMultiplierPerLevel[level]
-		} else if o.CompactionTableSizeMultiplier > 0 {
-			mult = math.Pow(o.CompactionTableSizeMultiplier, float64(level))
-		}
-	}
-	if mult == 0 {
-		mult = math.Pow(DefaultCompactionTableSizeMultiplier, float64(level))
-	}
-	return int(float64(base) * mult)
-}
-
-func (o *Options) GetCompactionTotalSize(level int) int64 {
-	var (
-		base = DefaultCompactionTotalSize
-		mult float64
-	)
-	if o != nil {
-		if o.CompactionTotalSize > 0 {
-			base = o.CompactionTotalSize
-		}
-		if len(o.CompactionTotalSizeMultiplierPerLevel) > level && o.CompactionTotalSizeMultiplierPerLevel[level] > 0 {
-			mult = o.CompactionTotalSizeMultiplierPerLevel[level]
-		} else if o.CompactionTotalSizeMultiplier > 0 {
-			mult = math.Pow(o.CompactionTotalSizeMultiplier, float64(level))
-		}
-	}
-	if mult == 0 {
-		mult = math.Pow(DefaultCompactionTotalSizeMultiplier, float64(level))
-	}
-	return int64(float64(base) * mult)
-}
-
-func (o *Options) GetComparer() comparer.Comparer {
-	if o == nil || o.Comparer == nil {
-		return comparer.DefaultComparer
-	}
-	return o.Comparer
-}
-
-func (o *Options) GetCompression() Compression {
-	if o == nil || o.Compression <= DefaultCompression || o.Compression >= nCompression {
-		return DefaultCompressionType
-	}
-	return o.Compression
-}
-
-func (o *Options) GetDisableBufferPool() bool {
-	if o == nil {
-		return false
-	}
-	return o.DisableBufferPool
-}
-
-func (o *Options) GetDisableBlockCache() bool {
-	if o == nil {
-		return false
-	}
-	return o.DisableBlockCache
-}
-
-func (o *Options) GetDisableCompactionBackoff() bool {
-	if o == nil {
-		return false
-	}
-	return o.DisableCompactionBackoff
-}
-
-func (o *Options) GetErrorIfExist() bool {
-	if o == nil {
-		return false
-	}
-	return o.ErrorIfExist
-}
-
-func (o *Options) GetErrorIfMissing() bool {
-	if o == nil {
-		return false
-	}
-	return o.ErrorIfMissing
-}
-
-func (o *Options) GetFilter() filter.Filter {
-	if o == nil {
-		return nil
-	}
-	return o.Filter
-}
-
-func (o *Options) GetIteratorSamplingRate() int {
-	if o == nil || o.IteratorSamplingRate <= 0 {
-		return DefaultIteratorSamplingRate
-	}
-	return o.IteratorSamplingRate
-}
-
-func (o *Options) GetMaxMemCompationLevel() int {
-	level := DefaultMaxMemCompationLevel
-	if o != nil {
-		if o.MaxMemCompationLevel > 0 {
-			level = o.MaxMemCompationLevel
-		} else if o.MaxMemCompationLevel < 0 {
-			level = 0
-		}
-	}
-	if level >= o.GetNumLevel() {
-		return o.GetNumLevel() - 1
-	}
-	return level
-}
-
-func (o *Options) GetNumLevel() int {
-	if o == nil || o.NumLevel <= 0 {
-		return DefaultNumLevel
-	}
-	return o.NumLevel
-}
-
-func (o *Options) GetOpenFilesCacher() Cacher {
-	if o == nil || o.OpenFilesCacher == nil {
-		return DefaultOpenFilesCacher
-	}
-	if o.OpenFilesCacher == NoCacher {
-		return nil
-	}
-	return o.OpenFilesCacher
-}
-
-func (o *Options) GetOpenFilesCacheCapacity() int {
-	if o == nil || o.OpenFilesCacheCapacity == 0 {
-		return DefaultOpenFilesCacheCapacity
-	} else if o.OpenFilesCacheCapacity < 0 {
-		return 0
-	}
-	return o.OpenFilesCacheCapacity
-}
-
-func (o *Options) GetReadOnly() bool {
-	if o == nil {
-		return false
-	}
-	return o.ReadOnly
-}
-
-func (o *Options) GetStrict(strict Strict) bool {
-	if o == nil || o.Strict == 0 {
-		return DefaultStrict&strict != 0
-	}
-	return o.Strict&strict != 0
-}
-
-func (o *Options) GetWriteBuffer() int {
-	if o == nil || o.WriteBuffer <= 0 {
-		return DefaultWriteBuffer
-	}
-	return o.WriteBuffer
-}
-
-func (o *Options) GetWriteL0PauseTrigger() int {
-	if o == nil || o.WriteL0PauseTrigger == 0 {
-		return DefaultWriteL0PauseTrigger
-	}
-	return o.WriteL0PauseTrigger
-}
-
-func (o *Options) GetWriteL0SlowdownTrigger() int {
-	if o == nil || o.WriteL0SlowdownTrigger == 0 {
-		return DefaultWriteL0SlowdownTrigger
-	}
-	return o.WriteL0SlowdownTrigger
-}
-
-// ReadOptions holds the optional parameters for 'read operation'. The
-// 'read operation' includes Get, Find and NewIterator.
-type ReadOptions struct {
-	// DontFillCache defines whether block reads for this 'read operation'
-	// should be cached. If false then the block will be cached. This does
-	// not affects already cached block.
-	//
-	// The default value is false.
-	DontFillCache bool
-
-	// Strict will be OR'ed with global DB 'strict level' unless StrictOverride
-	// is present. Currently only StrictReader that has effect here.
-	Strict Strict
-}
-
-func (ro *ReadOptions) GetDontFillCache() bool {
-	if ro == nil {
-		return false
-	}
-	return ro.DontFillCache
-}
-
-func (ro *ReadOptions) GetStrict(strict Strict) bool {
-	if ro == nil {
-		return false
-	}
-	return ro.Strict&strict != 0
-}
-
-// WriteOptions holds the optional parameters for 'write operation'. The
-// 'write operation' includes Write, Put and Delete.
-type WriteOptions struct {
-	// Sync is whether to sync underlying writes from the OS buffer cache
-	// through to actual disk, if applicable. Setting Sync can result in
-	// slower writes.
-	//
-	// If false, and the machine crashes, then some recent writes may be lost.
-	// Note that if it is just the process that crashes (and the machine does
-	// not) then no writes will be lost.
-	//
-	// In other words, Sync being false has the same semantics as a write
-	// system call. Sync being true means write followed by fsync.
-	//
-	// The default value is false.
-	Sync bool
-}
-
-func (wo *WriteOptions) GetSync() bool {
-	if wo == nil {
-		return false
-	}
-	return wo.Sync
-}
-
-func GetStrict(o *Options, ro *ReadOptions, strict Strict) bool {
-	if ro.GetStrict(StrictOverride) {
-		return ro.GetStrict(strict)
-	} else {
-		return o.GetStrict(strict) || ro.GetStrict(strict)
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/options.go b/vendor/github.com/syndtr/goleveldb/leveldb/options.go
deleted file mode 100644
index a3d84ef60..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/options.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-)
-
-func dupOptions(o *opt.Options) *opt.Options {
-	newo := &opt.Options{}
-	if o != nil {
-		*newo = *o
-	}
-	if newo.Strict == 0 {
-		newo.Strict = opt.DefaultStrict
-	}
-	return newo
-}
-
-func (s *session) setOptions(o *opt.Options) {
-	no := dupOptions(o)
-	// Alternative filters.
-	if filters := o.GetAltFilters(); len(filters) > 0 {
-		no.AltFilters = make([]filter.Filter, len(filters))
-		for i, filter := range filters {
-			no.AltFilters[i] = &iFilter{filter}
-		}
-	}
-	// Comparer.
-	s.icmp = &iComparer{o.GetComparer()}
-	no.Comparer = s.icmp
-	// Filter.
-	if filter := o.GetFilter(); filter != nil {
-		no.Filter = &iFilter{filter}
-	}
-
-	s.o = &cachedOptions{Options: no}
-	s.o.cache()
-}
-
-type cachedOptions struct {
-	*opt.Options
-
-	compactionExpandLimit []int
-	compactionGPOverlaps  []int
-	compactionSourceLimit []int
-	compactionTableSize   []int
-	compactionTotalSize   []int64
-}
-
-func (co *cachedOptions) cache() {
-	numLevel := co.Options.GetNumLevel()
-
-	co.compactionExpandLimit = make([]int, numLevel)
-	co.compactionGPOverlaps = make([]int, numLevel)
-	co.compactionSourceLimit = make([]int, numLevel)
-	co.compactionTableSize = make([]int, numLevel)
-	co.compactionTotalSize = make([]int64, numLevel)
-
-	for level := 0; level < numLevel; level++ {
-		co.compactionExpandLimit[level] = co.Options.GetCompactionExpandLimit(level)
-		co.compactionGPOverlaps[level] = co.Options.GetCompactionGPOverlaps(level)
-		co.compactionSourceLimit[level] = co.Options.GetCompactionSourceLimit(level)
-		co.compactionTableSize[level] = co.Options.GetCompactionTableSize(level)
-		co.compactionTotalSize[level] = co.Options.GetCompactionTotalSize(level)
-	}
-}
-
-func (co *cachedOptions) GetCompactionExpandLimit(level int) int {
-	return co.compactionExpandLimit[level]
-}
-
-func (co *cachedOptions) GetCompactionGPOverlaps(level int) int {
-	return co.compactionGPOverlaps[level]
-}
-
-func (co *cachedOptions) GetCompactionSourceLimit(level int) int {
-	return co.compactionSourceLimit[level]
-}
-
-func (co *cachedOptions) GetCompactionTableSize(level int) int {
-	return co.compactionTableSize[level]
-}
-
-func (co *cachedOptions) GetCompactionTotalSize(level int) int64 {
-	return co.compactionTotalSize[level]
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session.go b/vendor/github.com/syndtr/goleveldb/leveldb/session.go
deleted file mode 100644
index f0bba4602..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"sync"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/journal"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type ErrManifestCorrupted struct {
-	Field  string
-	Reason string
-}
-
-func (e *ErrManifestCorrupted) Error() string {
-	return fmt.Sprintf("leveldb: manifest corrupted (field '%s'): %s", e.Field, e.Reason)
-}
-
-func newErrManifestCorrupted(f storage.File, field, reason string) error {
-	return errors.NewErrCorrupted(f, &ErrManifestCorrupted{field, reason})
-}
-
-// session represent a persistent database session.
-type session struct {
-	// Need 64-bit alignment.
-	stNextFileNum    uint64 // current unused file number
-	stJournalNum     uint64 // current journal file number; need external synchronization
-	stPrevJournalNum uint64 // prev journal file number; no longer used; for compatibility with older version of leveldb
-	stSeqNum         uint64 // last mem compacted seq; need external synchronization
-	stTempFileNum    uint64
-
-	stor     storage.Storage
-	storLock util.Releaser
-	o        *cachedOptions
-	icmp     *iComparer
-	tops     *tOps
-
-	manifest       *journal.Writer
-	manifestWriter storage.Writer
-	manifestFile   storage.File
-
-	stCompPtrs []iKey   // compaction pointers; need external synchronization
-	stVersion  *version // current version
-	vmu        sync.Mutex
-}
-
-// Creates new initialized session instance.
-func newSession(stor storage.Storage, o *opt.Options) (s *session, err error) {
-	if stor == nil {
-		return nil, os.ErrInvalid
-	}
-	storLock, err := stor.Lock()
-	if err != nil {
-		return
-	}
-	s = &session{
-		stor:       stor,
-		storLock:   storLock,
-		stCompPtrs: make([]iKey, o.GetNumLevel()),
-	}
-	s.setOptions(o)
-	s.tops = newTableOps(s)
-	s.setVersion(newVersion(s))
-	s.log("log@legend F·NumFile S·FileSize N·Entry C·BadEntry B·BadBlock Ke·KeyError D·DroppedEntry L·Level Q·SeqNum T·TimeElapsed")
-	return
-}
-
-// Close session.
-func (s *session) close() {
-	s.tops.close()
-	if s.manifest != nil {
-		s.manifest.Close()
-	}
-	if s.manifestWriter != nil {
-		s.manifestWriter.Close()
-	}
-	s.manifest = nil
-	s.manifestWriter = nil
-	s.manifestFile = nil
-	s.stVersion = nil
-}
-
-// Release session lock.
-func (s *session) release() {
-	s.storLock.Release()
-}
-
-// Create a new database session; need external synchronization.
-func (s *session) create() error {
-	// create manifest
-	return s.newManifest(nil, nil)
-}
-
-// Recover a database session; need external synchronization.
-func (s *session) recover() (err error) {
-	defer func() {
-		if os.IsNotExist(err) {
-			// Don't return os.ErrNotExist if the underlying storage contains
-			// other files that belong to LevelDB. So the DB won't get trashed.
-			if files, _ := s.stor.GetFiles(storage.TypeAll); len(files) > 0 {
-				err = &errors.ErrCorrupted{File: &storage.FileInfo{Type: storage.TypeManifest}, Err: &errors.ErrMissingFiles{}}
-			}
-		}
-	}()
-
-	m, err := s.stor.GetManifest()
-	if err != nil {
-		return
-	}
-
-	reader, err := m.Open()
-	if err != nil {
-		return
-	}
-	defer reader.Close()
-
-	var (
-		// Options.
-		numLevel = s.o.GetNumLevel()
-		strict   = s.o.GetStrict(opt.StrictManifest)
-
-		jr      = journal.NewReader(reader, dropper{s, m}, strict, true)
-		rec     = &sessionRecord{}
-		staging = s.stVersion.newStaging()
-	)
-	for {
-		var r io.Reader
-		r, err = jr.Next()
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-				break
-			}
-			return errors.SetFile(err, m)
-		}
-
-		err = rec.decode(r, numLevel)
-		if err == nil {
-			// save compact pointers
-			for _, r := range rec.compPtrs {
-				s.stCompPtrs[r.level] = iKey(r.ikey)
-			}
-			// commit record to version staging
-			staging.commit(rec)
-		} else {
-			err = errors.SetFile(err, m)
-			if strict || !errors.IsCorrupted(err) {
-				return
-			} else {
-				s.logf("manifest error: %v (skipped)", errors.SetFile(err, m))
-			}
-		}
-		rec.resetCompPtrs()
-		rec.resetAddedTables()
-		rec.resetDeletedTables()
-	}
-
-	switch {
-	case !rec.has(recComparer):
-		return newErrManifestCorrupted(m, "comparer", "missing")
-	case rec.comparer != s.icmp.uName():
-		return newErrManifestCorrupted(m, "comparer", fmt.Sprintf("mismatch: want '%s', got '%s'", s.icmp.uName(), rec.comparer))
-	case !rec.has(recNextFileNum):
-		return newErrManifestCorrupted(m, "next-file-num", "missing")
-	case !rec.has(recJournalNum):
-		return newErrManifestCorrupted(m, "journal-file-num", "missing")
-	case !rec.has(recSeqNum):
-		return newErrManifestCorrupted(m, "seq-num", "missing")
-	}
-
-	s.manifestFile = m
-	s.setVersion(staging.finish())
-	s.setNextFileNum(rec.nextFileNum)
-	s.recordCommited(rec)
-	return nil
-}
-
-// Commit session; need external synchronization.
-func (s *session) commit(r *sessionRecord) (err error) {
-	v := s.version()
-	defer v.release()
-
-	// spawn new version based on current version
-	nv := v.spawn(r)
-
-	if s.manifest == nil {
-		// manifest journal writer not yet created, create one
-		err = s.newManifest(r, nv)
-	} else {
-		err = s.flushManifest(r)
-	}
-
-	// finally, apply new version if no error rise
-	if err == nil {
-		s.setVersion(nv)
-	}
-
-	return
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session_compaction.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_compaction.go
deleted file mode 100644
index 7c5a79418..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session_compaction.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"sync/atomic"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/memdb"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-)
-
-func (s *session) pickMemdbLevel(umin, umax []byte) int {
-	v := s.version()
-	defer v.release()
-	return v.pickMemdbLevel(umin, umax)
-}
-
-func (s *session) flushMemdb(rec *sessionRecord, mdb *memdb.DB, level int) (level_ int, err error) {
-	// Create sorted table.
-	iter := mdb.NewIterator(nil)
-	defer iter.Release()
-	t, n, err := s.tops.createFrom(iter)
-	if err != nil {
-		return level, err
-	}
-
-	// Pick level and add to record.
-	if level < 0 {
-		level = s.pickMemdbLevel(t.imin.ukey(), t.imax.ukey())
-	}
-	rec.addTableFile(level, t)
-
-	s.logf("memdb@flush created L%d@%d N·%d S·%s %q:%q", level, t.file.Num(), n, shortenb(int(t.size)), t.imin, t.imax)
-	return level, nil
-}
-
-// Pick a compaction based on current state; need external synchronization.
-func (s *session) pickCompaction() *compaction {
-	v := s.version()
-
-	var level int
-	var t0 tFiles
-	if v.cScore >= 1 {
-		level = v.cLevel
-		cptr := s.stCompPtrs[level]
-		tables := v.tables[level]
-		for _, t := range tables {
-			if cptr == nil || s.icmp.Compare(t.imax, cptr) > 0 {
-				t0 = append(t0, t)
-				break
-			}
-		}
-		if len(t0) == 0 {
-			t0 = append(t0, tables[0])
-		}
-	} else {
-		if p := atomic.LoadPointer(&v.cSeek); p != nil {
-			ts := (*tSet)(p)
-			level = ts.level
-			t0 = append(t0, ts.table)
-		} else {
-			v.release()
-			return nil
-		}
-	}
-
-	return newCompaction(s, v, level, t0)
-}
-
-// Create compaction from given level and range; need external synchronization.
-func (s *session) getCompactionRange(level int, umin, umax []byte) *compaction {
-	v := s.version()
-
-	t0 := v.tables[level].getOverlaps(nil, s.icmp, umin, umax, level == 0)
-	if len(t0) == 0 {
-		v.release()
-		return nil
-	}
-
-	// Avoid compacting too much in one shot in case the range is large.
-	// But we cannot do this for level-0 since level-0 files can overlap
-	// and we must not pick one file and drop another older file if the
-	// two files overlap.
-	if level > 0 {
-		limit := uint64(v.s.o.GetCompactionSourceLimit(level))
-		total := uint64(0)
-		for i, t := range t0 {
-			total += t.size
-			if total >= limit {
-				s.logf("table@compaction limiting F·%d -> F·%d", len(t0), i+1)
-				t0 = t0[:i+1]
-				break
-			}
-		}
-	}
-
-	return newCompaction(s, v, level, t0)
-}
-
-func newCompaction(s *session, v *version, level int, t0 tFiles) *compaction {
-	c := &compaction{
-		s:             s,
-		v:             v,
-		level:         level,
-		tables:        [2]tFiles{t0, nil},
-		maxGPOverlaps: uint64(s.o.GetCompactionGPOverlaps(level)),
-		tPtrs:         make([]int, s.o.GetNumLevel()),
-	}
-	c.expand()
-	c.save()
-	return c
-}
-
-// compaction represent a compaction state.
-type compaction struct {
-	s *session
-	v *version
-
-	level         int
-	tables        [2]tFiles
-	maxGPOverlaps uint64
-
-	gp                tFiles
-	gpi               int
-	seenKey           bool
-	gpOverlappedBytes uint64
-	imin, imax        iKey
-	tPtrs             []int
-	released          bool
-
-	snapGPI               int
-	snapSeenKey           bool
-	snapGPOverlappedBytes uint64
-	snapTPtrs             []int
-}
-
-func (c *compaction) save() {
-	c.snapGPI = c.gpi
-	c.snapSeenKey = c.seenKey
-	c.snapGPOverlappedBytes = c.gpOverlappedBytes
-	c.snapTPtrs = append(c.snapTPtrs[:0], c.tPtrs...)
-}
-
-func (c *compaction) restore() {
-	c.gpi = c.snapGPI
-	c.seenKey = c.snapSeenKey
-	c.gpOverlappedBytes = c.snapGPOverlappedBytes
-	c.tPtrs = append(c.tPtrs[:0], c.snapTPtrs...)
-}
-
-func (c *compaction) release() {
-	if !c.released {
-		c.released = true
-		c.v.release()
-	}
-}
-
-// Expand compacted tables; need external synchronization.
-func (c *compaction) expand() {
-	limit := uint64(c.s.o.GetCompactionExpandLimit(c.level))
-	vt0, vt1 := c.v.tables[c.level], c.v.tables[c.level+1]
-
-	t0, t1 := c.tables[0], c.tables[1]
-	imin, imax := t0.getRange(c.s.icmp)
-	// We expand t0 here just incase ukey hop across tables.
-	t0 = vt0.getOverlaps(t0, c.s.icmp, imin.ukey(), imax.ukey(), c.level == 0)
-	if len(t0) != len(c.tables[0]) {
-		imin, imax = t0.getRange(c.s.icmp)
-	}
-	t1 = vt1.getOverlaps(t1, c.s.icmp, imin.ukey(), imax.ukey(), false)
-	// Get entire range covered by compaction.
-	amin, amax := append(t0, t1...).getRange(c.s.icmp)
-
-	// See if we can grow the number of inputs in "level" without
-	// changing the number of "level+1" files we pick up.
-	if len(t1) > 0 {
-		exp0 := vt0.getOverlaps(nil, c.s.icmp, amin.ukey(), amax.ukey(), c.level == 0)
-		if len(exp0) > len(t0) && t1.size()+exp0.size() < limit {
-			xmin, xmax := exp0.getRange(c.s.icmp)
-			exp1 := vt1.getOverlaps(nil, c.s.icmp, xmin.ukey(), xmax.ukey(), false)
-			if len(exp1) == len(t1) {
-				c.s.logf("table@compaction expanding L%d+L%d (F·%d S·%s)+(F·%d S·%s) -> (F·%d S·%s)+(F·%d S·%s)",
-					c.level, c.level+1, len(t0), shortenb(int(t0.size())), len(t1), shortenb(int(t1.size())),
-					len(exp0), shortenb(int(exp0.size())), len(exp1), shortenb(int(exp1.size())))
-				imin, imax = xmin, xmax
-				t0, t1 = exp0, exp1
-				amin, amax = append(t0, t1...).getRange(c.s.icmp)
-			}
-		}
-	}
-
-	// Compute the set of grandparent files that overlap this compaction
-	// (parent == level+1; grandparent == level+2)
-	if c.level+2 < c.s.o.GetNumLevel() {
-		c.gp = c.v.tables[c.level+2].getOverlaps(c.gp, c.s.icmp, amin.ukey(), amax.ukey(), false)
-	}
-
-	c.tables[0], c.tables[1] = t0, t1
-	c.imin, c.imax = imin, imax
-}
-
-// Check whether compaction is trivial.
-func (c *compaction) trivial() bool {
-	return len(c.tables[0]) == 1 && len(c.tables[1]) == 0 && c.gp.size() <= c.maxGPOverlaps
-}
-
-func (c *compaction) baseLevelForKey(ukey []byte) bool {
-	for level, tables := range c.v.tables[c.level+2:] {
-		for c.tPtrs[level] < len(tables) {
-			t := tables[c.tPtrs[level]]
-			if c.s.icmp.uCompare(ukey, t.imax.ukey()) <= 0 {
-				// We've advanced far enough.
-				if c.s.icmp.uCompare(ukey, t.imin.ukey()) >= 0 {
-					// Key falls in this file's range, so definitely not base level.
-					return false
-				}
-				break
-			}
-			c.tPtrs[level]++
-		}
-	}
-	return true
-}
-
-func (c *compaction) shouldStopBefore(ikey iKey) bool {
-	for ; c.gpi < len(c.gp); c.gpi++ {
-		gp := c.gp[c.gpi]
-		if c.s.icmp.Compare(ikey, gp.imax) <= 0 {
-			break
-		}
-		if c.seenKey {
-			c.gpOverlappedBytes += gp.size
-		}
-	}
-	c.seenKey = true
-
-	if c.gpOverlappedBytes > c.maxGPOverlaps {
-		// Too much overlap for current output; start new output.
-		c.gpOverlappedBytes = 0
-		return true
-	}
-	return false
-}
-
-// Creates an iterator.
-func (c *compaction) newIterator() iterator.Iterator {
-	// Creates iterator slice.
-	icap := len(c.tables)
-	if c.level == 0 {
-		// Special case for level-0.
-		icap = len(c.tables[0]) + 1
-	}
-	its := make([]iterator.Iterator, 0, icap)
-
-	// Options.
-	ro := &opt.ReadOptions{
-		DontFillCache: true,
-		Strict:        opt.StrictOverride,
-	}
-	strict := c.s.o.GetStrict(opt.StrictCompaction)
-	if strict {
-		ro.Strict |= opt.StrictReader
-	}
-
-	for i, tables := range c.tables {
-		if len(tables) == 0 {
-			continue
-		}
-
-		// Level-0 is not sorted and may overlaps each other.
-		if c.level+i == 0 {
-			for _, t := range tables {
-				its = append(its, c.s.tops.newIterator(t, nil, ro))
-			}
-		} else {
-			it := iterator.NewIndexedIterator(tables.newIndexIterator(c.s.tops, c.s.icmp, nil, ro), strict)
-			its = append(its, it)
-		}
-	}
-
-	return iterator.NewMergedIterator(its, c.s.icmp, strict)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session_record.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_record.go
deleted file mode 100644
index 405e07bef..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session_record.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bufio"
-	"encoding/binary"
-	"io"
-	"strings"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-)
-
-type byteReader interface {
-	io.Reader
-	io.ByteReader
-}
-
-// These numbers are written to disk and should not be changed.
-const (
-	recComparer    = 1
-	recJournalNum  = 2
-	recNextFileNum = 3
-	recSeqNum      = 4
-	recCompPtr     = 5
-	recDelTable    = 6
-	recAddTable    = 7
-	// 8 was used for large value refs
-	recPrevJournalNum = 9
-)
-
-type cpRecord struct {
-	level int
-	ikey  iKey
-}
-
-type atRecord struct {
-	level int
-	num   uint64
-	size  uint64
-	imin  iKey
-	imax  iKey
-}
-
-type dtRecord struct {
-	level int
-	num   uint64
-}
-
-type sessionRecord struct {
-	hasRec         int
-	comparer       string
-	journalNum     uint64
-	prevJournalNum uint64
-	nextFileNum    uint64
-	seqNum         uint64
-	compPtrs       []cpRecord
-	addedTables    []atRecord
-	deletedTables  []dtRecord
-
-	scratch [binary.MaxVarintLen64]byte
-	err     error
-}
-
-func (p *sessionRecord) has(rec int) bool {
-	return p.hasRec&(1<<uint(rec)) != 0
-}
-
-func (p *sessionRecord) setComparer(name string) {
-	p.hasRec |= 1 << recComparer
-	p.comparer = name
-}
-
-func (p *sessionRecord) setJournalNum(num uint64) {
-	p.hasRec |= 1 << recJournalNum
-	p.journalNum = num
-}
-
-func (p *sessionRecord) setPrevJournalNum(num uint64) {
-	p.hasRec |= 1 << recPrevJournalNum
-	p.prevJournalNum = num
-}
-
-func (p *sessionRecord) setNextFileNum(num uint64) {
-	p.hasRec |= 1 << recNextFileNum
-	p.nextFileNum = num
-}
-
-func (p *sessionRecord) setSeqNum(num uint64) {
-	p.hasRec |= 1 << recSeqNum
-	p.seqNum = num
-}
-
-func (p *sessionRecord) addCompPtr(level int, ikey iKey) {
-	p.hasRec |= 1 << recCompPtr
-	p.compPtrs = append(p.compPtrs, cpRecord{level, ikey})
-}
-
-func (p *sessionRecord) resetCompPtrs() {
-	p.hasRec &= ^(1 << recCompPtr)
-	p.compPtrs = p.compPtrs[:0]
-}
-
-func (p *sessionRecord) addTable(level int, num, size uint64, imin, imax iKey) {
-	p.hasRec |= 1 << recAddTable
-	p.addedTables = append(p.addedTables, atRecord{level, num, size, imin, imax})
-}
-
-func (p *sessionRecord) addTableFile(level int, t *tFile) {
-	p.addTable(level, t.file.Num(), t.size, t.imin, t.imax)
-}
-
-func (p *sessionRecord) resetAddedTables() {
-	p.hasRec &= ^(1 << recAddTable)
-	p.addedTables = p.addedTables[:0]
-}
-
-func (p *sessionRecord) delTable(level int, num uint64) {
-	p.hasRec |= 1 << recDelTable
-	p.deletedTables = append(p.deletedTables, dtRecord{level, num})
-}
-
-func (p *sessionRecord) resetDeletedTables() {
-	p.hasRec &= ^(1 << recDelTable)
-	p.deletedTables = p.deletedTables[:0]
-}
-
-func (p *sessionRecord) putUvarint(w io.Writer, x uint64) {
-	if p.err != nil {
-		return
-	}
-	n := binary.PutUvarint(p.scratch[:], x)
-	_, p.err = w.Write(p.scratch[:n])
-}
-
-func (p *sessionRecord) putBytes(w io.Writer, x []byte) {
-	if p.err != nil {
-		return
-	}
-	p.putUvarint(w, uint64(len(x)))
-	if p.err != nil {
-		return
-	}
-	_, p.err = w.Write(x)
-}
-
-func (p *sessionRecord) encode(w io.Writer) error {
-	p.err = nil
-	if p.has(recComparer) {
-		p.putUvarint(w, recComparer)
-		p.putBytes(w, []byte(p.comparer))
-	}
-	if p.has(recJournalNum) {
-		p.putUvarint(w, recJournalNum)
-		p.putUvarint(w, p.journalNum)
-	}
-	if p.has(recNextFileNum) {
-		p.putUvarint(w, recNextFileNum)
-		p.putUvarint(w, p.nextFileNum)
-	}
-	if p.has(recSeqNum) {
-		p.putUvarint(w, recSeqNum)
-		p.putUvarint(w, p.seqNum)
-	}
-	for _, r := range p.compPtrs {
-		p.putUvarint(w, recCompPtr)
-		p.putUvarint(w, uint64(r.level))
-		p.putBytes(w, r.ikey)
-	}
-	for _, r := range p.deletedTables {
-		p.putUvarint(w, recDelTable)
-		p.putUvarint(w, uint64(r.level))
-		p.putUvarint(w, r.num)
-	}
-	for _, r := range p.addedTables {
-		p.putUvarint(w, recAddTable)
-		p.putUvarint(w, uint64(r.level))
-		p.putUvarint(w, r.num)
-		p.putUvarint(w, r.size)
-		p.putBytes(w, r.imin)
-		p.putBytes(w, r.imax)
-	}
-	return p.err
-}
-
-func (p *sessionRecord) readUvarintMayEOF(field string, r io.ByteReader, mayEOF bool) uint64 {
-	if p.err != nil {
-		return 0
-	}
-	x, err := binary.ReadUvarint(r)
-	if err != nil {
-		if err == io.ErrUnexpectedEOF || (mayEOF == false && err == io.EOF) {
-			p.err = errors.NewErrCorrupted(nil, &ErrManifestCorrupted{field, "short read"})
-		} else if strings.HasPrefix(err.Error(), "binary:") {
-			p.err = errors.NewErrCorrupted(nil, &ErrManifestCorrupted{field, err.Error()})
-		} else {
-			p.err = err
-		}
-		return 0
-	}
-	return x
-}
-
-func (p *sessionRecord) readUvarint(field string, r io.ByteReader) uint64 {
-	return p.readUvarintMayEOF(field, r, false)
-}
-
-func (p *sessionRecord) readBytes(field string, r byteReader) []byte {
-	if p.err != nil {
-		return nil
-	}
-	n := p.readUvarint(field, r)
-	if p.err != nil {
-		return nil
-	}
-	x := make([]byte, n)
-	_, p.err = io.ReadFull(r, x)
-	if p.err != nil {
-		if p.err == io.ErrUnexpectedEOF {
-			p.err = errors.NewErrCorrupted(nil, &ErrManifestCorrupted{field, "short read"})
-		}
-		return nil
-	}
-	return x
-}
-
-func (p *sessionRecord) readLevel(field string, r io.ByteReader, numLevel int) int {
-	if p.err != nil {
-		return 0
-	}
-	x := p.readUvarint(field, r)
-	if p.err != nil {
-		return 0
-	}
-	if x >= uint64(numLevel) {
-		p.err = errors.NewErrCorrupted(nil, &ErrManifestCorrupted{field, "invalid level number"})
-		return 0
-	}
-	return int(x)
-}
-
-func (p *sessionRecord) decode(r io.Reader, numLevel int) error {
-	br, ok := r.(byteReader)
-	if !ok {
-		br = bufio.NewReader(r)
-	}
-	p.err = nil
-	for p.err == nil {
-		rec := p.readUvarintMayEOF("field-header", br, true)
-		if p.err != nil {
-			if p.err == io.EOF {
-				return nil
-			}
-			return p.err
-		}
-		switch rec {
-		case recComparer:
-			x := p.readBytes("comparer", br)
-			if p.err == nil {
-				p.setComparer(string(x))
-			}
-		case recJournalNum:
-			x := p.readUvarint("journal-num", br)
-			if p.err == nil {
-				p.setJournalNum(x)
-			}
-		case recPrevJournalNum:
-			x := p.readUvarint("prev-journal-num", br)
-			if p.err == nil {
-				p.setPrevJournalNum(x)
-			}
-		case recNextFileNum:
-			x := p.readUvarint("next-file-num", br)
-			if p.err == nil {
-				p.setNextFileNum(x)
-			}
-		case recSeqNum:
-			x := p.readUvarint("seq-num", br)
-			if p.err == nil {
-				p.setSeqNum(x)
-			}
-		case recCompPtr:
-			level := p.readLevel("comp-ptr.level", br, numLevel)
-			ikey := p.readBytes("comp-ptr.ikey", br)
-			if p.err == nil {
-				p.addCompPtr(level, iKey(ikey))
-			}
-		case recAddTable:
-			level := p.readLevel("add-table.level", br, numLevel)
-			num := p.readUvarint("add-table.num", br)
-			size := p.readUvarint("add-table.size", br)
-			imin := p.readBytes("add-table.imin", br)
-			imax := p.readBytes("add-table.imax", br)
-			if p.err == nil {
-				p.addTable(level, num, size, imin, imax)
-			}
-		case recDelTable:
-			level := p.readLevel("del-table.level", br, numLevel)
-			num := p.readUvarint("del-table.num", br)
-			if p.err == nil {
-				p.delTable(level, num)
-			}
-		}
-	}
-
-	return p.err
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session_record_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_record_test.go
deleted file mode 100644
index 33c148756..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session_record_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/opt"
-)
-
-func decodeEncode(v *sessionRecord) (res bool, err error) {
-	b := new(bytes.Buffer)
-	err = v.encode(b)
-	if err != nil {
-		return
-	}
-	v2 := &sessionRecord{}
-	err = v.decode(b, opt.DefaultNumLevel)
-	if err != nil {
-		return
-	}
-	b2 := new(bytes.Buffer)
-	err = v2.encode(b2)
-	if err != nil {
-		return
-	}
-	return bytes.Equal(b.Bytes(), b2.Bytes()), nil
-}
-
-func TestSessionRecord_EncodeDecode(t *testing.T) {
-	big := uint64(1) << 50
-	v := &sessionRecord{}
-	i := uint64(0)
-	test := func() {
-		res, err := decodeEncode(v)
-		if err != nil {
-			t.Fatalf("error when testing encode/decode sessionRecord: %v", err)
-		}
-		if !res {
-			t.Error("encode/decode test failed at iteration:", i)
-		}
-	}
-
-	for ; i < 4; i++ {
-		test()
-		v.addTable(3, big+300+i, big+400+i,
-			newIkey([]byte("foo"), big+500+1, ktVal),
-			newIkey([]byte("zoo"), big+600+1, ktDel))
-		v.delTable(4, big+700+i)
-		v.addCompPtr(int(i), newIkey([]byte("x"), big+900+1, ktVal))
-	}
-
-	v.setComparer("foo")
-	v.setJournalNum(big + 100)
-	v.setPrevJournalNum(big + 99)
-	v.setNextFileNum(big + 200)
-	v.setSeqNum(big + 1000)
-	test()
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/session_util.go b/vendor/github.com/syndtr/goleveldb/leveldb/session_util.go
deleted file mode 100644
index 399a788ba..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/session_util.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"fmt"
-	"sync/atomic"
-
-	"github.com/syndtr/goleveldb/leveldb/journal"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-)
-
-// Logging.
-
-type dropper struct {
-	s    *session
-	file storage.File
-}
-
-func (d dropper) Drop(err error) {
-	if e, ok := err.(*journal.ErrCorrupted); ok {
-		d.s.logf("journal@drop %s-%d S·%s %q", d.file.Type(), d.file.Num(), shortenb(e.Size), e.Reason)
-	} else {
-		d.s.logf("journal@drop %s-%d %q", d.file.Type(), d.file.Num(), err)
-	}
-}
-
-func (s *session) log(v ...interface{})                 { s.stor.Log(fmt.Sprint(v...)) }
-func (s *session) logf(format string, v ...interface{}) { s.stor.Log(fmt.Sprintf(format, v...)) }
-
-// File utils.
-
-func (s *session) getJournalFile(num uint64) storage.File {
-	return s.stor.GetFile(num, storage.TypeJournal)
-}
-
-func (s *session) getTableFile(num uint64) storage.File {
-	return s.stor.GetFile(num, storage.TypeTable)
-}
-
-func (s *session) getFiles(t storage.FileType) ([]storage.File, error) {
-	return s.stor.GetFiles(t)
-}
-
-func (s *session) newTemp() storage.File {
-	num := atomic.AddUint64(&s.stTempFileNum, 1) - 1
-	return s.stor.GetFile(num, storage.TypeTemp)
-}
-
-func (s *session) tableFileFromRecord(r atRecord) *tFile {
-	return newTableFile(s.getTableFile(r.num), r.size, r.imin, r.imax)
-}
-
-// Session state.
-
-// Get current version. This will incr version ref, must call
-// version.release (exactly once) after use.
-func (s *session) version() *version {
-	s.vmu.Lock()
-	defer s.vmu.Unlock()
-	s.stVersion.ref++
-	return s.stVersion
-}
-
-// Set current version to v.
-func (s *session) setVersion(v *version) {
-	s.vmu.Lock()
-	v.ref = 1 // Holds by session.
-	if old := s.stVersion; old != nil {
-		v.ref++ // Holds by old version.
-		old.next = v
-		old.releaseNB()
-	}
-	s.stVersion = v
-	s.vmu.Unlock()
-}
-
-// Get current unused file number.
-func (s *session) nextFileNum() uint64 {
-	return atomic.LoadUint64(&s.stNextFileNum)
-}
-
-// Set current unused file number to num.
-func (s *session) setNextFileNum(num uint64) {
-	atomic.StoreUint64(&s.stNextFileNum, num)
-}
-
-// Mark file number as used.
-func (s *session) markFileNum(num uint64) {
-	nextFileNum := num + 1
-	for {
-		old, x := s.stNextFileNum, nextFileNum
-		if old > x {
-			x = old
-		}
-		if atomic.CompareAndSwapUint64(&s.stNextFileNum, old, x) {
-			break
-		}
-	}
-}
-
-// Allocate a file number.
-func (s *session) allocFileNum() uint64 {
-	return atomic.AddUint64(&s.stNextFileNum, 1) - 1
-}
-
-// Reuse given file number.
-func (s *session) reuseFileNum(num uint64) {
-	for {
-		old, x := s.stNextFileNum, num
-		if old != x+1 {
-			x = old
-		}
-		if atomic.CompareAndSwapUint64(&s.stNextFileNum, old, x) {
-			break
-		}
-	}
-}
-
-// Manifest related utils.
-
-// Fill given session record obj with current states; need external
-// synchronization.
-func (s *session) fillRecord(r *sessionRecord, snapshot bool) {
-	r.setNextFileNum(s.nextFileNum())
-
-	if snapshot {
-		if !r.has(recJournalNum) {
-			r.setJournalNum(s.stJournalNum)
-		}
-
-		if !r.has(recSeqNum) {
-			r.setSeqNum(s.stSeqNum)
-		}
-
-		for level, ik := range s.stCompPtrs {
-			if ik != nil {
-				r.addCompPtr(level, ik)
-			}
-		}
-
-		r.setComparer(s.icmp.uName())
-	}
-}
-
-// Mark if record has been committed, this will update session state;
-// need external synchronization.
-func (s *session) recordCommited(r *sessionRecord) {
-	if r.has(recJournalNum) {
-		s.stJournalNum = r.journalNum
-	}
-
-	if r.has(recPrevJournalNum) {
-		s.stPrevJournalNum = r.prevJournalNum
-	}
-
-	if r.has(recSeqNum) {
-		s.stSeqNum = r.seqNum
-	}
-
-	for _, p := range r.compPtrs {
-		s.stCompPtrs[p.level] = iKey(p.ikey)
-	}
-}
-
-// Create a new manifest file; need external synchronization.
-func (s *session) newManifest(rec *sessionRecord, v *version) (err error) {
-	num := s.allocFileNum()
-	file := s.stor.GetFile(num, storage.TypeManifest)
-	writer, err := file.Create()
-	if err != nil {
-		return
-	}
-	jw := journal.NewWriter(writer)
-
-	if v == nil {
-		v = s.version()
-		defer v.release()
-	}
-	if rec == nil {
-		rec = &sessionRecord{}
-	}
-	s.fillRecord(rec, true)
-	v.fillRecord(rec)
-
-	defer func() {
-		if err == nil {
-			s.recordCommited(rec)
-			if s.manifest != nil {
-				s.manifest.Close()
-			}
-			if s.manifestWriter != nil {
-				s.manifestWriter.Close()
-			}
-			if s.manifestFile != nil {
-				s.manifestFile.Remove()
-			}
-			s.manifestFile = file
-			s.manifestWriter = writer
-			s.manifest = jw
-		} else {
-			writer.Close()
-			file.Remove()
-			s.reuseFileNum(num)
-		}
-	}()
-
-	w, err := jw.Next()
-	if err != nil {
-		return
-	}
-	err = rec.encode(w)
-	if err != nil {
-		return
-	}
-	err = jw.Flush()
-	if err != nil {
-		return
-	}
-	err = s.stor.SetManifest(file)
-	return
-}
-
-// Flush record to disk.
-func (s *session) flushManifest(rec *sessionRecord) (err error) {
-	s.fillRecord(rec, false)
-	w, err := s.manifest.Next()
-	if err != nil {
-		return
-	}
-	err = rec.encode(w)
-	if err != nil {
-		return
-	}
-	err = s.manifest.Flush()
-	if err != nil {
-		return
-	}
-	err = s.manifestWriter.Sync()
-	if err != nil {
-		return
-	}
-	s.recordCommited(rec)
-	return
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
deleted file mode 100644
index 46cc9d070..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage.go
+++ /dev/null
@@ -1,534 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reservefs.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var errFileOpen = errors.New("leveldb/storage: file still open")
-
-type fileLock interface {
-	release() error
-}
-
-type fileStorageLock struct {
-	fs *fileStorage
-}
-
-func (lock *fileStorageLock) Release() {
-	fs := lock.fs
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.slock == lock {
-		fs.slock = nil
-	}
-	return
-}
-
-// fileStorage is a file-system backed storage.
-type fileStorage struct {
-	path string
-
-	mu    sync.Mutex
-	flock fileLock
-	slock *fileStorageLock
-	logw  *os.File
-	buf   []byte
-	// Opened file counter; if open < 0 means closed.
-	open int
-	day  int
-}
-
-// OpenFile returns a new filesytem-backed storage implementation with the given
-// path. This also hold a file lock, so any subsequent attempt to open the same
-// path will fail.
-//
-// The storage must be closed after use, by calling Close method.
-func OpenFile(path string) (Storage, error) {
-	if err := os.MkdirAll(path, 0755); err != nil {
-		return nil, err
-	}
-
-	flock, err := newFileLock(filepath.Join(path, "LOCK"))
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			flock.release()
-		}
-	}()
-
-	rename(filepath.Join(path, "LOG"), filepath.Join(path, "LOG.old"))
-	logw, err := os.OpenFile(filepath.Join(path, "LOG"), os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		return nil, err
-	}
-
-	fs := &fileStorage{path: path, flock: flock, logw: logw}
-	runtime.SetFinalizer(fs, (*fileStorage).Close)
-	return fs, nil
-}
-
-func (fs *fileStorage) Lock() (util.Releaser, error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return nil, ErrClosed
-	}
-	if fs.slock != nil {
-		return nil, ErrLocked
-	}
-	fs.slock = &fileStorageLock{fs: fs}
-	return fs.slock, nil
-}
-
-func itoa(buf []byte, i int, wid int) []byte {
-	var u uint = uint(i)
-	if u == 0 && wid <= 1 {
-		return append(buf, '0')
-	}
-
-	// Assemble decimal in reverse order.
-	var b [32]byte
-	bp := len(b)
-	for ; u > 0 || wid > 0; u /= 10 {
-		bp--
-		wid--
-		b[bp] = byte(u%10) + '0'
-	}
-	return append(buf, b[bp:]...)
-}
-
-func (fs *fileStorage) printDay(t time.Time) {
-	if fs.day == t.Day() {
-		return
-	}
-	fs.day = t.Day()
-	fs.logw.Write([]byte("=============== " + t.Format("Jan 2, 2006 (MST)") + " ===============\n"))
-}
-
-func (fs *fileStorage) doLog(t time.Time, str string) {
-	fs.printDay(t)
-	hour, min, sec := t.Clock()
-	msec := t.Nanosecond() / 1e3
-	// time
-	fs.buf = itoa(fs.buf[:0], hour, 2)
-	fs.buf = append(fs.buf, ':')
-	fs.buf = itoa(fs.buf, min, 2)
-	fs.buf = append(fs.buf, ':')
-	fs.buf = itoa(fs.buf, sec, 2)
-	fs.buf = append(fs.buf, '.')
-	fs.buf = itoa(fs.buf, msec, 6)
-	fs.buf = append(fs.buf, ' ')
-	// write
-	fs.buf = append(fs.buf, []byte(str)...)
-	fs.buf = append(fs.buf, '\n')
-	fs.logw.Write(fs.buf)
-}
-
-func (fs *fileStorage) Log(str string) {
-	t := time.Now()
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return
-	}
-	fs.doLog(t, str)
-}
-
-func (fs *fileStorage) log(str string) {
-	fs.doLog(time.Now(), str)
-}
-
-func (fs *fileStorage) GetFile(num uint64, t FileType) File {
-	return &file{fs: fs, num: num, t: t}
-}
-
-func (fs *fileStorage) GetFiles(t FileType) (ff []File, err error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return nil, ErrClosed
-	}
-	dir, err := os.Open(fs.path)
-	if err != nil {
-		return
-	}
-	fnn, err := dir.Readdirnames(0)
-	// Close the dir first before checking for Readdirnames error.
-	if err := dir.Close(); err != nil {
-		fs.log(fmt.Sprintf("close dir: %v", err))
-	}
-	if err != nil {
-		return
-	}
-	f := &file{fs: fs}
-	for _, fn := range fnn {
-		if f.parse(fn) && (f.t&t) != 0 {
-			ff = append(ff, f)
-			f = &file{fs: fs}
-		}
-	}
-	return
-}
-
-func (fs *fileStorage) GetManifest() (f File, err error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return nil, ErrClosed
-	}
-	dir, err := os.Open(fs.path)
-	if err != nil {
-		return
-	}
-	fnn, err := dir.Readdirnames(0)
-	// Close the dir first before checking for Readdirnames error.
-	if err := dir.Close(); err != nil {
-		fs.log(fmt.Sprintf("close dir: %v", err))
-	}
-	if err != nil {
-		return
-	}
-	// Find latest CURRENT file.
-	var rem []string
-	var pend bool
-	var cerr error
-	for _, fn := range fnn {
-		if strings.HasPrefix(fn, "CURRENT") {
-			pend1 := len(fn) > 7
-			// Make sure it is valid name for a CURRENT file, otherwise skip it.
-			if pend1 {
-				if fn[7] != '.' || len(fn) < 9 {
-					fs.log(fmt.Sprintf("skipping %s: invalid file name", fn))
-					continue
-				}
-				if _, e1 := strconv.ParseUint(fn[8:], 10, 0); e1 != nil {
-					fs.log(fmt.Sprintf("skipping %s: invalid file num: %v", fn, e1))
-					continue
-				}
-			}
-			path := filepath.Join(fs.path, fn)
-			r, e1 := os.OpenFile(path, os.O_RDONLY, 0)
-			if e1 != nil {
-				return nil, e1
-			}
-			b, e1 := ioutil.ReadAll(r)
-			if e1 != nil {
-				r.Close()
-				return nil, e1
-			}
-			f1 := &file{fs: fs}
-			if len(b) < 1 || b[len(b)-1] != '\n' || !f1.parse(string(b[:len(b)-1])) {
-				fs.log(fmt.Sprintf("skipping %s: corrupted or incomplete", fn))
-				if pend1 {
-					rem = append(rem, fn)
-				}
-				if !pend1 || cerr == nil {
-					cerr = fmt.Errorf("leveldb/storage: corrupted or incomplete %s file", fn)
-				}
-			} else if f != nil && f1.Num() < f.Num() {
-				fs.log(fmt.Sprintf("skipping %s: obsolete", fn))
-				if pend1 {
-					rem = append(rem, fn)
-				}
-			} else {
-				f = f1
-				pend = pend1
-			}
-			if err := r.Close(); err != nil {
-				fs.log(fmt.Sprintf("close %s: %v", fn, err))
-			}
-		}
-	}
-	// Don't remove any files if there is no valid CURRENT file.
-	if f == nil {
-		if cerr != nil {
-			err = cerr
-		} else {
-			err = os.ErrNotExist
-		}
-		return
-	}
-	// Rename pending CURRENT file to an effective CURRENT.
-	if pend {
-		path := fmt.Sprintf("%s.%d", filepath.Join(fs.path, "CURRENT"), f.Num())
-		if err := rename(path, filepath.Join(fs.path, "CURRENT")); err != nil {
-			fs.log(fmt.Sprintf("CURRENT.%d -> CURRENT: %v", f.Num(), err))
-		}
-	}
-	// Remove obsolete or incomplete pending CURRENT files.
-	for _, fn := range rem {
-		path := filepath.Join(fs.path, fn)
-		if err := os.Remove(path); err != nil {
-			fs.log(fmt.Sprintf("remove %s: %v", fn, err))
-		}
-	}
-	return
-}
-
-func (fs *fileStorage) SetManifest(f File) (err error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return ErrClosed
-	}
-	f2, ok := f.(*file)
-	if !ok || f2.t != TypeManifest {
-		return ErrInvalidFile
-	}
-	defer func() {
-		if err != nil {
-			fs.log(fmt.Sprintf("CURRENT: %v", err))
-		}
-	}()
-	path := fmt.Sprintf("%s.%d", filepath.Join(fs.path, "CURRENT"), f2.Num())
-	w, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-	_, err = fmt.Fprintln(w, f2.name())
-	// Close the file first.
-	if err := w.Close(); err != nil {
-		fs.log(fmt.Sprintf("close CURRENT.%d: %v", f2.num, err))
-	}
-	if err != nil {
-		return err
-	}
-	return rename(path, filepath.Join(fs.path, "CURRENT"))
-}
-
-func (fs *fileStorage) Close() error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-	if fs.open < 0 {
-		return ErrClosed
-	}
-	// Clear the finalizer.
-	runtime.SetFinalizer(fs, nil)
-
-	if fs.open > 0 {
-		fs.log(fmt.Sprintf("refuse to close, %d files still open", fs.open))
-		return fmt.Errorf("leveldb/storage: cannot close, %d files still open", fs.open)
-	}
-	fs.open = -1
-	e1 := fs.logw.Close()
-	err := fs.flock.release()
-	if err == nil {
-		err = e1
-	}
-	return err
-}
-
-type fileWrap struct {
-	*os.File
-	f *file
-}
-
-func (fw fileWrap) Sync() error {
-	if err := fw.File.Sync(); err != nil {
-		return err
-	}
-	if fw.f.Type() == TypeManifest {
-		// Also sync parent directory if file type is manifest.
-		// See: https://code.google.com/p/leveldb/issues/detail?id=190.
-		if err := syncDir(fw.f.fs.path); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (fw fileWrap) Close() error {
-	f := fw.f
-	f.fs.mu.Lock()
-	defer f.fs.mu.Unlock()
-	if !f.open {
-		return ErrClosed
-	}
-	f.open = false
-	f.fs.open--
-	err := fw.File.Close()
-	if err != nil {
-		f.fs.log(fmt.Sprintf("close %s.%d: %v", f.Type(), f.Num(), err))
-	}
-	return err
-}
-
-type file struct {
-	fs   *fileStorage
-	num  uint64
-	t    FileType
-	open bool
-}
-
-func (f *file) Open() (Reader, error) {
-	f.fs.mu.Lock()
-	defer f.fs.mu.Unlock()
-	if f.fs.open < 0 {
-		return nil, ErrClosed
-	}
-	if f.open {
-		return nil, errFileOpen
-	}
-	of, err := os.OpenFile(f.path(), os.O_RDONLY, 0)
-	if err != nil {
-		if f.hasOldName() && os.IsNotExist(err) {
-			of, err = os.OpenFile(f.oldPath(), os.O_RDONLY, 0)
-			if err == nil {
-				goto ok
-			}
-		}
-		return nil, err
-	}
-ok:
-	f.open = true
-	f.fs.open++
-	return fileWrap{of, f}, nil
-}
-
-func (f *file) Create() (Writer, error) {
-	f.fs.mu.Lock()
-	defer f.fs.mu.Unlock()
-	if f.fs.open < 0 {
-		return nil, ErrClosed
-	}
-	if f.open {
-		return nil, errFileOpen
-	}
-	of, err := os.OpenFile(f.path(), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return nil, err
-	}
-	f.open = true
-	f.fs.open++
-	return fileWrap{of, f}, nil
-}
-
-func (f *file) Replace(newfile File) error {
-	f.fs.mu.Lock()
-	defer f.fs.mu.Unlock()
-	if f.fs.open < 0 {
-		return ErrClosed
-	}
-	newfile2, ok := newfile.(*file)
-	if !ok {
-		return ErrInvalidFile
-	}
-	if f.open || newfile2.open {
-		return errFileOpen
-	}
-	return rename(newfile2.path(), f.path())
-}
-
-func (f *file) Type() FileType {
-	return f.t
-}
-
-func (f *file) Num() uint64 {
-	return f.num
-}
-
-func (f *file) Remove() error {
-	f.fs.mu.Lock()
-	defer f.fs.mu.Unlock()
-	if f.fs.open < 0 {
-		return ErrClosed
-	}
-	if f.open {
-		return errFileOpen
-	}
-	err := os.Remove(f.path())
-	if err != nil {
-		f.fs.log(fmt.Sprintf("remove %s.%d: %v", f.Type(), f.Num(), err))
-	}
-	// Also try remove file with old name, just in case.
-	if f.hasOldName() {
-		if e1 := os.Remove(f.oldPath()); !os.IsNotExist(e1) {
-			f.fs.log(fmt.Sprintf("remove %s.%d: %v (old name)", f.Type(), f.Num(), err))
-			err = e1
-		}
-	}
-	return err
-}
-
-func (f *file) hasOldName() bool {
-	return f.t == TypeTable
-}
-
-func (f *file) oldName() string {
-	switch f.t {
-	case TypeTable:
-		return fmt.Sprintf("%06d.sst", f.num)
-	}
-	return f.name()
-}
-
-func (f *file) oldPath() string {
-	return filepath.Join(f.fs.path, f.oldName())
-}
-
-func (f *file) name() string {
-	switch f.t {
-	case TypeManifest:
-		return fmt.Sprintf("MANIFEST-%06d", f.num)
-	case TypeJournal:
-		return fmt.Sprintf("%06d.log", f.num)
-	case TypeTable:
-		return fmt.Sprintf("%06d.ldb", f.num)
-	case TypeTemp:
-		return fmt.Sprintf("%06d.tmp", f.num)
-	default:
-		panic("invalid file type")
-	}
-}
-
-func (f *file) path() string {
-	return filepath.Join(f.fs.path, f.name())
-}
-
-func (f *file) parse(name string) bool {
-	var num uint64
-	var tail string
-	_, err := fmt.Sscanf(name, "%d.%s", &num, &tail)
-	if err == nil {
-		switch tail {
-		case "log":
-			f.t = TypeJournal
-		case "ldb", "sst":
-			f.t = TypeTable
-		case "tmp":
-			f.t = TypeTemp
-		default:
-			return false
-		}
-		f.num = num
-		return true
-	}
-	n, _ := fmt.Sscanf(name, "MANIFEST-%d%s", &num, &tail)
-	if n == 1 {
-		f.t = TypeManifest
-		f.num = num
-		return true
-	}
-
-	return false
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go
deleted file mode 100644
index 42940d769..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_plan9.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"os"
-	"path/filepath"
-)
-
-type plan9FileLock struct {
-	f *os.File
-}
-
-func (fl *plan9FileLock) release() error {
-	return fl.f.Close()
-}
-
-func newFileLock(path string) (fl fileLock, err error) {
-	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, os.ModeExclusive|0644)
-	if err != nil {
-		return
-	}
-	fl = &plan9FileLock{f: f}
-	return
-}
-
-func rename(oldpath, newpath string) error {
-	if _, err := os.Stat(newpath); err == nil {
-		if err := os.Remove(newpath); err != nil {
-			return err
-		}
-	}
-
-	_, fname := filepath.Split(newpath)
-	return os.Rename(oldpath, fname)
-}
-
-func syncDir(name string) error {
-	f, err := os.Open(name)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := f.Sync(); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go
deleted file mode 100644
index 102031bfd..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_solaris.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build solaris
-
-package storage
-
-import (
-	"os"
-	"syscall"
-)
-
-type unixFileLock struct {
-	f *os.File
-}
-
-func (fl *unixFileLock) release() error {
-	if err := setFileLock(fl.f, false); err != nil {
-		return err
-	}
-	return fl.f.Close()
-}
-
-func newFileLock(path string) (fl fileLock, err error) {
-	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
-	if err != nil {
-		return
-	}
-	err = setFileLock(f, true)
-	if err != nil {
-		f.Close()
-		return
-	}
-	fl = &unixFileLock{f: f}
-	return
-}
-
-func setFileLock(f *os.File, lock bool) error {
-	flock := syscall.Flock_t{
-		Type:   syscall.F_UNLCK,
-		Start:  0,
-		Len:    0,
-		Whence: 1,
-	}
-	if lock {
-		flock.Type = syscall.F_WRLCK
-	}
-	return syscall.FcntlFlock(f.Fd(), syscall.F_SETLK, &flock)
-}
-
-func rename(oldpath, newpath string) error {
-	return os.Rename(oldpath, newpath)
-}
-
-func syncDir(name string) error {
-	f, err := os.Open(name)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := f.Sync(); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_test.go
deleted file mode 100644
index 92abcbb7d..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-var cases = []struct {
-	oldName []string
-	name    string
-	ftype   FileType
-	num     uint64
-}{
-	{nil, "000100.log", TypeJournal, 100},
-	{nil, "000000.log", TypeJournal, 0},
-	{[]string{"000000.sst"}, "000000.ldb", TypeTable, 0},
-	{nil, "MANIFEST-000002", TypeManifest, 2},
-	{nil, "MANIFEST-000007", TypeManifest, 7},
-	{nil, "18446744073709551615.log", TypeJournal, 18446744073709551615},
-	{nil, "000100.tmp", TypeTemp, 100},
-}
-
-var invalidCases = []string{
-	"",
-	"foo",
-	"foo-dx-100.log",
-	".log",
-	"",
-	"manifest",
-	"CURREN",
-	"CURRENTX",
-	"MANIFES",
-	"MANIFEST",
-	"MANIFEST-",
-	"XMANIFEST-3",
-	"MANIFEST-3x",
-	"LOC",
-	"LOCKx",
-	"LO",
-	"LOGx",
-	"18446744073709551616.log",
-	"184467440737095516150.log",
-	"100",
-	"100.",
-	"100.lop",
-}
-
-func TestFileStorage_CreateFileName(t *testing.T) {
-	for _, c := range cases {
-		f := &file{num: c.num, t: c.ftype}
-		if f.name() != c.name {
-			t.Errorf("invalid filename got '%s', want '%s'", f.name(), c.name)
-		}
-	}
-}
-
-func TestFileStorage_ParseFileName(t *testing.T) {
-	for _, c := range cases {
-		for _, name := range append([]string{c.name}, c.oldName...) {
-			f := new(file)
-			if !f.parse(name) {
-				t.Errorf("cannot parse filename '%s'", name)
-				continue
-			}
-			if f.Type() != c.ftype {
-				t.Errorf("filename '%s' invalid type got '%d', want '%d'", name, f.Type(), c.ftype)
-			}
-			if f.Num() != c.num {
-				t.Errorf("filename '%s' invalid number got '%d', want '%d'", name, f.Num(), c.num)
-			}
-		}
-	}
-}
-
-func TestFileStorage_InvalidFileName(t *testing.T) {
-	for _, name := range invalidCases {
-		f := new(file)
-		if f.parse(name) {
-			t.Errorf("filename '%s' should be invalid", name)
-		}
-	}
-}
-
-func TestFileStorage_Locking(t *testing.T) {
-	path := filepath.Join(os.TempDir(), fmt.Sprintf("goleveldbtestfd-%d", os.Getuid()))
-
-	_, err := os.Stat(path)
-	if err == nil {
-		err = os.RemoveAll(path)
-		if err != nil {
-			t.Fatal("RemoveAll: got error: ", err)
-		}
-	}
-
-	p1, err := OpenFile(path)
-	if err != nil {
-		t.Fatal("OpenFile(1): got error: ", err)
-	}
-
-	defer os.RemoveAll(path)
-
-	p2, err := OpenFile(path)
-	if err != nil {
-		t.Logf("OpenFile(2): got error: %s (expected)", err)
-	} else {
-		p2.Close()
-		p1.Close()
-		t.Fatal("OpenFile(2): expect error")
-	}
-
-	p1.Close()
-
-	p3, err := OpenFile(path)
-	if err != nil {
-		t.Fatal("OpenFile(3): got error: ", err)
-	}
-	defer p3.Close()
-
-	l, err := p3.Lock()
-	if err != nil {
-		t.Fatal("storage lock failed(1): ", err)
-	}
-	_, err = p3.Lock()
-	if err == nil {
-		t.Fatal("expect error for second storage lock attempt")
-	} else {
-		t.Logf("storage lock got error: %s (expected)", err)
-	}
-	l.Release()
-	_, err = p3.Lock()
-	if err != nil {
-		t.Fatal("storage lock failed(2): ", err)
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go
deleted file mode 100644
index d0a604b7a..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_unix.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package storage
-
-import (
-	"os"
-	"syscall"
-)
-
-type unixFileLock struct {
-	f *os.File
-}
-
-func (fl *unixFileLock) release() error {
-	if err := setFileLock(fl.f, false); err != nil {
-		return err
-	}
-	return fl.f.Close()
-}
-
-func newFileLock(path string) (fl fileLock, err error) {
-	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0644)
-	if err != nil {
-		return
-	}
-	err = setFileLock(f, true)
-	if err != nil {
-		f.Close()
-		return
-	}
-	fl = &unixFileLock{f: f}
-	return
-}
-
-func setFileLock(f *os.File, lock bool) error {
-	how := syscall.LOCK_UN
-	if lock {
-		how = syscall.LOCK_EX
-	}
-	return syscall.Flock(int(f.Fd()), how|syscall.LOCK_NB)
-}
-
-func rename(oldpath, newpath string) error {
-	return os.Rename(oldpath, newpath)
-}
-
-func syncDir(name string) error {
-	f, err := os.Open(name)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := f.Sync(); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go
deleted file mode 100644
index 50c3c454e..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/file_storage_windows.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var (
-	modkernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-	procMoveFileExW = modkernel32.NewProc("MoveFileExW")
-)
-
-const (
-	_MOVEFILE_REPLACE_EXISTING = 1
-)
-
-type windowsFileLock struct {
-	fd syscall.Handle
-}
-
-func (fl *windowsFileLock) release() error {
-	return syscall.Close(fl.fd)
-}
-
-func newFileLock(path string) (fl fileLock, err error) {
-	pathp, err := syscall.UTF16PtrFromString(path)
-	if err != nil {
-		return
-	}
-	fd, err := syscall.CreateFile(pathp, syscall.GENERIC_READ|syscall.GENERIC_WRITE, 0, nil, syscall.CREATE_ALWAYS, syscall.FILE_ATTRIBUTE_NORMAL, 0)
-	if err != nil {
-		return
-	}
-	fl = &windowsFileLock{fd: fd}
-	return
-}
-
-func moveFileEx(from *uint16, to *uint16, flags uint32) error {
-	r1, _, e1 := syscall.Syscall(procMoveFileExW.Addr(), 3, uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(to)), uintptr(flags))
-	if r1 == 0 {
-		if e1 != 0 {
-			return error(e1)
-		} else {
-			return syscall.EINVAL
-		}
-	}
-	return nil
-}
-
-func rename(oldpath, newpath string) error {
-	from, err := syscall.UTF16PtrFromString(oldpath)
-	if err != nil {
-		return err
-	}
-	to, err := syscall.UTF16PtrFromString(newpath)
-	if err != nil {
-		return err
-	}
-	return moveFileEx(from, to, _MOVEFILE_REPLACE_EXISTING)
-}
-
-func syncDir(name string) error { return nil }
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
deleted file mode 100644
index fc1c8165d..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"bytes"
-	"os"
-	"sync"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-const typeShift = 3
-
-type memStorageLock struct {
-	ms *memStorage
-}
-
-func (lock *memStorageLock) Release() {
-	ms := lock.ms
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if ms.slock == lock {
-		ms.slock = nil
-	}
-	return
-}
-
-// memStorage is a memory-backed storage.
-type memStorage struct {
-	mu       sync.Mutex
-	slock    *memStorageLock
-	files    map[uint64]*memFile
-	manifest *memFilePtr
-}
-
-// NewMemStorage returns a new memory-backed storage implementation.
-func NewMemStorage() Storage {
-	return &memStorage{
-		files: make(map[uint64]*memFile),
-	}
-}
-
-func (ms *memStorage) Lock() (util.Releaser, error) {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if ms.slock != nil {
-		return nil, ErrLocked
-	}
-	ms.slock = &memStorageLock{ms: ms}
-	return ms.slock, nil
-}
-
-func (*memStorage) Log(str string) {}
-
-func (ms *memStorage) GetFile(num uint64, t FileType) File {
-	return &memFilePtr{ms: ms, num: num, t: t}
-}
-
-func (ms *memStorage) GetFiles(t FileType) ([]File, error) {
-	ms.mu.Lock()
-	var ff []File
-	for x, _ := range ms.files {
-		num, mt := x>>typeShift, FileType(x)&TypeAll
-		if mt&t == 0 {
-			continue
-		}
-		ff = append(ff, &memFilePtr{ms: ms, num: num, t: mt})
-	}
-	ms.mu.Unlock()
-	return ff, nil
-}
-
-func (ms *memStorage) GetManifest() (File, error) {
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if ms.manifest == nil {
-		return nil, os.ErrNotExist
-	}
-	return ms.manifest, nil
-}
-
-func (ms *memStorage) SetManifest(f File) error {
-	fm, ok := f.(*memFilePtr)
-	if !ok || fm.t != TypeManifest {
-		return ErrInvalidFile
-	}
-	ms.mu.Lock()
-	ms.manifest = fm
-	ms.mu.Unlock()
-	return nil
-}
-
-func (*memStorage) Close() error { return nil }
-
-type memReader struct {
-	*bytes.Reader
-	m *memFile
-}
-
-func (mr *memReader) Close() error {
-	return mr.m.Close()
-}
-
-type memFile struct {
-	bytes.Buffer
-	ms   *memStorage
-	open bool
-}
-
-func (*memFile) Sync() error { return nil }
-func (m *memFile) Close() error {
-	m.ms.mu.Lock()
-	m.open = false
-	m.ms.mu.Unlock()
-	return nil
-}
-
-type memFilePtr struct {
-	ms  *memStorage
-	num uint64
-	t   FileType
-}
-
-func (p *memFilePtr) x() uint64 {
-	return p.Num()<<typeShift | uint64(p.Type())
-}
-
-func (p *memFilePtr) Open() (Reader, error) {
-	ms := p.ms
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if m, exist := ms.files[p.x()]; exist {
-		if m.open {
-			return nil, errFileOpen
-		}
-		m.open = true
-		return &memReader{Reader: bytes.NewReader(m.Bytes()), m: m}, nil
-	}
-	return nil, os.ErrNotExist
-}
-
-func (p *memFilePtr) Create() (Writer, error) {
-	ms := p.ms
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	m, exist := ms.files[p.x()]
-	if exist {
-		if m.open {
-			return nil, errFileOpen
-		}
-		m.Reset()
-	} else {
-		m = &memFile{ms: ms}
-		ms.files[p.x()] = m
-	}
-	m.open = true
-	return m, nil
-}
-
-func (p *memFilePtr) Replace(newfile File) error {
-	p1, ok := newfile.(*memFilePtr)
-	if !ok {
-		return ErrInvalidFile
-	}
-	ms := p.ms
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	m1, exist := ms.files[p1.x()]
-	if !exist {
-		return os.ErrNotExist
-	}
-	m0, exist := ms.files[p.x()]
-	if (exist && m0.open) || m1.open {
-		return errFileOpen
-	}
-	delete(ms.files, p1.x())
-	ms.files[p.x()] = m1
-	return nil
-}
-
-func (p *memFilePtr) Type() FileType {
-	return p.t
-}
-
-func (p *memFilePtr) Num() uint64 {
-	return p.num
-}
-
-func (p *memFilePtr) Remove() error {
-	ms := p.ms
-	ms.mu.Lock()
-	defer ms.mu.Unlock()
-	if _, exist := ms.files[p.x()]; exist {
-		delete(ms.files, p.x())
-		return nil
-	}
-	return os.ErrNotExist
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage_test.go
deleted file mode 100644
index 23bb074b4..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/mem_storage_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package storage
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestMemStorage(t *testing.T) {
-	m := NewMemStorage()
-
-	l, err := m.Lock()
-	if err != nil {
-		t.Fatal("storage lock failed(1): ", err)
-	}
-	_, err = m.Lock()
-	if err == nil {
-		t.Fatal("expect error for second storage lock attempt")
-	} else {
-		t.Logf("storage lock got error: %s (expected)", err)
-	}
-	l.Release()
-	_, err = m.Lock()
-	if err != nil {
-		t.Fatal("storage lock failed(2): ", err)
-	}
-
-	f := m.GetFile(1, TypeTable)
-	if f.Num() != 1 && f.Type() != TypeTable {
-		t.Fatal("invalid file number and type")
-	}
-	w, _ := f.Create()
-	w.Write([]byte("abc"))
-	w.Close()
-	if ff, _ := m.GetFiles(TypeAll); len(ff) != 1 {
-		t.Fatal("invalid GetFiles len")
-	}
-	buf := new(bytes.Buffer)
-	r, err := f.Open()
-	if err != nil {
-		t.Fatal("Open: got error: ", err)
-	}
-	buf.ReadFrom(r)
-	r.Close()
-	if got := buf.String(); got != "abc" {
-		t.Fatalf("Read: invalid value, want=abc got=%s", got)
-	}
-	if _, err := f.Open(); err != nil {
-		t.Fatal("Open: got error: ", err)
-	}
-	if _, err := m.GetFile(1, TypeTable).Open(); err == nil {
-		t.Fatal("expecting error")
-	}
-	f.Remove()
-	if ff, _ := m.GetFiles(TypeAll); len(ff) != 0 {
-		t.Fatal("invalid GetFiles len", len(ff))
-	}
-	if _, err := f.Open(); err == nil {
-		t.Fatal("expecting error")
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage/storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage/storage.go
deleted file mode 100644
index 85dd70b06..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage/storage.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package storage provides storage abstraction for LevelDB.
-package storage
-
-import (
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type FileType uint32
-
-const (
-	TypeManifest FileType = 1 << iota
-	TypeJournal
-	TypeTable
-	TypeTemp
-
-	TypeAll = TypeManifest | TypeJournal | TypeTable | TypeTemp
-)
-
-func (t FileType) String() string {
-	switch t {
-	case TypeManifest:
-		return "manifest"
-	case TypeJournal:
-		return "journal"
-	case TypeTable:
-		return "table"
-	case TypeTemp:
-		return "temp"
-	}
-	return fmt.Sprintf("<unknown:%d>", t)
-}
-
-var (
-	ErrInvalidFile = errors.New("leveldb/storage: invalid file for argument")
-	ErrLocked      = errors.New("leveldb/storage: already locked")
-	ErrClosed      = errors.New("leveldb/storage: closed")
-)
-
-// Syncer is the interface that wraps basic Sync method.
-type Syncer interface {
-	// Sync commits the current contents of the file to stable storage.
-	Sync() error
-}
-
-// Reader is the interface that groups the basic Read, Seek, ReadAt and Close
-// methods.
-type Reader interface {
-	io.ReadSeeker
-	io.ReaderAt
-	io.Closer
-}
-
-// Writer is the interface that groups the basic Write, Sync and Close
-// methods.
-type Writer interface {
-	io.WriteCloser
-	Syncer
-}
-
-// File is the file. A file instance must be goroutine-safe.
-type File interface {
-	// Open opens the file for read. Returns os.ErrNotExist error
-	// if the file does not exist.
-	// Returns ErrClosed if the underlying storage is closed.
-	Open() (r Reader, err error)
-
-	// Create creates the file for writting. Truncate the file if
-	// already exist.
-	// Returns ErrClosed if the underlying storage is closed.
-	Create() (w Writer, err error)
-
-	// Replace replaces file with newfile.
-	// Returns ErrClosed if the underlying storage is closed.
-	Replace(newfile File) error
-
-	// Type returns the file type
-	Type() FileType
-
-	// Num returns the file number.
-	Num() uint64
-
-	// Remove removes the file.
-	// Returns ErrClosed if the underlying storage is closed.
-	Remove() error
-}
-
-// Storage is the storage. A storage instance must be goroutine-safe.
-type Storage interface {
-	// Lock locks the storage. Any subsequent attempt to call Lock will fail
-	// until the last lock released.
-	// After use the caller should call the Release method.
-	Lock() (l util.Releaser, err error)
-
-	// Log logs a string. This is used for logging. An implementation
-	// may write to a file, stdout or simply do nothing.
-	Log(str string)
-
-	// GetFile returns a file for the given number and type. GetFile will never
-	// returns nil, even if the underlying storage is closed.
-	GetFile(num uint64, t FileType) File
-
-	// GetFiles returns a slice of files that match the given file types.
-	// The file types may be OR'ed together.
-	GetFiles(t FileType) ([]File, error)
-
-	// GetManifest returns a manifest file. Returns os.ErrNotExist if manifest
-	// file does not exist.
-	GetManifest() (File, error)
-
-	// SetManifest sets the given file as manifest file. The given file should
-	// be a manifest file type or error will be returned.
-	SetManifest(f File) error
-
-	// Close closes the storage. It is valid to call Close multiple times.
-	// Other methods should not be called after the storage has been closed.
-	Close() error
-}
-
-// FileInfo wraps basic file info.
-type FileInfo struct {
-	Type FileType
-	Num  uint64
-}
-
-func (fi FileInfo) String() string {
-	switch fi.Type {
-	case TypeManifest:
-		return fmt.Sprintf("MANIFEST-%06d", fi.Num)
-	case TypeJournal:
-		return fmt.Sprintf("%06d.log", fi.Num)
-	case TypeTable:
-		return fmt.Sprintf("%06d.ldb", fi.Num)
-	case TypeTemp:
-		return fmt.Sprintf("%06d.tmp", fi.Num)
-	default:
-		return fmt.Sprintf("%#x-%d", fi.Type, fi.Num)
-	}
-}
-
-// NewFileInfo creates new FileInfo from the given File. It will returns nil
-// if File is nil.
-func NewFileInfo(f File) *FileInfo {
-	if f == nil {
-		return nil
-	}
-	return &FileInfo{f.Type(), f.Num()}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/storage_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/storage_test.go
deleted file mode 100644
index 08be0bab3..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/storage_test.go
+++ /dev/null
@@ -1,549 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENE file.
-
-package leveldb
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-const typeShift = 4
-
-var (
-	tsErrInvalidFile = errors.New("leveldb.testStorage: invalid file for argument")
-	tsErrFileOpen    = errors.New("leveldb.testStorage: file still open")
-)
-
-var (
-	tsFSEnv   = os.Getenv("GOLEVELDB_USEFS")
-	tsTempdir = os.Getenv("GOLEVELDB_TEMPDIR")
-	tsKeepFS  = tsFSEnv == "2"
-	tsFS      = tsKeepFS || tsFSEnv == "" || tsFSEnv == "1"
-	tsMU      = &sync.Mutex{}
-	tsNum     = 0
-)
-
-type tsOp uint
-
-const (
-	tsOpOpen tsOp = iota
-	tsOpCreate
-	tsOpReplace
-	tsOpRemove
-	tsOpRead
-	tsOpReadAt
-	tsOpWrite
-	tsOpSync
-
-	tsOpNum
-)
-
-type tsLock struct {
-	ts *testStorage
-	r  util.Releaser
-}
-
-func (l tsLock) Release() {
-	l.r.Release()
-	l.ts.t.Log("I: storage lock released")
-}
-
-type tsReader struct {
-	tf tsFile
-	storage.Reader
-}
-
-func (tr tsReader) Read(b []byte) (n int, err error) {
-	ts := tr.tf.ts
-	ts.countRead(tr.tf.Type())
-	if tr.tf.shouldErrLocked(tsOpRead) {
-		return 0, errors.New("leveldb.testStorage: emulated read error")
-	}
-	n, err = tr.Reader.Read(b)
-	if err != nil && err != io.EOF {
-		ts.t.Errorf("E: read error, num=%d type=%v n=%d: %v", tr.tf.Num(), tr.tf.Type(), n, err)
-	}
-	return
-}
-
-func (tr tsReader) ReadAt(b []byte, off int64) (n int, err error) {
-	ts := tr.tf.ts
-	ts.countRead(tr.tf.Type())
-	if tr.tf.shouldErrLocked(tsOpReadAt) {
-		return 0, errors.New("leveldb.testStorage: emulated readAt error")
-	}
-	n, err = tr.Reader.ReadAt(b, off)
-	if err != nil && err != io.EOF {
-		ts.t.Errorf("E: readAt error, num=%d type=%v off=%d n=%d: %v", tr.tf.Num(), tr.tf.Type(), off, n, err)
-	}
-	return
-}
-
-func (tr tsReader) Close() (err error) {
-	err = tr.Reader.Close()
-	tr.tf.close("reader", err)
-	return
-}
-
-type tsWriter struct {
-	tf tsFile
-	storage.Writer
-}
-
-func (tw tsWriter) Write(b []byte) (n int, err error) {
-	if tw.tf.shouldErrLocked(tsOpWrite) {
-		return 0, errors.New("leveldb.testStorage: emulated write error")
-	}
-	n, err = tw.Writer.Write(b)
-	if err != nil {
-		tw.tf.ts.t.Errorf("E: write error, num=%d type=%v n=%d: %v", tw.tf.Num(), tw.tf.Type(), n, err)
-	}
-	return
-}
-
-func (tw tsWriter) Sync() (err error) {
-	ts := tw.tf.ts
-	ts.mu.Lock()
-	for ts.emuDelaySync&tw.tf.Type() != 0 {
-		ts.cond.Wait()
-	}
-	ts.mu.Unlock()
-	if tw.tf.shouldErrLocked(tsOpSync) {
-		return errors.New("leveldb.testStorage: emulated sync error")
-	}
-	err = tw.Writer.Sync()
-	if err != nil {
-		tw.tf.ts.t.Errorf("E: sync error, num=%d type=%v: %v", tw.tf.Num(), tw.tf.Type(), err)
-	}
-	return
-}
-
-func (tw tsWriter) Close() (err error) {
-	err = tw.Writer.Close()
-	tw.tf.close("writer", err)
-	return
-}
-
-type tsFile struct {
-	ts *testStorage
-	storage.File
-}
-
-func (tf tsFile) x() uint64 {
-	return tf.Num()<<typeShift | uint64(tf.Type())
-}
-
-func (tf tsFile) shouldErr(op tsOp) bool {
-	return tf.ts.shouldErr(tf, op)
-}
-
-func (tf tsFile) shouldErrLocked(op tsOp) bool {
-	tf.ts.mu.Lock()
-	defer tf.ts.mu.Unlock()
-	return tf.shouldErr(op)
-}
-
-func (tf tsFile) checkOpen(m string) error {
-	ts := tf.ts
-	if writer, ok := ts.opens[tf.x()]; ok {
-		if writer {
-			ts.t.Errorf("E: cannot %s file, num=%d type=%v: a writer still open", m, tf.Num(), tf.Type())
-		} else {
-			ts.t.Errorf("E: cannot %s file, num=%d type=%v: a reader still open", m, tf.Num(), tf.Type())
-		}
-		return tsErrFileOpen
-	}
-	return nil
-}
-
-func (tf tsFile) close(m string, err error) {
-	ts := tf.ts
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	if _, ok := ts.opens[tf.x()]; !ok {
-		ts.t.Errorf("E: %s: redudant file closing, num=%d type=%v", m, tf.Num(), tf.Type())
-	} else if err == nil {
-		ts.t.Logf("I: %s: file closed, num=%d type=%v", m, tf.Num(), tf.Type())
-	}
-	delete(ts.opens, tf.x())
-	if err != nil {
-		ts.t.Errorf("E: %s: cannot close file, num=%d type=%v: %v", m, tf.Num(), tf.Type(), err)
-	}
-}
-
-func (tf tsFile) Open() (r storage.Reader, err error) {
-	ts := tf.ts
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	err = tf.checkOpen("open")
-	if err != nil {
-		return
-	}
-	if tf.shouldErr(tsOpOpen) {
-		err = errors.New("leveldb.testStorage: emulated open error")
-		return
-	}
-	r, err = tf.File.Open()
-	if err != nil {
-		if ts.ignoreOpenErr&tf.Type() != 0 {
-			ts.t.Logf("I: cannot open file, num=%d type=%v: %v (ignored)", tf.Num(), tf.Type(), err)
-		} else {
-			ts.t.Errorf("E: cannot open file, num=%d type=%v: %v", tf.Num(), tf.Type(), err)
-		}
-	} else {
-		ts.t.Logf("I: file opened, num=%d type=%v", tf.Num(), tf.Type())
-		ts.opens[tf.x()] = false
-		r = tsReader{tf, r}
-	}
-	return
-}
-
-func (tf tsFile) Create() (w storage.Writer, err error) {
-	ts := tf.ts
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	err = tf.checkOpen("create")
-	if err != nil {
-		return
-	}
-	if tf.shouldErr(tsOpCreate) {
-		err = errors.New("leveldb.testStorage: emulated create error")
-		return
-	}
-	w, err = tf.File.Create()
-	if err != nil {
-		ts.t.Errorf("E: cannot create file, num=%d type=%v: %v", tf.Num(), tf.Type(), err)
-	} else {
-		ts.t.Logf("I: file created, num=%d type=%v", tf.Num(), tf.Type())
-		ts.opens[tf.x()] = true
-		w = tsWriter{tf, w}
-	}
-	return
-}
-
-func (tf tsFile) Replace(newfile storage.File) (err error) {
-	ts := tf.ts
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	err = tf.checkOpen("replace")
-	if err != nil {
-		return
-	}
-	if tf.shouldErr(tsOpReplace) {
-		err = errors.New("leveldb.testStorage: emulated create error")
-		return
-	}
-	err = tf.File.Replace(newfile.(tsFile).File)
-	if err != nil {
-		ts.t.Errorf("E: cannot replace file, num=%d type=%v: %v", tf.Num(), tf.Type(), err)
-	} else {
-		ts.t.Logf("I: file replace, num=%d type=%v", tf.Num(), tf.Type())
-	}
-	return
-}
-
-func (tf tsFile) Remove() (err error) {
-	ts := tf.ts
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	err = tf.checkOpen("remove")
-	if err != nil {
-		return
-	}
-	if tf.shouldErr(tsOpRemove) {
-		err = errors.New("leveldb.testStorage: emulated create error")
-		return
-	}
-	err = tf.File.Remove()
-	if err != nil {
-		ts.t.Errorf("E: cannot remove file, num=%d type=%v: %v", tf.Num(), tf.Type(), err)
-	} else {
-		ts.t.Logf("I: file removed, num=%d type=%v", tf.Num(), tf.Type())
-	}
-	return
-}
-
-type testStorage struct {
-	t *testing.T
-	storage.Storage
-	closeFn func() error
-
-	mu   sync.Mutex
-	cond sync.Cond
-	// Open files, true=writer, false=reader
-	opens         map[uint64]bool
-	emuDelaySync  storage.FileType
-	ignoreOpenErr storage.FileType
-	readCnt       uint64
-	readCntEn     storage.FileType
-
-	emuErr         [tsOpNum]storage.FileType
-	emuErrOnce     [tsOpNum]storage.FileType
-	emuRandErr     [tsOpNum]storage.FileType
-	emuRandErrProb int
-	emuErrOnceMap  map[uint64]uint
-	emuRandRand    *rand.Rand
-}
-
-func (ts *testStorage) shouldErr(tf tsFile, op tsOp) bool {
-	if ts.emuErr[op]&tf.Type() != 0 {
-		return true
-	} else if ts.emuRandErr[op]&tf.Type() != 0 || ts.emuErrOnce[op]&tf.Type() != 0 {
-		sop := uint(1) << op
-		eop := ts.emuErrOnceMap[tf.x()]
-		if eop&sop == 0 && (ts.emuRandRand.Int()%ts.emuRandErrProb == 0 || ts.emuErrOnce[op]&tf.Type() != 0) {
-			ts.emuErrOnceMap[tf.x()] = eop | sop
-			ts.t.Logf("I: emulated error: file=%d type=%v op=%v", tf.Num(), tf.Type(), op)
-			return true
-		}
-	}
-	return false
-}
-
-func (ts *testStorage) SetEmuErr(t storage.FileType, ops ...tsOp) {
-	ts.mu.Lock()
-	for _, op := range ops {
-		ts.emuErr[op] = t
-	}
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) SetEmuErrOnce(t storage.FileType, ops ...tsOp) {
-	ts.mu.Lock()
-	for _, op := range ops {
-		ts.emuErrOnce[op] = t
-	}
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) SetEmuRandErr(t storage.FileType, ops ...tsOp) {
-	ts.mu.Lock()
-	for _, op := range ops {
-		ts.emuRandErr[op] = t
-	}
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) SetEmuRandErrProb(prob int) {
-	ts.mu.Lock()
-	ts.emuRandErrProb = prob
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) DelaySync(t storage.FileType) {
-	ts.mu.Lock()
-	ts.emuDelaySync |= t
-	ts.cond.Broadcast()
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) ReleaseSync(t storage.FileType) {
-	ts.mu.Lock()
-	ts.emuDelaySync &= ^t
-	ts.cond.Broadcast()
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) ReadCounter() uint64 {
-	ts.mu.Lock()
-	defer ts.mu.Unlock()
-	return ts.readCnt
-}
-
-func (ts *testStorage) ResetReadCounter() {
-	ts.mu.Lock()
-	ts.readCnt = 0
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) SetReadCounter(t storage.FileType) {
-	ts.mu.Lock()
-	ts.readCntEn = t
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) countRead(t storage.FileType) {
-	ts.mu.Lock()
-	if ts.readCntEn&t != 0 {
-		ts.readCnt++
-	}
-	ts.mu.Unlock()
-}
-
-func (ts *testStorage) SetIgnoreOpenErr(t storage.FileType) {
-	ts.ignoreOpenErr = t
-}
-
-func (ts *testStorage) Lock() (r util.Releaser, err error) {
-	r, err = ts.Storage.Lock()
-	if err != nil {
-		ts.t.Logf("W: storage locking failed: %v", err)
-	} else {
-		ts.t.Log("I: storage locked")
-		r = tsLock{ts, r}
-	}
-	return
-}
-
-func (ts *testStorage) Log(str string) {
-	ts.t.Log("L: " + str)
-	ts.Storage.Log(str)
-}
-
-func (ts *testStorage) GetFile(num uint64, t storage.FileType) storage.File {
-	return tsFile{ts, ts.Storage.GetFile(num, t)}
-}
-
-func (ts *testStorage) GetFiles(t storage.FileType) (ff []storage.File, err error) {
-	ff0, err := ts.Storage.GetFiles(t)
-	if err != nil {
-		ts.t.Errorf("E: get files failed: %v", err)
-		return
-	}
-	ff = make([]storage.File, len(ff0))
-	for i, f := range ff0 {
-		ff[i] = tsFile{ts, f}
-	}
-	ts.t.Logf("I: get files, type=0x%x count=%d", int(t), len(ff))
-	return
-}
-
-func (ts *testStorage) GetManifest() (f storage.File, err error) {
-	f0, err := ts.Storage.GetManifest()
-	if err != nil {
-		if !os.IsNotExist(err) {
-			ts.t.Errorf("E: get manifest failed: %v", err)
-		}
-		return
-	}
-	f = tsFile{ts, f0}
-	ts.t.Logf("I: get manifest, num=%d", f.Num())
-	return
-}
-
-func (ts *testStorage) SetManifest(f storage.File) error {
-	tf, ok := f.(tsFile)
-	if !ok {
-		ts.t.Error("E: set manifest failed: type assertion failed")
-		return tsErrInvalidFile
-	} else if tf.Type() != storage.TypeManifest {
-		ts.t.Errorf("E: set manifest failed: invalid file type: %s", tf.Type())
-		return tsErrInvalidFile
-	}
-	err := ts.Storage.SetManifest(tf.File)
-	if err != nil {
-		ts.t.Errorf("E: set manifest failed: %v", err)
-	} else {
-		ts.t.Logf("I: set manifest, num=%d", tf.Num())
-	}
-	return err
-}
-
-func (ts *testStorage) Close() error {
-	ts.CloseCheck()
-	err := ts.Storage.Close()
-	if err != nil {
-		ts.t.Errorf("E: closing storage failed: %v", err)
-	} else {
-		ts.t.Log("I: storage closed")
-	}
-	if ts.closeFn != nil {
-		if err := ts.closeFn(); err != nil {
-			ts.t.Errorf("E: close function: %v", err)
-		}
-	}
-	return err
-}
-
-func (ts *testStorage) CloseCheck() {
-	ts.mu.Lock()
-	if len(ts.opens) == 0 {
-		ts.t.Log("I: all files are closed")
-	} else {
-		ts.t.Errorf("E: %d files still open", len(ts.opens))
-		for x, writer := range ts.opens {
-			num, tt := x>>typeShift, storage.FileType(x)&storage.TypeAll
-			ts.t.Errorf("E: * num=%d type=%v writer=%v", num, tt, writer)
-		}
-	}
-	ts.mu.Unlock()
-}
-
-func newTestStorage(t *testing.T) *testStorage {
-	var stor storage.Storage
-	var closeFn func() error
-	if tsFS {
-		for {
-			tsMU.Lock()
-			num := tsNum
-			tsNum++
-			tsMU.Unlock()
-			tempdir := tsTempdir
-			if tempdir == "" {
-				tempdir = os.TempDir()
-			}
-			path := filepath.Join(tempdir, fmt.Sprintf("goleveldb-test%d0%d0%d", os.Getuid(), os.Getpid(), num))
-			if _, err := os.Stat(path); err != nil {
-				stor, err = storage.OpenFile(path)
-				if err != nil {
-					t.Fatalf("F: cannot create storage: %v", err)
-				}
-				t.Logf("I: storage created: %s", path)
-				closeFn = func() error {
-					for _, name := range []string{"LOG.old", "LOG"} {
-						f, err := os.Open(filepath.Join(path, name))
-						if err != nil {
-							continue
-						}
-						if log, err := ioutil.ReadAll(f); err != nil {
-							t.Logf("---------------------- %s ----------------------", name)
-							t.Logf("cannot read log: %v", err)
-							t.Logf("---------------------- %s ----------------------", name)
-						} else if len(log) > 0 {
-							t.Logf("---------------------- %s ----------------------\n%s", name, string(log))
-							t.Logf("---------------------- %s ----------------------", name)
-						}
-						f.Close()
-					}
-					if t.Failed() {
-						t.Logf("testing failed, test DB preserved at %s", path)
-						return nil
-					}
-					if tsKeepFS {
-						return nil
-					}
-					return os.RemoveAll(path)
-				}
-
-				break
-			}
-		}
-	} else {
-		stor = storage.NewMemStorage()
-	}
-	ts := &testStorage{
-		t:              t,
-		Storage:        stor,
-		closeFn:        closeFn,
-		opens:          make(map[uint64]bool),
-		emuErrOnceMap:  make(map[uint64]uint),
-		emuRandErrProb: 0x999,
-		emuRandRand:    rand.New(rand.NewSource(0xfacedead)),
-	}
-	ts.cond.L = &ts.mu
-	return ts
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table.go b/vendor/github.com/syndtr/goleveldb/leveldb/table.go
deleted file mode 100644
index db386f3b5..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"fmt"
-	"sort"
-	"sync/atomic"
-
-	"github.com/syndtr/goleveldb/leveldb/cache"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/table"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-// tFile holds basic information about a table.
-type tFile struct {
-	file       storage.File
-	seekLeft   int32
-	size       uint64
-	imin, imax iKey
-}
-
-// Returns true if given key is after largest key of this table.
-func (t *tFile) after(icmp *iComparer, ukey []byte) bool {
-	return ukey != nil && icmp.uCompare(ukey, t.imax.ukey()) > 0
-}
-
-// Returns true if given key is before smallest key of this table.
-func (t *tFile) before(icmp *iComparer, ukey []byte) bool {
-	return ukey != nil && icmp.uCompare(ukey, t.imin.ukey()) < 0
-}
-
-// Returns true if given key range overlaps with this table key range.
-func (t *tFile) overlaps(icmp *iComparer, umin, umax []byte) bool {
-	return !t.after(icmp, umin) && !t.before(icmp, umax)
-}
-
-// Cosumes one seek and return current seeks left.
-func (t *tFile) consumeSeek() int32 {
-	return atomic.AddInt32(&t.seekLeft, -1)
-}
-
-// Creates new tFile.
-func newTableFile(file storage.File, size uint64, imin, imax iKey) *tFile {
-	f := &tFile{
-		file: file,
-		size: size,
-		imin: imin,
-		imax: imax,
-	}
-
-	// We arrange to automatically compact this file after
-	// a certain number of seeks.  Let's assume:
-	//   (1) One seek costs 10ms
-	//   (2) Writing or reading 1MB costs 10ms (100MB/s)
-	//   (3) A compaction of 1MB does 25MB of IO:
-	//         1MB read from this level
-	//         10-12MB read from next level (boundaries may be misaligned)
-	//         10-12MB written to next level
-	// This implies that 25 seeks cost the same as the compaction
-	// of 1MB of data.  I.e., one seek costs approximately the
-	// same as the compaction of 40KB of data.  We are a little
-	// conservative and allow approximately one seek for every 16KB
-	// of data before triggering a compaction.
-	f.seekLeft = int32(size / 16384)
-	if f.seekLeft < 100 {
-		f.seekLeft = 100
-	}
-
-	return f
-}
-
-// tFiles hold multiple tFile.
-type tFiles []*tFile
-
-func (tf tFiles) Len() int      { return len(tf) }
-func (tf tFiles) Swap(i, j int) { tf[i], tf[j] = tf[j], tf[i] }
-
-func (tf tFiles) nums() string {
-	x := "[ "
-	for i, f := range tf {
-		if i != 0 {
-			x += ", "
-		}
-		x += fmt.Sprint(f.file.Num())
-	}
-	x += " ]"
-	return x
-}
-
-// Returns true if i smallest key is less than j.
-// This used for sort by key in ascending order.
-func (tf tFiles) lessByKey(icmp *iComparer, i, j int) bool {
-	a, b := tf[i], tf[j]
-	n := icmp.Compare(a.imin, b.imin)
-	if n == 0 {
-		return a.file.Num() < b.file.Num()
-	}
-	return n < 0
-}
-
-// Returns true if i file number is greater than j.
-// This used for sort by file number in descending order.
-func (tf tFiles) lessByNum(i, j int) bool {
-	return tf[i].file.Num() > tf[j].file.Num()
-}
-
-// Sorts tables by key in ascending order.
-func (tf tFiles) sortByKey(icmp *iComparer) {
-	sort.Sort(&tFilesSortByKey{tFiles: tf, icmp: icmp})
-}
-
-// Sorts tables by file number in descending order.
-func (tf tFiles) sortByNum() {
-	sort.Sort(&tFilesSortByNum{tFiles: tf})
-}
-
-// Returns sum of all tables size.
-func (tf tFiles) size() (sum uint64) {
-	for _, t := range tf {
-		sum += t.size
-	}
-	return sum
-}
-
-// Searches smallest index of tables whose its smallest
-// key is after or equal with given key.
-func (tf tFiles) searchMin(icmp *iComparer, ikey iKey) int {
-	return sort.Search(len(tf), func(i int) bool {
-		return icmp.Compare(tf[i].imin, ikey) >= 0
-	})
-}
-
-// Searches smallest index of tables whose its largest
-// key is after or equal with given key.
-func (tf tFiles) searchMax(icmp *iComparer, ikey iKey) int {
-	return sort.Search(len(tf), func(i int) bool {
-		return icmp.Compare(tf[i].imax, ikey) >= 0
-	})
-}
-
-// Returns true if given key range overlaps with one or more
-// tables key range. If unsorted is true then binary search will not be used.
-func (tf tFiles) overlaps(icmp *iComparer, umin, umax []byte, unsorted bool) bool {
-	if unsorted {
-		// Check against all files.
-		for _, t := range tf {
-			if t.overlaps(icmp, umin, umax) {
-				return true
-			}
-		}
-		return false
-	}
-
-	i := 0
-	if len(umin) > 0 {
-		// Find the earliest possible internal key for min.
-		i = tf.searchMax(icmp, newIkey(umin, kMaxSeq, ktSeek))
-	}
-	if i >= len(tf) {
-		// Beginning of range is after all files, so no overlap.
-		return false
-	}
-	return !tf[i].before(icmp, umax)
-}
-
-// Returns tables whose its key range overlaps with given key range.
-// Range will be expanded if ukey found hop across tables.
-// If overlapped is true then the search will be restarted if umax
-// expanded.
-// The dst content will be overwritten.
-func (tf tFiles) getOverlaps(dst tFiles, icmp *iComparer, umin, umax []byte, overlapped bool) tFiles {
-	dst = dst[:0]
-	for i := 0; i < len(tf); {
-		t := tf[i]
-		if t.overlaps(icmp, umin, umax) {
-			if umin != nil && icmp.uCompare(t.imin.ukey(), umin) < 0 {
-				umin = t.imin.ukey()
-				dst = dst[:0]
-				i = 0
-				continue
-			} else if umax != nil && icmp.uCompare(t.imax.ukey(), umax) > 0 {
-				umax = t.imax.ukey()
-				// Restart search if it is overlapped.
-				if overlapped {
-					dst = dst[:0]
-					i = 0
-					continue
-				}
-			}
-
-			dst = append(dst, t)
-		}
-		i++
-	}
-
-	return dst
-}
-
-// Returns tables key range.
-func (tf tFiles) getRange(icmp *iComparer) (imin, imax iKey) {
-	for i, t := range tf {
-		if i == 0 {
-			imin, imax = t.imin, t.imax
-			continue
-		}
-		if icmp.Compare(t.imin, imin) < 0 {
-			imin = t.imin
-		}
-		if icmp.Compare(t.imax, imax) > 0 {
-			imax = t.imax
-		}
-	}
-
-	return
-}
-
-// Creates iterator index from tables.
-func (tf tFiles) newIndexIterator(tops *tOps, icmp *iComparer, slice *util.Range, ro *opt.ReadOptions) iterator.IteratorIndexer {
-	if slice != nil {
-		var start, limit int
-		if slice.Start != nil {
-			start = tf.searchMax(icmp, iKey(slice.Start))
-		}
-		if slice.Limit != nil {
-			limit = tf.searchMin(icmp, iKey(slice.Limit))
-		} else {
-			limit = tf.Len()
-		}
-		tf = tf[start:limit]
-	}
-	return iterator.NewArrayIndexer(&tFilesArrayIndexer{
-		tFiles: tf,
-		tops:   tops,
-		icmp:   icmp,
-		slice:  slice,
-		ro:     ro,
-	})
-}
-
-// Tables iterator index.
-type tFilesArrayIndexer struct {
-	tFiles
-	tops  *tOps
-	icmp  *iComparer
-	slice *util.Range
-	ro    *opt.ReadOptions
-}
-
-func (a *tFilesArrayIndexer) Search(key []byte) int {
-	return a.searchMax(a.icmp, iKey(key))
-}
-
-func (a *tFilesArrayIndexer) Get(i int) iterator.Iterator {
-	if i == 0 || i == a.Len()-1 {
-		return a.tops.newIterator(a.tFiles[i], a.slice, a.ro)
-	}
-	return a.tops.newIterator(a.tFiles[i], nil, a.ro)
-}
-
-// Helper type for sortByKey.
-type tFilesSortByKey struct {
-	tFiles
-	icmp *iComparer
-}
-
-func (x *tFilesSortByKey) Less(i, j int) bool {
-	return x.lessByKey(x.icmp, i, j)
-}
-
-// Helper type for sortByNum.
-type tFilesSortByNum struct {
-	tFiles
-}
-
-func (x *tFilesSortByNum) Less(i, j int) bool {
-	return x.lessByNum(i, j)
-}
-
-// Table operations.
-type tOps struct {
-	s      *session
-	cache  *cache.Cache
-	bcache *cache.Cache
-	bpool  *util.BufferPool
-}
-
-// Creates an empty table and returns table writer.
-func (t *tOps) create() (*tWriter, error) {
-	file := t.s.getTableFile(t.s.allocFileNum())
-	fw, err := file.Create()
-	if err != nil {
-		return nil, err
-	}
-	return &tWriter{
-		t:    t,
-		file: file,
-		w:    fw,
-		tw:   table.NewWriter(fw, t.s.o.Options),
-	}, nil
-}
-
-// Builds table from src iterator.
-func (t *tOps) createFrom(src iterator.Iterator) (f *tFile, n int, err error) {
-	w, err := t.create()
-	if err != nil {
-		return
-	}
-
-	defer func() {
-		if err != nil {
-			w.drop()
-		}
-	}()
-
-	for src.Next() {
-		err = w.append(src.Key(), src.Value())
-		if err != nil {
-			return
-		}
-	}
-	err = src.Error()
-	if err != nil {
-		return
-	}
-
-	n = w.tw.EntriesLen()
-	f, err = w.finish()
-	return
-}
-
-// Opens table. It returns a cache handle, which should
-// be released after use.
-func (t *tOps) open(f *tFile) (ch *cache.Handle, err error) {
-	num := f.file.Num()
-	ch = t.cache.Get(0, num, func() (size int, value cache.Value) {
-		var r storage.Reader
-		r, err = f.file.Open()
-		if err != nil {
-			return 0, nil
-		}
-
-		var bcache *cache.CacheGetter
-		if t.bcache != nil {
-			bcache = &cache.CacheGetter{Cache: t.bcache, NS: num}
-		}
-
-		var tr *table.Reader
-		tr, err = table.NewReader(r, int64(f.size), storage.NewFileInfo(f.file), bcache, t.bpool, t.s.o.Options)
-		if err != nil {
-			r.Close()
-			return 0, nil
-		}
-		return 1, tr
-
-	})
-	if ch == nil && err == nil {
-		err = ErrClosed
-	}
-	return
-}
-
-// Finds key/value pair whose key is greater than or equal to the
-// given key.
-func (t *tOps) find(f *tFile, key []byte, ro *opt.ReadOptions) (rkey, rvalue []byte, err error) {
-	ch, err := t.open(f)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer ch.Release()
-	return ch.Value().(*table.Reader).Find(key, true, ro)
-}
-
-// Finds key that is greater than or equal to the given key.
-func (t *tOps) findKey(f *tFile, key []byte, ro *opt.ReadOptions) (rkey []byte, err error) {
-	ch, err := t.open(f)
-	if err != nil {
-		return nil, err
-	}
-	defer ch.Release()
-	return ch.Value().(*table.Reader).FindKey(key, true, ro)
-}
-
-// Returns approximate offset of the given key.
-func (t *tOps) offsetOf(f *tFile, key []byte) (offset uint64, err error) {
-	ch, err := t.open(f)
-	if err != nil {
-		return
-	}
-	defer ch.Release()
-	offset_, err := ch.Value().(*table.Reader).OffsetOf(key)
-	return uint64(offset_), err
-}
-
-// Creates an iterator from the given table.
-func (t *tOps) newIterator(f *tFile, slice *util.Range, ro *opt.ReadOptions) iterator.Iterator {
-	ch, err := t.open(f)
-	if err != nil {
-		return iterator.NewEmptyIterator(err)
-	}
-	iter := ch.Value().(*table.Reader).NewIterator(slice, ro)
-	iter.SetReleaser(ch)
-	return iter
-}
-
-// Removes table from persistent storage. It waits until
-// no one use the the table.
-func (t *tOps) remove(f *tFile) {
-	num := f.file.Num()
-	t.cache.Delete(0, num, func() {
-		if err := f.file.Remove(); err != nil {
-			t.s.logf("table@remove removing @%d %q", num, err)
-		} else {
-			t.s.logf("table@remove removed @%d", num)
-		}
-		if t.bcache != nil {
-			t.bcache.EvictNS(num)
-		}
-	})
-}
-
-// Closes the table ops instance. It will close all tables,
-// regadless still used or not.
-func (t *tOps) close() {
-	t.bpool.Close()
-	t.cache.Close()
-	if t.bcache != nil {
-		t.bcache.Close()
-	}
-}
-
-// Creates new initialized table ops instance.
-func newTableOps(s *session) *tOps {
-	var (
-		cacher cache.Cacher
-		bcache *cache.Cache
-		bpool  *util.BufferPool
-	)
-	if s.o.GetOpenFilesCacheCapacity() > 0 {
-		cacher = cache.NewLRU(s.o.GetOpenFilesCacheCapacity())
-	}
-	if !s.o.GetDisableBlockCache() {
-		var bcacher cache.Cacher
-		if s.o.GetBlockCacheCapacity() > 0 {
-			bcacher = cache.NewLRU(s.o.GetBlockCacheCapacity())
-		}
-		bcache = cache.NewCache(bcacher)
-	}
-	if !s.o.GetDisableBufferPool() {
-		bpool = util.NewBufferPool(s.o.GetBlockSize() + 5)
-	}
-	return &tOps{
-		s:      s,
-		cache:  cache.NewCache(cacher),
-		bcache: bcache,
-		bpool:  bpool,
-	}
-}
-
-// tWriter wraps the table writer. It keep track of file descriptor
-// and added key range.
-type tWriter struct {
-	t *tOps
-
-	file storage.File
-	w    storage.Writer
-	tw   *table.Writer
-
-	first, last []byte
-}
-
-// Append key/value pair to the table.
-func (w *tWriter) append(key, value []byte) error {
-	if w.first == nil {
-		w.first = append([]byte{}, key...)
-	}
-	w.last = append(w.last[:0], key...)
-	return w.tw.Append(key, value)
-}
-
-// Returns true if the table is empty.
-func (w *tWriter) empty() bool {
-	return w.first == nil
-}
-
-// Closes the storage.Writer.
-func (w *tWriter) close() {
-	if w.w != nil {
-		w.w.Close()
-		w.w = nil
-	}
-}
-
-// Finalizes the table and returns table file.
-func (w *tWriter) finish() (f *tFile, err error) {
-	defer w.close()
-	err = w.tw.Close()
-	if err != nil {
-		return
-	}
-	err = w.w.Sync()
-	if err != nil {
-		return
-	}
-	f = newTableFile(w.file, uint64(w.tw.BytesLen()), iKey(w.first), iKey(w.last))
-	return
-}
-
-// Drops the table.
-func (w *tWriter) drop() {
-	w.close()
-	w.file.Remove()
-	w.t.s.reuseFileNum(w.file.Num())
-	w.file = nil
-	w.tw = nil
-	w.first = nil
-	w.last = nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/block_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/block_test.go
deleted file mode 100644
index 00e6f9eea..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/block_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package table
-
-import (
-	"encoding/binary"
-	"fmt"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type blockTesting struct {
-	tr *Reader
-	b  *block
-}
-
-func (t *blockTesting) TestNewIterator(slice *util.Range) iterator.Iterator {
-	return t.tr.newBlockIter(t.b, nil, slice, false)
-}
-
-var _ = testutil.Defer(func() {
-	Describe("Block", func() {
-		Build := func(kv *testutil.KeyValue, restartInterval int) *blockTesting {
-			// Building the block.
-			bw := &blockWriter{
-				restartInterval: restartInterval,
-				scratch:         make([]byte, 30),
-			}
-			kv.Iterate(func(i int, key, value []byte) {
-				bw.append(key, value)
-			})
-			bw.finish()
-
-			// Opening the block.
-			data := bw.buf.Bytes()
-			restartsLen := int(binary.LittleEndian.Uint32(data[len(data)-4:]))
-			return &blockTesting{
-				tr: &Reader{cmp: comparer.DefaultComparer},
-				b: &block{
-					data:           data,
-					restartsLen:    restartsLen,
-					restartsOffset: len(data) - (restartsLen+1)*4,
-				},
-			}
-		}
-
-		Describe("read test", func() {
-			for restartInterval := 1; restartInterval <= 5; restartInterval++ {
-				Describe(fmt.Sprintf("with restart interval of %d", restartInterval), func() {
-					kv := &testutil.KeyValue{}
-					Text := func() string {
-						return fmt.Sprintf("and %d keys", kv.Len())
-					}
-
-					Test := func() {
-						// Make block.
-						br := Build(kv, restartInterval)
-						// Do testing.
-						testutil.KeyValueTesting(nil, kv.Clone(), br, nil, nil)
-					}
-
-					Describe(Text(), Test)
-
-					kv.PutString("", "empty")
-					Describe(Text(), Test)
-
-					kv.PutString("a1", "foo")
-					Describe(Text(), Test)
-
-					kv.PutString("a2", "v")
-					Describe(Text(), Test)
-
-					kv.PutString("a3qqwrkks", "hello")
-					Describe(Text(), Test)
-
-					kv.PutString("a4", "bar")
-					Describe(Text(), Test)
-
-					kv.PutString("a5111111", "v5")
-					kv.PutString("a6", "")
-					kv.PutString("a7", "v7")
-					kv.PutString("a8", "vvvvvvvvvvvvvvvvvvvvvv8")
-					kv.PutString("b", "v9")
-					kv.PutString("c9", "v9")
-					kv.PutString("c91", "v9")
-					kv.PutString("d0", "v9")
-					Describe(Text(), Test)
-				})
-			}
-		})
-
-		Describe("out-of-bound slice test", func() {
-			kv := &testutil.KeyValue{}
-			kv.PutString("k1", "v1")
-			kv.PutString("k2", "v2")
-			kv.PutString("k3abcdefgg", "v3")
-			kv.PutString("k4", "v4")
-			kv.PutString("k5", "v5")
-			for restartInterval := 1; restartInterval <= 5; restartInterval++ {
-				Describe(fmt.Sprintf("with restart interval of %d", restartInterval), func() {
-					// Make block.
-					bt := Build(kv, restartInterval)
-
-					Test := func(r *util.Range) func(done Done) {
-						return func(done Done) {
-							iter := bt.TestNewIterator(r)
-							Expect(iter.Error()).ShouldNot(HaveOccurred())
-
-							t := testutil.IteratorTesting{
-								KeyValue: kv.Clone(),
-								Iter:     iter,
-							}
-
-							testutil.DoIteratorTesting(&t)
-							iter.Release()
-							done <- true
-						}
-					}
-
-					It("Should do iterations and seeks correctly #0",
-						Test(&util.Range{Start: []byte("k0"), Limit: []byte("k6")}), 2.0)
-
-					It("Should do iterations and seeks correctly #1",
-						Test(&util.Range{Start: []byte(""), Limit: []byte("zzzzzzz")}), 2.0)
-				})
-			}
-		})
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/reader.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/reader.go
deleted file mode 100644
index 23c7c6129..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/reader.go
+++ /dev/null
@@ -1,1107 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package table
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/golang/snappy"
-
-	"github.com/syndtr/goleveldb/leveldb/cache"
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	ErrNotFound       = errors.ErrNotFound
-	ErrReaderReleased = errors.New("leveldb/table: reader released")
-	ErrIterReleased   = errors.New("leveldb/table: iterator released")
-)
-
-type ErrCorrupted struct {
-	Pos    int64
-	Size   int64
-	Kind   string
-	Reason string
-}
-
-func (e *ErrCorrupted) Error() string {
-	return fmt.Sprintf("leveldb/table: corruption on %s (pos=%d): %s", e.Kind, e.Pos, e.Reason)
-}
-
-func max(x, y int) int {
-	if x > y {
-		return x
-	}
-	return y
-}
-
-type block struct {
-	bpool          *util.BufferPool
-	bh             blockHandle
-	data           []byte
-	restartsLen    int
-	restartsOffset int
-}
-
-func (b *block) seek(cmp comparer.Comparer, rstart, rlimit int, key []byte) (index, offset int, err error) {
-	index = sort.Search(b.restartsLen-rstart-(b.restartsLen-rlimit), func(i int) bool {
-		offset := int(binary.LittleEndian.Uint32(b.data[b.restartsOffset+4*(rstart+i):]))
-		offset += 1                                 // shared always zero, since this is a restart point
-		v1, n1 := binary.Uvarint(b.data[offset:])   // key length
-		_, n2 := binary.Uvarint(b.data[offset+n1:]) // value length
-		m := offset + n1 + n2
-		return cmp.Compare(b.data[m:m+int(v1)], key) > 0
-	}) + rstart - 1
-	if index < rstart {
-		// The smallest key is greater-than key sought.
-		index = rstart
-	}
-	offset = int(binary.LittleEndian.Uint32(b.data[b.restartsOffset+4*index:]))
-	return
-}
-
-func (b *block) restartIndex(rstart, rlimit, offset int) int {
-	return sort.Search(b.restartsLen-rstart-(b.restartsLen-rlimit), func(i int) bool {
-		return int(binary.LittleEndian.Uint32(b.data[b.restartsOffset+4*(rstart+i):])) > offset
-	}) + rstart - 1
-}
-
-func (b *block) restartOffset(index int) int {
-	return int(binary.LittleEndian.Uint32(b.data[b.restartsOffset+4*index:]))
-}
-
-func (b *block) entry(offset int) (key, value []byte, nShared, n int, err error) {
-	if offset >= b.restartsOffset {
-		if offset != b.restartsOffset {
-			err = &ErrCorrupted{Reason: "entries offset not aligned"}
-		}
-		return
-	}
-	v0, n0 := binary.Uvarint(b.data[offset:])       // Shared prefix length
-	v1, n1 := binary.Uvarint(b.data[offset+n0:])    // Key length
-	v2, n2 := binary.Uvarint(b.data[offset+n0+n1:]) // Value length
-	m := n0 + n1 + n2
-	n = m + int(v1) + int(v2)
-	if n0 <= 0 || n1 <= 0 || n2 <= 0 || offset+n > b.restartsOffset {
-		err = &ErrCorrupted{Reason: "entries corrupted"}
-		return
-	}
-	key = b.data[offset+m : offset+m+int(v1)]
-	value = b.data[offset+m+int(v1) : offset+n]
-	nShared = int(v0)
-	return
-}
-
-func (b *block) Release() {
-	b.bpool.Put(b.data)
-	b.bpool = nil
-	b.data = nil
-}
-
-type dir int
-
-const (
-	dirReleased dir = iota - 1
-	dirSOI
-	dirEOI
-	dirBackward
-	dirForward
-)
-
-type blockIter struct {
-	tr            *Reader
-	block         *block
-	blockReleaser util.Releaser
-	releaser      util.Releaser
-	key, value    []byte
-	offset        int
-	// Previous offset, only filled by Next.
-	prevOffset   int
-	prevNode     []int
-	prevKeys     []byte
-	restartIndex int
-	// Iterator direction.
-	dir dir
-	// Restart index slice range.
-	riStart int
-	riLimit int
-	// Offset slice range.
-	offsetStart     int
-	offsetRealStart int
-	offsetLimit     int
-	// Error.
-	err error
-}
-
-func (i *blockIter) sErr(err error) {
-	i.err = err
-	i.key = nil
-	i.value = nil
-	i.prevNode = nil
-	i.prevKeys = nil
-}
-
-func (i *blockIter) reset() {
-	if i.dir == dirBackward {
-		i.prevNode = i.prevNode[:0]
-		i.prevKeys = i.prevKeys[:0]
-	}
-	i.restartIndex = i.riStart
-	i.offset = i.offsetStart
-	i.dir = dirSOI
-	i.key = i.key[:0]
-	i.value = nil
-}
-
-func (i *blockIter) isFirst() bool {
-	switch i.dir {
-	case dirForward:
-		return i.prevOffset == i.offsetRealStart
-	case dirBackward:
-		return len(i.prevNode) == 1 && i.restartIndex == i.riStart
-	}
-	return false
-}
-
-func (i *blockIter) isLast() bool {
-	switch i.dir {
-	case dirForward, dirBackward:
-		return i.offset == i.offsetLimit
-	}
-	return false
-}
-
-func (i *blockIter) First() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.dir == dirBackward {
-		i.prevNode = i.prevNode[:0]
-		i.prevKeys = i.prevKeys[:0]
-	}
-	i.dir = dirSOI
-	return i.Next()
-}
-
-func (i *blockIter) Last() bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.dir == dirBackward {
-		i.prevNode = i.prevNode[:0]
-		i.prevKeys = i.prevKeys[:0]
-	}
-	i.dir = dirEOI
-	return i.Prev()
-}
-
-func (i *blockIter) Seek(key []byte) bool {
-	if i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	ri, offset, err := i.block.seek(i.tr.cmp, i.riStart, i.riLimit, key)
-	if err != nil {
-		i.sErr(err)
-		return false
-	}
-	i.restartIndex = ri
-	i.offset = max(i.offsetStart, offset)
-	if i.dir == dirSOI || i.dir == dirEOI {
-		i.dir = dirForward
-	}
-	for i.Next() {
-		if i.tr.cmp.Compare(i.key, key) >= 0 {
-			return true
-		}
-	}
-	return false
-}
-
-func (i *blockIter) Next() bool {
-	if i.dir == dirEOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	if i.dir == dirSOI {
-		i.restartIndex = i.riStart
-		i.offset = i.offsetStart
-	} else if i.dir == dirBackward {
-		i.prevNode = i.prevNode[:0]
-		i.prevKeys = i.prevKeys[:0]
-	}
-	for i.offset < i.offsetRealStart {
-		key, value, nShared, n, err := i.block.entry(i.offset)
-		if err != nil {
-			i.sErr(i.tr.fixErrCorruptedBH(i.block.bh, err))
-			return false
-		}
-		if n == 0 {
-			i.dir = dirEOI
-			return false
-		}
-		i.key = append(i.key[:nShared], key...)
-		i.value = value
-		i.offset += n
-	}
-	if i.offset >= i.offsetLimit {
-		i.dir = dirEOI
-		if i.offset != i.offsetLimit {
-			i.sErr(i.tr.newErrCorruptedBH(i.block.bh, "entries offset not aligned"))
-		}
-		return false
-	}
-	key, value, nShared, n, err := i.block.entry(i.offset)
-	if err != nil {
-		i.sErr(i.tr.fixErrCorruptedBH(i.block.bh, err))
-		return false
-	}
-	if n == 0 {
-		i.dir = dirEOI
-		return false
-	}
-	i.key = append(i.key[:nShared], key...)
-	i.value = value
-	i.prevOffset = i.offset
-	i.offset += n
-	i.dir = dirForward
-	return true
-}
-
-func (i *blockIter) Prev() bool {
-	if i.dir == dirSOI || i.err != nil {
-		return false
-	} else if i.dir == dirReleased {
-		i.err = ErrIterReleased
-		return false
-	}
-
-	var ri int
-	if i.dir == dirForward {
-		// Change direction.
-		i.offset = i.prevOffset
-		if i.offset == i.offsetRealStart {
-			i.dir = dirSOI
-			return false
-		}
-		ri = i.block.restartIndex(i.restartIndex, i.riLimit, i.offset)
-		i.dir = dirBackward
-	} else if i.dir == dirEOI {
-		// At the end of iterator.
-		i.restartIndex = i.riLimit
-		i.offset = i.offsetLimit
-		if i.offset == i.offsetRealStart {
-			i.dir = dirSOI
-			return false
-		}
-		ri = i.riLimit - 1
-		i.dir = dirBackward
-	} else if len(i.prevNode) == 1 {
-		// This is the end of a restart range.
-		i.offset = i.prevNode[0]
-		i.prevNode = i.prevNode[:0]
-		if i.restartIndex == i.riStart {
-			i.dir = dirSOI
-			return false
-		}
-		i.restartIndex--
-		ri = i.restartIndex
-	} else {
-		// In the middle of restart range, get from cache.
-		n := len(i.prevNode) - 3
-		node := i.prevNode[n:]
-		i.prevNode = i.prevNode[:n]
-		// Get the key.
-		ko := node[0]
-		i.key = append(i.key[:0], i.prevKeys[ko:]...)
-		i.prevKeys = i.prevKeys[:ko]
-		// Get the value.
-		vo := node[1]
-		vl := vo + node[2]
-		i.value = i.block.data[vo:vl]
-		i.offset = vl
-		return true
-	}
-	// Build entries cache.
-	i.key = i.key[:0]
-	i.value = nil
-	offset := i.block.restartOffset(ri)
-	if offset == i.offset {
-		ri -= 1
-		if ri < 0 {
-			i.dir = dirSOI
-			return false
-		}
-		offset = i.block.restartOffset(ri)
-	}
-	i.prevNode = append(i.prevNode, offset)
-	for {
-		key, value, nShared, n, err := i.block.entry(offset)
-		if err != nil {
-			i.sErr(i.tr.fixErrCorruptedBH(i.block.bh, err))
-			return false
-		}
-		if offset >= i.offsetRealStart {
-			if i.value != nil {
-				// Appends 3 variables:
-				// 1. Previous keys offset
-				// 2. Value offset in the data block
-				// 3. Value length
-				i.prevNode = append(i.prevNode, len(i.prevKeys), offset-len(i.value), len(i.value))
-				i.prevKeys = append(i.prevKeys, i.key...)
-			}
-			i.value = value
-		}
-		i.key = append(i.key[:nShared], key...)
-		offset += n
-		// Stop if target offset reached.
-		if offset >= i.offset {
-			if offset != i.offset {
-				i.sErr(i.tr.newErrCorruptedBH(i.block.bh, "entries offset not aligned"))
-				return false
-			}
-
-			break
-		}
-	}
-	i.restartIndex = ri
-	i.offset = offset
-	return true
-}
-
-func (i *blockIter) Key() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.key
-}
-
-func (i *blockIter) Value() []byte {
-	if i.err != nil || i.dir <= dirEOI {
-		return nil
-	}
-	return i.value
-}
-
-func (i *blockIter) Release() {
-	if i.dir != dirReleased {
-		i.tr = nil
-		i.block = nil
-		i.prevNode = nil
-		i.prevKeys = nil
-		i.key = nil
-		i.value = nil
-		i.dir = dirReleased
-		if i.blockReleaser != nil {
-			i.blockReleaser.Release()
-			i.blockReleaser = nil
-		}
-		if i.releaser != nil {
-			i.releaser.Release()
-			i.releaser = nil
-		}
-	}
-}
-
-func (i *blockIter) SetReleaser(releaser util.Releaser) {
-	if i.dir == dirReleased {
-		panic(util.ErrReleased)
-	}
-	if i.releaser != nil && releaser != nil {
-		panic(util.ErrHasReleaser)
-	}
-	i.releaser = releaser
-}
-
-func (i *blockIter) Valid() bool {
-	return i.err == nil && (i.dir == dirBackward || i.dir == dirForward)
-}
-
-func (i *blockIter) Error() error {
-	return i.err
-}
-
-type filterBlock struct {
-	bpool      *util.BufferPool
-	data       []byte
-	oOffset    int
-	baseLg     uint
-	filtersNum int
-}
-
-func (b *filterBlock) contains(filter filter.Filter, offset uint64, key []byte) bool {
-	i := int(offset >> b.baseLg)
-	if i < b.filtersNum {
-		o := b.data[b.oOffset+i*4:]
-		n := int(binary.LittleEndian.Uint32(o))
-		m := int(binary.LittleEndian.Uint32(o[4:]))
-		if n < m && m <= b.oOffset {
-			return filter.Contains(b.data[n:m], key)
-		} else if n == m {
-			return false
-		}
-	}
-	return true
-}
-
-func (b *filterBlock) Release() {
-	b.bpool.Put(b.data)
-	b.bpool = nil
-	b.data = nil
-}
-
-type indexIter struct {
-	*blockIter
-	tr    *Reader
-	slice *util.Range
-	// Options
-	fillCache bool
-}
-
-func (i *indexIter) Get() iterator.Iterator {
-	value := i.Value()
-	if value == nil {
-		return nil
-	}
-	dataBH, n := decodeBlockHandle(value)
-	if n == 0 {
-		return iterator.NewEmptyIterator(i.tr.newErrCorruptedBH(i.tr.indexBH, "bad data block handle"))
-	}
-
-	var slice *util.Range
-	if i.slice != nil && (i.blockIter.isFirst() || i.blockIter.isLast()) {
-		slice = i.slice
-	}
-	return i.tr.getDataIterErr(dataBH, slice, i.tr.verifyChecksum, i.fillCache)
-}
-
-// Reader is a table reader.
-type Reader struct {
-	mu     sync.RWMutex
-	fi     *storage.FileInfo
-	reader io.ReaderAt
-	cache  *cache.CacheGetter
-	err    error
-	bpool  *util.BufferPool
-	// Options
-	o              *opt.Options
-	cmp            comparer.Comparer
-	filter         filter.Filter
-	verifyChecksum bool
-
-	dataEnd                   int64
-	metaBH, indexBH, filterBH blockHandle
-	indexBlock                *block
-	filterBlock               *filterBlock
-}
-
-func (r *Reader) blockKind(bh blockHandle) string {
-	switch bh.offset {
-	case r.metaBH.offset:
-		return "meta-block"
-	case r.indexBH.offset:
-		return "index-block"
-	case r.filterBH.offset:
-		if r.filterBH.length > 0 {
-			return "filter-block"
-		}
-	}
-	return "data-block"
-}
-
-func (r *Reader) newErrCorrupted(pos, size int64, kind, reason string) error {
-	return &errors.ErrCorrupted{File: r.fi, Err: &ErrCorrupted{Pos: pos, Size: size, Kind: kind, Reason: reason}}
-}
-
-func (r *Reader) newErrCorruptedBH(bh blockHandle, reason string) error {
-	return r.newErrCorrupted(int64(bh.offset), int64(bh.length), r.blockKind(bh), reason)
-}
-
-func (r *Reader) fixErrCorruptedBH(bh blockHandle, err error) error {
-	if cerr, ok := err.(*ErrCorrupted); ok {
-		cerr.Pos = int64(bh.offset)
-		cerr.Size = int64(bh.length)
-		cerr.Kind = r.blockKind(bh)
-		return &errors.ErrCorrupted{File: r.fi, Err: cerr}
-	}
-	return err
-}
-
-func (r *Reader) readRawBlock(bh blockHandle, verifyChecksum bool) ([]byte, error) {
-	data := r.bpool.Get(int(bh.length + blockTrailerLen))
-	if _, err := r.reader.ReadAt(data, int64(bh.offset)); err != nil && err != io.EOF {
-		return nil, err
-	}
-
-	if verifyChecksum {
-		n := bh.length + 1
-		checksum0 := binary.LittleEndian.Uint32(data[n:])
-		checksum1 := util.NewCRC(data[:n]).Value()
-		if checksum0 != checksum1 {
-			r.bpool.Put(data)
-			return nil, r.newErrCorruptedBH(bh, fmt.Sprintf("checksum mismatch, want=%#x got=%#x", checksum0, checksum1))
-		}
-	}
-
-	switch data[bh.length] {
-	case blockTypeNoCompression:
-		data = data[:bh.length]
-	case blockTypeSnappyCompression:
-		decLen, err := snappy.DecodedLen(data[:bh.length])
-		if err != nil {
-			return nil, r.newErrCorruptedBH(bh, err.Error())
-		}
-		decData := r.bpool.Get(decLen)
-		decData, err = snappy.Decode(decData, data[:bh.length])
-		r.bpool.Put(data)
-		if err != nil {
-			r.bpool.Put(decData)
-			return nil, r.newErrCorruptedBH(bh, err.Error())
-		}
-		data = decData
-	default:
-		r.bpool.Put(data)
-		return nil, r.newErrCorruptedBH(bh, fmt.Sprintf("unknown compression type %#x", data[bh.length]))
-	}
-	return data, nil
-}
-
-func (r *Reader) readBlock(bh blockHandle, verifyChecksum bool) (*block, error) {
-	data, err := r.readRawBlock(bh, verifyChecksum)
-	if err != nil {
-		return nil, err
-	}
-	restartsLen := int(binary.LittleEndian.Uint32(data[len(data)-4:]))
-	b := &block{
-		bpool:          r.bpool,
-		bh:             bh,
-		data:           data,
-		restartsLen:    restartsLen,
-		restartsOffset: len(data) - (restartsLen+1)*4,
-	}
-	return b, nil
-}
-
-func (r *Reader) readBlockCached(bh blockHandle, verifyChecksum, fillCache bool) (*block, util.Releaser, error) {
-	if r.cache != nil {
-		var (
-			err error
-			ch  *cache.Handle
-		)
-		if fillCache {
-			ch = r.cache.Get(bh.offset, func() (size int, value cache.Value) {
-				var b *block
-				b, err = r.readBlock(bh, verifyChecksum)
-				if err != nil {
-					return 0, nil
-				}
-				return cap(b.data), b
-			})
-		} else {
-			ch = r.cache.Get(bh.offset, nil)
-		}
-		if ch != nil {
-			b, ok := ch.Value().(*block)
-			if !ok {
-				ch.Release()
-				return nil, nil, errors.New("leveldb/table: inconsistent block type")
-			}
-			return b, ch, err
-		} else if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	b, err := r.readBlock(bh, verifyChecksum)
-	return b, b, err
-}
-
-func (r *Reader) readFilterBlock(bh blockHandle) (*filterBlock, error) {
-	data, err := r.readRawBlock(bh, true)
-	if err != nil {
-		return nil, err
-	}
-	n := len(data)
-	if n < 5 {
-		return nil, r.newErrCorruptedBH(bh, "too short")
-	}
-	m := n - 5
-	oOffset := int(binary.LittleEndian.Uint32(data[m:]))
-	if oOffset > m {
-		return nil, r.newErrCorruptedBH(bh, "invalid data-offsets offset")
-	}
-	b := &filterBlock{
-		bpool:      r.bpool,
-		data:       data,
-		oOffset:    oOffset,
-		baseLg:     uint(data[n-1]),
-		filtersNum: (m - oOffset) / 4,
-	}
-	return b, nil
-}
-
-func (r *Reader) readFilterBlockCached(bh blockHandle, fillCache bool) (*filterBlock, util.Releaser, error) {
-	if r.cache != nil {
-		var (
-			err error
-			ch  *cache.Handle
-		)
-		if fillCache {
-			ch = r.cache.Get(bh.offset, func() (size int, value cache.Value) {
-				var b *filterBlock
-				b, err = r.readFilterBlock(bh)
-				if err != nil {
-					return 0, nil
-				}
-				return cap(b.data), b
-			})
-		} else {
-			ch = r.cache.Get(bh.offset, nil)
-		}
-		if ch != nil {
-			b, ok := ch.Value().(*filterBlock)
-			if !ok {
-				ch.Release()
-				return nil, nil, errors.New("leveldb/table: inconsistent block type")
-			}
-			return b, ch, err
-		} else if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	b, err := r.readFilterBlock(bh)
-	return b, b, err
-}
-
-func (r *Reader) getIndexBlock(fillCache bool) (b *block, rel util.Releaser, err error) {
-	if r.indexBlock == nil {
-		return r.readBlockCached(r.indexBH, true, fillCache)
-	}
-	return r.indexBlock, util.NoopReleaser{}, nil
-}
-
-func (r *Reader) getFilterBlock(fillCache bool) (*filterBlock, util.Releaser, error) {
-	if r.filterBlock == nil {
-		return r.readFilterBlockCached(r.filterBH, fillCache)
-	}
-	return r.filterBlock, util.NoopReleaser{}, nil
-}
-
-func (r *Reader) newBlockIter(b *block, bReleaser util.Releaser, slice *util.Range, inclLimit bool) *blockIter {
-	bi := &blockIter{
-		tr:            r,
-		block:         b,
-		blockReleaser: bReleaser,
-		// Valid key should never be nil.
-		key:             make([]byte, 0),
-		dir:             dirSOI,
-		riStart:         0,
-		riLimit:         b.restartsLen,
-		offsetStart:     0,
-		offsetRealStart: 0,
-		offsetLimit:     b.restartsOffset,
-	}
-	if slice != nil {
-		if slice.Start != nil {
-			if bi.Seek(slice.Start) {
-				bi.riStart = b.restartIndex(bi.restartIndex, b.restartsLen, bi.prevOffset)
-				bi.offsetStart = b.restartOffset(bi.riStart)
-				bi.offsetRealStart = bi.prevOffset
-			} else {
-				bi.riStart = b.restartsLen
-				bi.offsetStart = b.restartsOffset
-				bi.offsetRealStart = b.restartsOffset
-			}
-		}
-		if slice.Limit != nil {
-			if bi.Seek(slice.Limit) && (!inclLimit || bi.Next()) {
-				bi.offsetLimit = bi.prevOffset
-				bi.riLimit = bi.restartIndex + 1
-			}
-		}
-		bi.reset()
-		if bi.offsetStart > bi.offsetLimit {
-			bi.sErr(errors.New("leveldb/table: invalid slice range"))
-		}
-	}
-	return bi
-}
-
-func (r *Reader) getDataIter(dataBH blockHandle, slice *util.Range, verifyChecksum, fillCache bool) iterator.Iterator {
-	b, rel, err := r.readBlockCached(dataBH, verifyChecksum, fillCache)
-	if err != nil {
-		return iterator.NewEmptyIterator(err)
-	}
-	return r.newBlockIter(b, rel, slice, false)
-}
-
-func (r *Reader) getDataIterErr(dataBH blockHandle, slice *util.Range, verifyChecksum, fillCache bool) iterator.Iterator {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	if r.err != nil {
-		return iterator.NewEmptyIterator(r.err)
-	}
-
-	return r.getDataIter(dataBH, slice, verifyChecksum, fillCache)
-}
-
-// NewIterator creates an iterator from the table.
-//
-// Slice allows slicing the iterator to only contains keys in the given
-// range. A nil Range.Start is treated as a key before all keys in the
-// table. And a nil Range.Limit is treated as a key after all keys in
-// the table.
-//
-// The returned iterator is not goroutine-safe and should be released
-// when not used.
-//
-// Also read Iterator documentation of the leveldb/iterator package.
-func (r *Reader) NewIterator(slice *util.Range, ro *opt.ReadOptions) iterator.Iterator {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	if r.err != nil {
-		return iterator.NewEmptyIterator(r.err)
-	}
-
-	fillCache := !ro.GetDontFillCache()
-	indexBlock, rel, err := r.getIndexBlock(fillCache)
-	if err != nil {
-		return iterator.NewEmptyIterator(err)
-	}
-	index := &indexIter{
-		blockIter: r.newBlockIter(indexBlock, rel, slice, true),
-		tr:        r,
-		slice:     slice,
-		fillCache: !ro.GetDontFillCache(),
-	}
-	return iterator.NewIndexedIterator(index, opt.GetStrict(r.o, ro, opt.StrictReader))
-}
-
-func (r *Reader) find(key []byte, filtered bool, ro *opt.ReadOptions, noValue bool) (rkey, value []byte, err error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	if r.err != nil {
-		err = r.err
-		return
-	}
-
-	indexBlock, rel, err := r.getIndexBlock(true)
-	if err != nil {
-		return
-	}
-	defer rel.Release()
-
-	index := r.newBlockIter(indexBlock, nil, nil, true)
-	defer index.Release()
-	if !index.Seek(key) {
-		err = index.Error()
-		if err == nil {
-			err = ErrNotFound
-		}
-		return
-	}
-	dataBH, n := decodeBlockHandle(index.Value())
-	if n == 0 {
-		r.err = r.newErrCorruptedBH(r.indexBH, "bad data block handle")
-		return
-	}
-	if filtered && r.filter != nil {
-		filterBlock, frel, ferr := r.getFilterBlock(true)
-		if ferr == nil {
-			if !filterBlock.contains(r.filter, dataBH.offset, key) {
-				frel.Release()
-				return nil, nil, ErrNotFound
-			}
-			frel.Release()
-		} else if !errors.IsCorrupted(ferr) {
-			err = ferr
-			return
-		}
-	}
-	data := r.getDataIter(dataBH, nil, r.verifyChecksum, !ro.GetDontFillCache())
-	defer data.Release()
-	if !data.Seek(key) {
-		err = data.Error()
-		if err == nil {
-			err = ErrNotFound
-		}
-		return
-	}
-	// Don't use block buffer, no need to copy the buffer.
-	rkey = data.Key()
-	if !noValue {
-		if r.bpool == nil {
-			value = data.Value()
-		} else {
-			// Use block buffer, and since the buffer will be recycled, the buffer
-			// need to be copied.
-			value = append([]byte{}, data.Value()...)
-		}
-	}
-	return
-}
-
-// Find finds key/value pair whose key is greater than or equal to the
-// given key. It returns ErrNotFound if the table doesn't contain
-// such pair.
-// If filtered is true then the nearest 'block' will be checked against
-// 'filter data' (if present) and will immediately return ErrNotFound if
-// 'filter data' indicates that such pair doesn't exist.
-//
-// The caller may modify the contents of the returned slice as it is its
-// own copy.
-// It is safe to modify the contents of the argument after Find returns.
-func (r *Reader) Find(key []byte, filtered bool, ro *opt.ReadOptions) (rkey, value []byte, err error) {
-	return r.find(key, filtered, ro, false)
-}
-
-// Find finds key that is greater than or equal to the given key.
-// It returns ErrNotFound if the table doesn't contain such key.
-// If filtered is true then the nearest 'block' will be checked against
-// 'filter data' (if present) and will immediately return ErrNotFound if
-// 'filter data' indicates that such key doesn't exist.
-//
-// The caller may modify the contents of the returned slice as it is its
-// own copy.
-// It is safe to modify the contents of the argument after Find returns.
-func (r *Reader) FindKey(key []byte, filtered bool, ro *opt.ReadOptions) (rkey []byte, err error) {
-	rkey, _, err = r.find(key, filtered, ro, true)
-	return
-}
-
-// Get gets the value for the given key. It returns errors.ErrNotFound
-// if the table does not contain the key.
-//
-// The caller may modify the contents of the returned slice as it is its
-// own copy.
-// It is safe to modify the contents of the argument after Find returns.
-func (r *Reader) Get(key []byte, ro *opt.ReadOptions) (value []byte, err error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	if r.err != nil {
-		err = r.err
-		return
-	}
-
-	rkey, value, err := r.find(key, false, ro, false)
-	if err == nil && r.cmp.Compare(rkey, key) != 0 {
-		value = nil
-		err = ErrNotFound
-	}
-	return
-}
-
-// OffsetOf returns approximate offset for the given key.
-//
-// It is safe to modify the contents of the argument after Get returns.
-func (r *Reader) OffsetOf(key []byte) (offset int64, err error) {
-	r.mu.RLock()
-	defer r.mu.RUnlock()
-
-	if r.err != nil {
-		err = r.err
-		return
-	}
-
-	indexBlock, rel, err := r.readBlockCached(r.indexBH, true, true)
-	if err != nil {
-		return
-	}
-	defer rel.Release()
-
-	index := r.newBlockIter(indexBlock, nil, nil, true)
-	defer index.Release()
-	if index.Seek(key) {
-		dataBH, n := decodeBlockHandle(index.Value())
-		if n == 0 {
-			r.err = r.newErrCorruptedBH(r.indexBH, "bad data block handle")
-			return
-		}
-		offset = int64(dataBH.offset)
-		return
-	}
-	err = index.Error()
-	if err == nil {
-		offset = r.dataEnd
-	}
-	return
-}
-
-// Release implements util.Releaser.
-// It also close the file if it is an io.Closer.
-func (r *Reader) Release() {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if closer, ok := r.reader.(io.Closer); ok {
-		closer.Close()
-	}
-	if r.indexBlock != nil {
-		r.indexBlock.Release()
-		r.indexBlock = nil
-	}
-	if r.filterBlock != nil {
-		r.filterBlock.Release()
-		r.filterBlock = nil
-	}
-	r.reader = nil
-	r.cache = nil
-	r.bpool = nil
-	r.err = ErrReaderReleased
-}
-
-// NewReader creates a new initialized table reader for the file.
-// The fi, cache and bpool is optional and can be nil.
-//
-// The returned table reader instance is goroutine-safe.
-func NewReader(f io.ReaderAt, size int64, fi *storage.FileInfo, cache *cache.CacheGetter, bpool *util.BufferPool, o *opt.Options) (*Reader, error) {
-	if f == nil {
-		return nil, errors.New("leveldb/table: nil file")
-	}
-
-	r := &Reader{
-		fi:             fi,
-		reader:         f,
-		cache:          cache,
-		bpool:          bpool,
-		o:              o,
-		cmp:            o.GetComparer(),
-		verifyChecksum: o.GetStrict(opt.StrictBlockChecksum),
-	}
-
-	if size < footerLen {
-		r.err = r.newErrCorrupted(0, size, "table", "too small")
-		return r, nil
-	}
-
-	footerPos := size - footerLen
-	var footer [footerLen]byte
-	if _, err := r.reader.ReadAt(footer[:], footerPos); err != nil && err != io.EOF {
-		return nil, err
-	}
-	if string(footer[footerLen-len(magic):footerLen]) != magic {
-		r.err = r.newErrCorrupted(footerPos, footerLen, "table-footer", "bad magic number")
-		return r, nil
-	}
-
-	var n int
-	// Decode the metaindex block handle.
-	r.metaBH, n = decodeBlockHandle(footer[:])
-	if n == 0 {
-		r.err = r.newErrCorrupted(footerPos, footerLen, "table-footer", "bad metaindex block handle")
-		return r, nil
-	}
-
-	// Decode the index block handle.
-	r.indexBH, n = decodeBlockHandle(footer[n:])
-	if n == 0 {
-		r.err = r.newErrCorrupted(footerPos, footerLen, "table-footer", "bad index block handle")
-		return r, nil
-	}
-
-	// Read metaindex block.
-	metaBlock, err := r.readBlock(r.metaBH, true)
-	if err != nil {
-		if errors.IsCorrupted(err) {
-			r.err = err
-			return r, nil
-		} else {
-			return nil, err
-		}
-	}
-
-	// Set data end.
-	r.dataEnd = int64(r.metaBH.offset)
-
-	// Read metaindex.
-	metaIter := r.newBlockIter(metaBlock, nil, nil, true)
-	for metaIter.Next() {
-		key := string(metaIter.Key())
-		if !strings.HasPrefix(key, "filter.") {
-			continue
-		}
-		fn := key[7:]
-		if f0 := o.GetFilter(); f0 != nil && f0.Name() == fn {
-			r.filter = f0
-		} else {
-			for _, f0 := range o.GetAltFilters() {
-				if f0.Name() == fn {
-					r.filter = f0
-					break
-				}
-			}
-		}
-		if r.filter != nil {
-			filterBH, n := decodeBlockHandle(metaIter.Value())
-			if n == 0 {
-				continue
-			}
-			r.filterBH = filterBH
-			// Update data end.
-			r.dataEnd = int64(filterBH.offset)
-			break
-		}
-	}
-	metaIter.Release()
-	metaBlock.Release()
-
-	// Cache index and filter block locally, since we don't have global cache.
-	if cache == nil {
-		r.indexBlock, err = r.readBlock(r.indexBH, true)
-		if err != nil {
-			if errors.IsCorrupted(err) {
-				r.err = err
-				return r, nil
-			} else {
-				return nil, err
-			}
-		}
-		if r.filter != nil {
-			r.filterBlock, err = r.readFilterBlock(r.filterBH)
-			if err != nil {
-				if !errors.IsCorrupted(err) {
-					return nil, err
-				}
-
-				// Don't use filter then.
-				r.filter = nil
-			}
-		}
-	}
-
-	return r, nil
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/table.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/table.go
deleted file mode 100644
index beacdc1f0..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/table.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package table allows read and write sorted key/value.
-package table
-
-import (
-	"encoding/binary"
-)
-
-/*
-Table:
-
-Table is consist of one or more data blocks, an optional filter block
-a metaindex block, an index block and a table footer. Metaindex block
-is a special block used to keep parameters of the table, such as filter
-block name and its block handle. Index block is a special block used to
-keep record of data blocks offset and length, index block use one as
-restart interval. The key used by index block are the last key of preceding
-block, shorter separator of adjacent blocks or shorter successor of the
-last key of the last block. Filter block is an optional block contains
-sequence of filter data generated by a filter generator.
-
-Table data structure:
-                                                         + optional
-                                                        /
-    +--------------+--------------+--------------+------+-------+-----------------+-------------+--------+
-    | data block 1 |      ...     | data block n | filter block | metaindex block | index block | footer |
-    +--------------+--------------+--------------+--------------+-----------------+-------------+--------+
-
-    Each block followed by a 5-bytes trailer contains compression type and checksum.
-
-Table block trailer:
-
-    +---------------------------+-------------------+
-    | compression type (1-byte) | checksum (4-byte) |
-    +---------------------------+-------------------+
-
-    The checksum is a CRC-32 computed using Castagnoli's polynomial. Compression
-    type also included in the checksum.
-
-Table footer:
-
-      +------------------- 40-bytes -------------------+
-     /                                                  \
-    +------------------------+--------------------+------+-----------------+
-    | metaindex block handle / index block handle / ---- | magic (8-bytes) |
-    +------------------------+--------------------+------+-----------------+
-
-    The magic are first 64-bit of SHA-1 sum of "http://code.google.com/p/leveldb/".
-
-NOTE: All fixed-length integer are little-endian.
-*/
-
-/*
-Block:
-
-Block is consist of one or more key/value entries and a block trailer.
-Block entry shares key prefix with its preceding key until a restart
-point reached. A block should contains at least one restart point.
-First restart point are always zero.
-
-Block data structure:
-
-      + restart point                 + restart point (depends on restart interval)
-     /                               /
-    +---------------+---------------+---------------+---------------+---------+
-    | block entry 1 | block entry 2 |      ...      | block entry n | trailer |
-    +---------------+---------------+---------------+---------------+---------+
-
-Key/value entry:
-
-              +---- key len ----+
-             /                   \
-    +-------+---------+-----------+---------+--------------------+--------------+----------------+
-    | shared (varint) | not shared (varint) | value len (varint) | key (varlen) | value (varlen) |
-    +-----------------+---------------------+--------------------+--------------+----------------+
-
-    Block entry shares key prefix with its preceding key:
-    Conditions:
-        restart_interval=2
-        entry one  : key=deck,value=v1
-        entry two  : key=dock,value=v2
-        entry three: key=duck,value=v3
-    The entries will be encoded as follow:
-
-      + restart point (offset=0)                                                 + restart point (offset=16)
-     /                                                                          /
-    +-----+-----+-----+----------+--------+-----+-----+-----+---------+--------+-----+-----+-----+----------+--------+
-    |  0  |  4  |  2  |  "deck"  |  "v1"  |  1  |  3  |  2  |  "ock"  |  "v2"  |  0  |  4  |  2  |  "duck"  |  "v3"  |
-    +-----+-----+-----+----------+--------+-----+-----+-----+---------+--------+-----+-----+-----+----------+--------+
-     \                                   / \                                  / \                                   /
-      +----------- entry one -----------+   +----------- entry two ----------+   +---------- entry three ----------+
-
-    The block trailer will contains two restart points:
-
-    +------------+-----------+--------+
-    |     0      |    16     |   2    |
-    +------------+-----------+---+----+
-     \                      /     \
-      +-- restart points --+       + restart points length
-
-Block trailer:
-
-      +-- 4-bytes --+
-     /               \
-    +-----------------+-----------------+-----------------+------------------------------+
-    | restart point 1 |       ....      | restart point n | restart points len (4-bytes) |
-    +-----------------+-----------------+-----------------+------------------------------+
-
-
-NOTE: All fixed-length integer are little-endian.
-*/
-
-/*
-Filter block:
-
-Filter block consist of one or more filter data and a filter block trailer.
-The trailer contains filter data offsets, a trailer offset and a 1-byte base Lg.
-
-Filter block data structure:
-
-      + offset 1      + offset 2      + offset n      + trailer offset
-     /               /               /               /
-    +---------------+---------------+---------------+---------+
-    | filter data 1 |      ...      | filter data n | trailer |
-    +---------------+---------------+---------------+---------+
-
-Filter block trailer:
-
-      +- 4-bytes -+
-     /             \
-    +---------------+---------------+---------------+-------------------------------+------------------+
-    | data 1 offset |      ....     | data n offset | data-offsets offset (4-bytes) | base Lg (1-byte) |
-    +-------------- +---------------+---------------+-------------------------------+------------------+
-
-
-NOTE: All fixed-length integer are little-endian.
-*/
-
-const (
-	blockTrailerLen = 5
-	footerLen       = 48
-
-	magic = "\x57\xfb\x80\x8b\x24\x75\x47\xdb"
-
-	// The block type gives the per-block compression format.
-	// These constants are part of the file format and should not be changed.
-	blockTypeNoCompression     = 0
-	blockTypeSnappyCompression = 1
-
-	// Generate new filter every 2KB of data
-	filterBaseLg = 11
-	filterBase   = 1 << filterBaseLg
-)
-
-type blockHandle struct {
-	offset, length uint64
-}
-
-func decodeBlockHandle(src []byte) (blockHandle, int) {
-	offset, n := binary.Uvarint(src)
-	length, m := binary.Uvarint(src[n:])
-	if n == 0 || m == 0 {
-		return blockHandle{}, 0
-	}
-	return blockHandle{offset, length}, n + m
-}
-
-func encodeBlockHandle(dst []byte, b blockHandle) int {
-	n := binary.PutUvarint(dst, b.offset)
-	m := binary.PutUvarint(dst[n:], b.length)
-	return n + m
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go
deleted file mode 100644
index 6465da6e3..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/table_suite_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package table
-
-import (
-	"testing"
-
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-)
-
-func TestTable(t *testing.T) {
-	testutil.RunSuite(t, "Table Suite")
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/table_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/table_test.go
deleted file mode 100644
index 4b59b31f5..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/table_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package table
-
-import (
-	"bytes"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type tableWrapper struct {
-	*Reader
-}
-
-func (t tableWrapper) TestFind(key []byte) (rkey, rvalue []byte, err error) {
-	return t.Reader.Find(key, false, nil)
-}
-
-func (t tableWrapper) TestGet(key []byte) (value []byte, err error) {
-	return t.Reader.Get(key, nil)
-}
-
-func (t tableWrapper) TestNewIterator(slice *util.Range) iterator.Iterator {
-	return t.Reader.NewIterator(slice, nil)
-}
-
-var _ = testutil.Defer(func() {
-	Describe("Table", func() {
-		Describe("approximate offset test", func() {
-			var (
-				buf = &bytes.Buffer{}
-				o   = &opt.Options{
-					BlockSize:   1024,
-					Compression: opt.NoCompression,
-				}
-			)
-
-			// Building the table.
-			tw := NewWriter(buf, o)
-			tw.Append([]byte("k01"), []byte("hello"))
-			tw.Append([]byte("k02"), []byte("hello2"))
-			tw.Append([]byte("k03"), bytes.Repeat([]byte{'x'}, 10000))
-			tw.Append([]byte("k04"), bytes.Repeat([]byte{'x'}, 200000))
-			tw.Append([]byte("k05"), bytes.Repeat([]byte{'x'}, 300000))
-			tw.Append([]byte("k06"), []byte("hello3"))
-			tw.Append([]byte("k07"), bytes.Repeat([]byte{'x'}, 100000))
-			err := tw.Close()
-
-			It("Should be able to approximate offset of a key correctly", func() {
-				Expect(err).ShouldNot(HaveOccurred())
-
-				tr, err := NewReader(bytes.NewReader(buf.Bytes()), int64(buf.Len()), nil, nil, nil, o)
-				Expect(err).ShouldNot(HaveOccurred())
-				CheckOffset := func(key string, expect, threshold int) {
-					offset, err := tr.OffsetOf([]byte(key))
-					Expect(err).ShouldNot(HaveOccurred())
-					Expect(offset).Should(BeNumerically("~", expect, threshold), "Offset of key %q", key)
-				}
-
-				CheckOffset("k0", 0, 0)
-				CheckOffset("k01a", 0, 0)
-				CheckOffset("k02", 0, 0)
-				CheckOffset("k03", 0, 0)
-				CheckOffset("k04", 10000, 1000)
-				CheckOffset("k04a", 210000, 1000)
-				CheckOffset("k05", 210000, 1000)
-				CheckOffset("k06", 510000, 1000)
-				CheckOffset("k07", 510000, 1000)
-				CheckOffset("xyz", 610000, 2000)
-			})
-		})
-
-		Describe("read test", func() {
-			Build := func(kv testutil.KeyValue) testutil.DB {
-				o := &opt.Options{
-					BlockSize:            512,
-					BlockRestartInterval: 3,
-				}
-				buf := &bytes.Buffer{}
-
-				// Building the table.
-				tw := NewWriter(buf, o)
-				kv.Iterate(func(i int, key, value []byte) {
-					tw.Append(key, value)
-				})
-				tw.Close()
-
-				// Opening the table.
-				tr, _ := NewReader(bytes.NewReader(buf.Bytes()), int64(buf.Len()), nil, nil, nil, o)
-				return tableWrapper{tr}
-			}
-			Test := func(kv *testutil.KeyValue, body func(r *Reader)) func() {
-				return func() {
-					db := Build(*kv)
-					if body != nil {
-						body(db.(tableWrapper).Reader)
-					}
-					testutil.KeyValueTesting(nil, *kv, db, nil, nil)
-				}
-			}
-
-			testutil.AllKeyValueTesting(nil, Build, nil, nil)
-			Describe("with one key per block", Test(testutil.KeyValue_Generate(nil, 9, 1, 10, 512, 512), func(r *Reader) {
-				It("should have correct blocks number", func() {
-					indexBlock, err := r.readBlock(r.indexBH, true)
-					Expect(err).To(BeNil())
-					Expect(indexBlock.restartsLen).Should(Equal(9))
-				})
-			}))
-		})
-	})
-})
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/table/writer.go b/vendor/github.com/syndtr/goleveldb/leveldb/table/writer.go
deleted file mode 100644
index 274dee6da..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/table/writer.go
+++ /dev/null
@@ -1,375 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package table
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-
-	"github.com/golang/snappy"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-	"github.com/syndtr/goleveldb/leveldb/filter"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func sharedPrefixLen(a, b []byte) int {
-	i, n := 0, len(a)
-	if n > len(b) {
-		n = len(b)
-	}
-	for i < n && a[i] == b[i] {
-		i++
-	}
-	return i
-}
-
-type blockWriter struct {
-	restartInterval int
-	buf             util.Buffer
-	nEntries        int
-	prevKey         []byte
-	restarts        []uint32
-	scratch         []byte
-}
-
-func (w *blockWriter) append(key, value []byte) {
-	nShared := 0
-	if w.nEntries%w.restartInterval == 0 {
-		w.restarts = append(w.restarts, uint32(w.buf.Len()))
-	} else {
-		nShared = sharedPrefixLen(w.prevKey, key)
-	}
-	n := binary.PutUvarint(w.scratch[0:], uint64(nShared))
-	n += binary.PutUvarint(w.scratch[n:], uint64(len(key)-nShared))
-	n += binary.PutUvarint(w.scratch[n:], uint64(len(value)))
-	w.buf.Write(w.scratch[:n])
-	w.buf.Write(key[nShared:])
-	w.buf.Write(value)
-	w.prevKey = append(w.prevKey[:0], key...)
-	w.nEntries++
-}
-
-func (w *blockWriter) finish() {
-	// Write restarts entry.
-	if w.nEntries == 0 {
-		// Must have at least one restart entry.
-		w.restarts = append(w.restarts, 0)
-	}
-	w.restarts = append(w.restarts, uint32(len(w.restarts)))
-	for _, x := range w.restarts {
-		buf4 := w.buf.Alloc(4)
-		binary.LittleEndian.PutUint32(buf4, x)
-	}
-}
-
-func (w *blockWriter) reset() {
-	w.buf.Reset()
-	w.nEntries = 0
-	w.restarts = w.restarts[:0]
-}
-
-func (w *blockWriter) bytesLen() int {
-	restartsLen := len(w.restarts)
-	if restartsLen == 0 {
-		restartsLen = 1
-	}
-	return w.buf.Len() + 4*restartsLen + 4
-}
-
-type filterWriter struct {
-	generator filter.FilterGenerator
-	buf       util.Buffer
-	nKeys     int
-	offsets   []uint32
-}
-
-func (w *filterWriter) add(key []byte) {
-	if w.generator == nil {
-		return
-	}
-	w.generator.Add(key)
-	w.nKeys++
-}
-
-func (w *filterWriter) flush(offset uint64) {
-	if w.generator == nil {
-		return
-	}
-	for x := int(offset / filterBase); x > len(w.offsets); {
-		w.generate()
-	}
-}
-
-func (w *filterWriter) finish() {
-	if w.generator == nil {
-		return
-	}
-	// Generate last keys.
-
-	if w.nKeys > 0 {
-		w.generate()
-	}
-	w.offsets = append(w.offsets, uint32(w.buf.Len()))
-	for _, x := range w.offsets {
-		buf4 := w.buf.Alloc(4)
-		binary.LittleEndian.PutUint32(buf4, x)
-	}
-	w.buf.WriteByte(filterBaseLg)
-}
-
-func (w *filterWriter) generate() {
-	// Record offset.
-	w.offsets = append(w.offsets, uint32(w.buf.Len()))
-	// Generate filters.
-	if w.nKeys > 0 {
-		w.generator.Generate(&w.buf)
-		w.nKeys = 0
-	}
-}
-
-// Writer is a table writer.
-type Writer struct {
-	writer io.Writer
-	err    error
-	// Options
-	cmp         comparer.Comparer
-	filter      filter.Filter
-	compression opt.Compression
-	blockSize   int
-
-	dataBlock   blockWriter
-	indexBlock  blockWriter
-	filterBlock filterWriter
-	pendingBH   blockHandle
-	offset      uint64
-	nEntries    int
-	// Scratch allocated enough for 5 uvarint. Block writer should not use
-	// first 20-bytes since it will be used to encode block handle, which
-	// then passed to the block writer itself.
-	scratch            [50]byte
-	comparerScratch    []byte
-	compressionScratch []byte
-}
-
-func (w *Writer) writeBlock(buf *util.Buffer, compression opt.Compression) (bh blockHandle, err error) {
-	// Compress the buffer if necessary.
-	var b []byte
-	if compression == opt.SnappyCompression {
-		// Allocate scratch enough for compression and block trailer.
-		if n := snappy.MaxEncodedLen(buf.Len()) + blockTrailerLen; len(w.compressionScratch) < n {
-			w.compressionScratch = make([]byte, n)
-		}
-		compressed := snappy.Encode(w.compressionScratch, buf.Bytes())
-		n := len(compressed)
-		b = compressed[:n+blockTrailerLen]
-		b[n] = blockTypeSnappyCompression
-	} else {
-		tmp := buf.Alloc(blockTrailerLen)
-		tmp[0] = blockTypeNoCompression
-		b = buf.Bytes()
-	}
-
-	// Calculate the checksum.
-	n := len(b) - 4
-	checksum := util.NewCRC(b[:n]).Value()
-	binary.LittleEndian.PutUint32(b[n:], checksum)
-
-	// Write the buffer to the file.
-	_, err = w.writer.Write(b)
-	if err != nil {
-		return
-	}
-	bh = blockHandle{w.offset, uint64(len(b) - blockTrailerLen)}
-	w.offset += uint64(len(b))
-	return
-}
-
-func (w *Writer) flushPendingBH(key []byte) {
-	if w.pendingBH.length == 0 {
-		return
-	}
-	var separator []byte
-	if len(key) == 0 {
-		separator = w.cmp.Successor(w.comparerScratch[:0], w.dataBlock.prevKey)
-	} else {
-		separator = w.cmp.Separator(w.comparerScratch[:0], w.dataBlock.prevKey, key)
-	}
-	if separator == nil {
-		separator = w.dataBlock.prevKey
-	} else {
-		w.comparerScratch = separator
-	}
-	n := encodeBlockHandle(w.scratch[:20], w.pendingBH)
-	// Append the block handle to the index block.
-	w.indexBlock.append(separator, w.scratch[:n])
-	// Reset prev key of the data block.
-	w.dataBlock.prevKey = w.dataBlock.prevKey[:0]
-	// Clear pending block handle.
-	w.pendingBH = blockHandle{}
-}
-
-func (w *Writer) finishBlock() error {
-	w.dataBlock.finish()
-	bh, err := w.writeBlock(&w.dataBlock.buf, w.compression)
-	if err != nil {
-		return err
-	}
-	w.pendingBH = bh
-	// Reset the data block.
-	w.dataBlock.reset()
-	// Flush the filter block.
-	w.filterBlock.flush(w.offset)
-	return nil
-}
-
-// Append appends key/value pair to the table. The keys passed must
-// be in increasing order.
-//
-// It is safe to modify the contents of the arguments after Append returns.
-func (w *Writer) Append(key, value []byte) error {
-	if w.err != nil {
-		return w.err
-	}
-	if w.nEntries > 0 && w.cmp.Compare(w.dataBlock.prevKey, key) >= 0 {
-		w.err = fmt.Errorf("leveldb/table: Writer: keys are not in increasing order: %q, %q", w.dataBlock.prevKey, key)
-		return w.err
-	}
-
-	w.flushPendingBH(key)
-	// Append key/value pair to the data block.
-	w.dataBlock.append(key, value)
-	// Add key to the filter block.
-	w.filterBlock.add(key)
-
-	// Finish the data block if block size target reached.
-	if w.dataBlock.bytesLen() >= w.blockSize {
-		if err := w.finishBlock(); err != nil {
-			w.err = err
-			return w.err
-		}
-	}
-	w.nEntries++
-	return nil
-}
-
-// BlocksLen returns number of blocks written so far.
-func (w *Writer) BlocksLen() int {
-	n := w.indexBlock.nEntries
-	if w.pendingBH.length > 0 {
-		// Includes the pending block.
-		n++
-	}
-	return n
-}
-
-// EntriesLen returns number of entries added so far.
-func (w *Writer) EntriesLen() int {
-	return w.nEntries
-}
-
-// BytesLen returns number of bytes written so far.
-func (w *Writer) BytesLen() int {
-	return int(w.offset)
-}
-
-// Close will finalize the table. Calling Append is not possible
-// after Close, but calling BlocksLen, EntriesLen and BytesLen
-// is still possible.
-func (w *Writer) Close() error {
-	if w.err != nil {
-		return w.err
-	}
-
-	// Write the last data block. Or empty data block if there
-	// aren't any data blocks at all.
-	if w.dataBlock.nEntries > 0 || w.nEntries == 0 {
-		if err := w.finishBlock(); err != nil {
-			w.err = err
-			return w.err
-		}
-	}
-	w.flushPendingBH(nil)
-
-	// Write the filter block.
-	var filterBH blockHandle
-	w.filterBlock.finish()
-	if buf := &w.filterBlock.buf; buf.Len() > 0 {
-		filterBH, w.err = w.writeBlock(buf, opt.NoCompression)
-		if w.err != nil {
-			return w.err
-		}
-	}
-
-	// Write the metaindex block.
-	if filterBH.length > 0 {
-		key := []byte("filter." + w.filter.Name())
-		n := encodeBlockHandle(w.scratch[:20], filterBH)
-		w.dataBlock.append(key, w.scratch[:n])
-	}
-	w.dataBlock.finish()
-	metaindexBH, err := w.writeBlock(&w.dataBlock.buf, w.compression)
-	if err != nil {
-		w.err = err
-		return w.err
-	}
-
-	// Write the index block.
-	w.indexBlock.finish()
-	indexBH, err := w.writeBlock(&w.indexBlock.buf, w.compression)
-	if err != nil {
-		w.err = err
-		return w.err
-	}
-
-	// Write the table footer.
-	footer := w.scratch[:footerLen]
-	for i := range footer {
-		footer[i] = 0
-	}
-	n := encodeBlockHandle(footer, metaindexBH)
-	encodeBlockHandle(footer[n:], indexBH)
-	copy(footer[footerLen-len(magic):], magic)
-	if _, err := w.writer.Write(footer); err != nil {
-		w.err = err
-		return w.err
-	}
-	w.offset += footerLen
-
-	w.err = errors.New("leveldb/table: writer is closed")
-	return nil
-}
-
-// NewWriter creates a new initialized table writer for the file.
-//
-// Table writer is not goroutine-safe.
-func NewWriter(f io.Writer, o *opt.Options) *Writer {
-	w := &Writer{
-		writer:          f,
-		cmp:             o.GetComparer(),
-		filter:          o.GetFilter(),
-		compression:     o.GetCompression(),
-		blockSize:       o.GetBlockSize(),
-		comparerScratch: make([]byte, 0),
-	}
-	// data block
-	w.dataBlock.restartInterval = o.GetBlockRestartInterval()
-	// The first 20-bytes are used for encoding block handle.
-	w.dataBlock.scratch = w.scratch[20:]
-	// index block
-	w.indexBlock.restartInterval = 1
-	w.indexBlock.scratch = w.scratch[20:]
-	// filter block
-	if w.filter != nil {
-		w.filterBlock.generator = w.filter.NewGenerator()
-		w.filterBlock.flush(0)
-	}
-	return w
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/db.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/db.go
deleted file mode 100644
index ec3f177a1..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/db.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"fmt"
-	"math/rand"
-
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type DB interface{}
-
-type Put interface {
-	TestPut(key []byte, value []byte) error
-}
-
-type Delete interface {
-	TestDelete(key []byte) error
-}
-
-type Find interface {
-	TestFind(key []byte) (rkey, rvalue []byte, err error)
-}
-
-type Get interface {
-	TestGet(key []byte) (value []byte, err error)
-}
-
-type Has interface {
-	TestHas(key []byte) (ret bool, err error)
-}
-
-type NewIterator interface {
-	TestNewIterator(slice *util.Range) iterator.Iterator
-}
-
-type DBAct int
-
-func (a DBAct) String() string {
-	switch a {
-	case DBNone:
-		return "none"
-	case DBPut:
-		return "put"
-	case DBOverwrite:
-		return "overwrite"
-	case DBDelete:
-		return "delete"
-	case DBDeleteNA:
-		return "delete_na"
-	}
-	return "unknown"
-}
-
-const (
-	DBNone DBAct = iota
-	DBPut
-	DBOverwrite
-	DBDelete
-	DBDeleteNA
-)
-
-type DBTesting struct {
-	Rand *rand.Rand
-	DB   interface {
-		Get
-		Put
-		Delete
-	}
-	PostFn             func(t *DBTesting)
-	Deleted, Present   KeyValue
-	Act, LastAct       DBAct
-	ActKey, LastActKey []byte
-}
-
-func (t *DBTesting) post() {
-	if t.PostFn != nil {
-		t.PostFn(t)
-	}
-}
-
-func (t *DBTesting) setAct(act DBAct, key []byte) {
-	t.LastAct, t.Act = t.Act, act
-	t.LastActKey, t.ActKey = t.ActKey, key
-}
-
-func (t *DBTesting) text() string {
-	return fmt.Sprintf("last action was <%v> %q, <%v> %q", t.LastAct, t.LastActKey, t.Act, t.ActKey)
-}
-
-func (t *DBTesting) Text() string {
-	return "DBTesting " + t.text()
-}
-
-func (t *DBTesting) TestPresentKV(key, value []byte) {
-	rvalue, err := t.DB.TestGet(key)
-	Expect(err).ShouldNot(HaveOccurred(), "Get on key %q, %s", key, t.text())
-	Expect(rvalue).Should(Equal(value), "Value for key %q, %s", key, t.text())
-}
-
-func (t *DBTesting) TestAllPresent() {
-	t.Present.IterateShuffled(t.Rand, func(i int, key, value []byte) {
-		t.TestPresentKV(key, value)
-	})
-}
-
-func (t *DBTesting) TestDeletedKey(key []byte) {
-	_, err := t.DB.TestGet(key)
-	Expect(err).Should(Equal(errors.ErrNotFound), "Get on deleted key %q, %s", key, t.text())
-}
-
-func (t *DBTesting) TestAllDeleted() {
-	t.Deleted.IterateShuffled(t.Rand, func(i int, key, value []byte) {
-		t.TestDeletedKey(key)
-	})
-}
-
-func (t *DBTesting) TestAll() {
-	dn := t.Deleted.Len()
-	pn := t.Present.Len()
-	ShuffledIndex(t.Rand, dn+pn, 1, func(i int) {
-		if i >= dn {
-			key, value := t.Present.Index(i - dn)
-			t.TestPresentKV(key, value)
-		} else {
-			t.TestDeletedKey(t.Deleted.KeyAt(i))
-		}
-	})
-}
-
-func (t *DBTesting) Put(key, value []byte) {
-	if new := t.Present.PutU(key, value); new {
-		t.setAct(DBPut, key)
-	} else {
-		t.setAct(DBOverwrite, key)
-	}
-	t.Deleted.Delete(key)
-	err := t.DB.TestPut(key, value)
-	Expect(err).ShouldNot(HaveOccurred(), t.Text())
-	t.TestPresentKV(key, value)
-	t.post()
-}
-
-func (t *DBTesting) PutRandom() bool {
-	if t.Deleted.Len() > 0 {
-		i := t.Rand.Intn(t.Deleted.Len())
-		key, value := t.Deleted.Index(i)
-		t.Put(key, value)
-		return true
-	}
-	return false
-}
-
-func (t *DBTesting) Delete(key []byte) {
-	if exist, value := t.Present.Delete(key); exist {
-		t.setAct(DBDelete, key)
-		t.Deleted.PutU(key, value)
-	} else {
-		t.setAct(DBDeleteNA, key)
-	}
-	err := t.DB.TestDelete(key)
-	Expect(err).ShouldNot(HaveOccurred(), t.Text())
-	t.TestDeletedKey(key)
-	t.post()
-}
-
-func (t *DBTesting) DeleteRandom() bool {
-	if t.Present.Len() > 0 {
-		i := t.Rand.Intn(t.Present.Len())
-		t.Delete(t.Present.KeyAt(i))
-		return true
-	}
-	return false
-}
-
-func (t *DBTesting) RandomAct(round int) {
-	for i := 0; i < round; i++ {
-		if t.Rand.Int()%2 == 0 {
-			t.PutRandom()
-		} else {
-			t.DeleteRandom()
-		}
-	}
-}
-
-func DoDBTesting(t *DBTesting) {
-	if t.Rand == nil {
-		t.Rand = NewRand()
-	}
-
-	t.DeleteRandom()
-	t.PutRandom()
-	t.DeleteRandom()
-	t.DeleteRandom()
-	for i := t.Deleted.Len() / 2; i >= 0; i-- {
-		t.PutRandom()
-	}
-	t.RandomAct((t.Deleted.Len() + t.Present.Len()) * 10)
-
-	// Additional iterator testing
-	if db, ok := t.DB.(NewIterator); ok {
-		iter := db.TestNewIterator(nil)
-		Expect(iter.Error()).NotTo(HaveOccurred())
-
-		it := IteratorTesting{
-			KeyValue: t.Present,
-			Iter:     iter,
-		}
-
-		DoIteratorTesting(&it)
-		iter.Release()
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/ginkgo.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/ginkgo.go
deleted file mode 100644
index 82f3d0e81..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/ginkgo.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package testutil
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-func RunSuite(t GinkgoTestingT, name string) {
-	RunDefer()
-
-	SynchronizedBeforeSuite(func() []byte {
-		RunDefer("setup")
-		return nil
-	}, func(data []byte) {})
-	SynchronizedAfterSuite(func() {
-		RunDefer("teardown")
-	}, func() {})
-
-	RegisterFailHandler(Fail)
-	RunSpecs(t, name)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/iter.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/iter.go
deleted file mode 100644
index df6d9db6a..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/iter.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"fmt"
-	"math/rand"
-
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-)
-
-type IterAct int
-
-func (a IterAct) String() string {
-	switch a {
-	case IterNone:
-		return "none"
-	case IterFirst:
-		return "first"
-	case IterLast:
-		return "last"
-	case IterPrev:
-		return "prev"
-	case IterNext:
-		return "next"
-	case IterSeek:
-		return "seek"
-	case IterSOI:
-		return "soi"
-	case IterEOI:
-		return "eoi"
-	}
-	return "unknown"
-}
-
-const (
-	IterNone IterAct = iota
-	IterFirst
-	IterLast
-	IterPrev
-	IterNext
-	IterSeek
-	IterSOI
-	IterEOI
-)
-
-type IteratorTesting struct {
-	KeyValue
-	Iter         iterator.Iterator
-	Rand         *rand.Rand
-	PostFn       func(t *IteratorTesting)
-	Pos          int
-	Act, LastAct IterAct
-
-	once bool
-}
-
-func (t *IteratorTesting) init() {
-	if !t.once {
-		t.Pos = -1
-		t.once = true
-	}
-}
-
-func (t *IteratorTesting) post() {
-	if t.PostFn != nil {
-		t.PostFn(t)
-	}
-}
-
-func (t *IteratorTesting) setAct(act IterAct) {
-	t.LastAct, t.Act = t.Act, act
-}
-
-func (t *IteratorTesting) text() string {
-	return fmt.Sprintf("at pos %d and last action was <%v> -> <%v>", t.Pos, t.LastAct, t.Act)
-}
-
-func (t *IteratorTesting) Text() string {
-	return "IteratorTesting is " + t.text()
-}
-
-func (t *IteratorTesting) IsFirst() bool {
-	t.init()
-	return t.Len() > 0 && t.Pos == 0
-}
-
-func (t *IteratorTesting) IsLast() bool {
-	t.init()
-	return t.Len() > 0 && t.Pos == t.Len()-1
-}
-
-func (t *IteratorTesting) TestKV() {
-	t.init()
-	key, value := t.Index(t.Pos)
-	Expect(t.Iter.Key()).NotTo(BeNil())
-	Expect(t.Iter.Key()).Should(Equal(key), "Key is invalid, %s", t.text())
-	Expect(t.Iter.Value()).Should(Equal(value), "Value for key %q, %s", key, t.text())
-}
-
-func (t *IteratorTesting) First() {
-	t.init()
-	t.setAct(IterFirst)
-
-	ok := t.Iter.First()
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	if t.Len() > 0 {
-		t.Pos = 0
-		Expect(ok).Should(BeTrue(), t.Text())
-		t.TestKV()
-	} else {
-		t.Pos = -1
-		Expect(ok).ShouldNot(BeTrue(), t.Text())
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) Last() {
-	t.init()
-	t.setAct(IterLast)
-
-	ok := t.Iter.Last()
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	if t.Len() > 0 {
-		t.Pos = t.Len() - 1
-		Expect(ok).Should(BeTrue(), t.Text())
-		t.TestKV()
-	} else {
-		t.Pos = 0
-		Expect(ok).ShouldNot(BeTrue(), t.Text())
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) Next() {
-	t.init()
-	t.setAct(IterNext)
-
-	ok := t.Iter.Next()
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	if t.Pos < t.Len()-1 {
-		t.Pos++
-		Expect(ok).Should(BeTrue(), t.Text())
-		t.TestKV()
-	} else {
-		t.Pos = t.Len()
-		Expect(ok).ShouldNot(BeTrue(), t.Text())
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) Prev() {
-	t.init()
-	t.setAct(IterPrev)
-
-	ok := t.Iter.Prev()
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	if t.Pos > 0 {
-		t.Pos--
-		Expect(ok).Should(BeTrue(), t.Text())
-		t.TestKV()
-	} else {
-		t.Pos = -1
-		Expect(ok).ShouldNot(BeTrue(), t.Text())
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) Seek(i int) {
-	t.init()
-	t.setAct(IterSeek)
-
-	key, _ := t.Index(i)
-	oldKey, _ := t.IndexOrNil(t.Pos)
-
-	ok := t.Iter.Seek(key)
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	Expect(ok).Should(BeTrue(), fmt.Sprintf("Seek from key %q to %q, to pos %d, %s", oldKey, key, i, t.text()))
-
-	t.Pos = i
-	t.TestKV()
-	t.post()
-}
-
-func (t *IteratorTesting) SeekInexact(i int) {
-	t.init()
-	t.setAct(IterSeek)
-	var key0 []byte
-	key1, _ := t.Index(i)
-	if i > 0 {
-		key0, _ = t.Index(i - 1)
-	}
-	key := BytesSeparator(key0, key1)
-	oldKey, _ := t.IndexOrNil(t.Pos)
-
-	ok := t.Iter.Seek(key)
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	Expect(ok).Should(BeTrue(), fmt.Sprintf("Seek from key %q to %q (%q), to pos %d, %s", oldKey, key, key1, i, t.text()))
-
-	t.Pos = i
-	t.TestKV()
-	t.post()
-}
-
-func (t *IteratorTesting) SeekKey(key []byte) {
-	t.init()
-	t.setAct(IterSeek)
-	oldKey, _ := t.IndexOrNil(t.Pos)
-	i := t.Search(key)
-
-	ok := t.Iter.Seek(key)
-	Expect(t.Iter.Error()).ShouldNot(HaveOccurred())
-	if i < t.Len() {
-		key_, _ := t.Index(i)
-		Expect(ok).Should(BeTrue(), fmt.Sprintf("Seek from key %q to %q (%q), to pos %d, %s", oldKey, key, key_, i, t.text()))
-		t.Pos = i
-		t.TestKV()
-	} else {
-		Expect(ok).ShouldNot(BeTrue(), fmt.Sprintf("Seek from key %q to %q, %s", oldKey, key, t.text()))
-	}
-
-	t.Pos = i
-	t.post()
-}
-
-func (t *IteratorTesting) SOI() {
-	t.init()
-	t.setAct(IterSOI)
-	Expect(t.Pos).Should(BeNumerically("<=", 0), t.Text())
-	for i := 0; i < 3; i++ {
-		t.Prev()
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) EOI() {
-	t.init()
-	t.setAct(IterEOI)
-	Expect(t.Pos).Should(BeNumerically(">=", t.Len()-1), t.Text())
-	for i := 0; i < 3; i++ {
-		t.Next()
-	}
-	t.post()
-}
-
-func (t *IteratorTesting) WalkPrev(fn func(t *IteratorTesting)) {
-	t.init()
-	for old := t.Pos; t.Pos > 0; old = t.Pos {
-		fn(t)
-		Expect(t.Pos).Should(BeNumerically("<", old), t.Text())
-	}
-}
-
-func (t *IteratorTesting) WalkNext(fn func(t *IteratorTesting)) {
-	t.init()
-	for old := t.Pos; t.Pos < t.Len()-1; old = t.Pos {
-		fn(t)
-		Expect(t.Pos).Should(BeNumerically(">", old), t.Text())
-	}
-}
-
-func (t *IteratorTesting) PrevAll() {
-	t.WalkPrev(func(t *IteratorTesting) {
-		t.Prev()
-	})
-}
-
-func (t *IteratorTesting) NextAll() {
-	t.WalkNext(func(t *IteratorTesting) {
-		t.Next()
-	})
-}
-
-func DoIteratorTesting(t *IteratorTesting) {
-	if t.Rand == nil {
-		t.Rand = NewRand()
-	}
-	t.SOI()
-	t.NextAll()
-	t.First()
-	t.SOI()
-	t.NextAll()
-	t.EOI()
-	t.PrevAll()
-	t.Last()
-	t.EOI()
-	t.PrevAll()
-	t.SOI()
-
-	t.NextAll()
-	t.PrevAll()
-	t.NextAll()
-	t.Last()
-	t.PrevAll()
-	t.First()
-	t.NextAll()
-	t.EOI()
-
-	ShuffledIndex(t.Rand, t.Len(), 1, func(i int) {
-		t.Seek(i)
-	})
-
-	ShuffledIndex(t.Rand, t.Len(), 1, func(i int) {
-		t.SeekInexact(i)
-	})
-
-	ShuffledIndex(t.Rand, t.Len(), 1, func(i int) {
-		t.Seek(i)
-		if i%2 != 0 {
-			t.PrevAll()
-			t.SOI()
-		} else {
-			t.NextAll()
-			t.EOI()
-		}
-	})
-
-	for _, key := range []string{"", "foo", "bar", "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"} {
-		t.SeekKey([]byte(key))
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kv.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kv.go
deleted file mode 100644
index 471d5708c..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kv.go
+++ /dev/null
@@ -1,352 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"fmt"
-	"math/rand"
-	"sort"
-	"strings"
-
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type KeyValueEntry struct {
-	key, value []byte
-}
-
-type KeyValue struct {
-	entries []KeyValueEntry
-	nbytes  int
-}
-
-func (kv *KeyValue) Put(key, value []byte) {
-	if n := len(kv.entries); n > 0 && cmp.Compare(kv.entries[n-1].key, key) >= 0 {
-		panic(fmt.Sprintf("Put: keys are not in increasing order: %q, %q", kv.entries[n-1].key, key))
-	}
-	kv.entries = append(kv.entries, KeyValueEntry{key, value})
-	kv.nbytes += len(key) + len(value)
-}
-
-func (kv *KeyValue) PutString(key, value string) {
-	kv.Put([]byte(key), []byte(value))
-}
-
-func (kv *KeyValue) PutU(key, value []byte) bool {
-	if i, exist := kv.Get(key); !exist {
-		if i < kv.Len() {
-			kv.entries = append(kv.entries[:i+1], kv.entries[i:]...)
-			kv.entries[i] = KeyValueEntry{key, value}
-		} else {
-			kv.entries = append(kv.entries, KeyValueEntry{key, value})
-		}
-		kv.nbytes += len(key) + len(value)
-		return true
-	} else {
-		kv.nbytes += len(value) - len(kv.ValueAt(i))
-		kv.entries[i].value = value
-	}
-	return false
-}
-
-func (kv *KeyValue) PutUString(key, value string) bool {
-	return kv.PutU([]byte(key), []byte(value))
-}
-
-func (kv *KeyValue) Delete(key []byte) (exist bool, value []byte) {
-	i, exist := kv.Get(key)
-	if exist {
-		value = kv.entries[i].value
-		kv.DeleteIndex(i)
-	}
-	return
-}
-
-func (kv *KeyValue) DeleteIndex(i int) bool {
-	if i < kv.Len() {
-		kv.nbytes -= len(kv.KeyAt(i)) + len(kv.ValueAt(i))
-		kv.entries = append(kv.entries[:i], kv.entries[i+1:]...)
-		return true
-	}
-	return false
-}
-
-func (kv KeyValue) Len() int {
-	return len(kv.entries)
-}
-
-func (kv *KeyValue) Size() int {
-	return kv.nbytes
-}
-
-func (kv KeyValue) KeyAt(i int) []byte {
-	return kv.entries[i].key
-}
-
-func (kv KeyValue) ValueAt(i int) []byte {
-	return kv.entries[i].value
-}
-
-func (kv KeyValue) Index(i int) (key, value []byte) {
-	if i < 0 || i >= len(kv.entries) {
-		panic(fmt.Sprintf("Index #%d: out of range", i))
-	}
-	return kv.entries[i].key, kv.entries[i].value
-}
-
-func (kv KeyValue) IndexInexact(i int) (key_, key, value []byte) {
-	key, value = kv.Index(i)
-	var key0 []byte
-	var key1 = kv.KeyAt(i)
-	if i > 0 {
-		key0 = kv.KeyAt(i - 1)
-	}
-	key_ = BytesSeparator(key0, key1)
-	return
-}
-
-func (kv KeyValue) IndexOrNil(i int) (key, value []byte) {
-	if i >= 0 && i < len(kv.entries) {
-		return kv.entries[i].key, kv.entries[i].value
-	}
-	return nil, nil
-}
-
-func (kv KeyValue) IndexString(i int) (key, value string) {
-	key_, _value := kv.Index(i)
-	return string(key_), string(_value)
-}
-
-func (kv KeyValue) Search(key []byte) int {
-	return sort.Search(kv.Len(), func(i int) bool {
-		return cmp.Compare(kv.KeyAt(i), key) >= 0
-	})
-}
-
-func (kv KeyValue) SearchString(key string) int {
-	return kv.Search([]byte(key))
-}
-
-func (kv KeyValue) Get(key []byte) (i int, exist bool) {
-	i = kv.Search(key)
-	if i < kv.Len() && cmp.Compare(kv.KeyAt(i), key) == 0 {
-		exist = true
-	}
-	return
-}
-
-func (kv KeyValue) GetString(key string) (i int, exist bool) {
-	return kv.Get([]byte(key))
-}
-
-func (kv KeyValue) Iterate(fn func(i int, key, value []byte)) {
-	for i, x := range kv.entries {
-		fn(i, x.key, x.value)
-	}
-}
-
-func (kv KeyValue) IterateString(fn func(i int, key, value string)) {
-	kv.Iterate(func(i int, key, value []byte) {
-		fn(i, string(key), string(value))
-	})
-}
-
-func (kv KeyValue) IterateShuffled(rnd *rand.Rand, fn func(i int, key, value []byte)) {
-	ShuffledIndex(rnd, kv.Len(), 1, func(i int) {
-		fn(i, kv.entries[i].key, kv.entries[i].value)
-	})
-}
-
-func (kv KeyValue) IterateShuffledString(rnd *rand.Rand, fn func(i int, key, value string)) {
-	kv.IterateShuffled(rnd, func(i int, key, value []byte) {
-		fn(i, string(key), string(value))
-	})
-}
-
-func (kv KeyValue) IterateInexact(fn func(i int, key_, key, value []byte)) {
-	for i := range kv.entries {
-		key_, key, value := kv.IndexInexact(i)
-		fn(i, key_, key, value)
-	}
-}
-
-func (kv KeyValue) IterateInexactString(fn func(i int, key_, key, value string)) {
-	kv.IterateInexact(func(i int, key_, key, value []byte) {
-		fn(i, string(key_), string(key), string(value))
-	})
-}
-
-func (kv KeyValue) Clone() KeyValue {
-	return KeyValue{append([]KeyValueEntry{}, kv.entries...), kv.nbytes}
-}
-
-func (kv KeyValue) Slice(start, limit int) KeyValue {
-	if start < 0 || limit > kv.Len() {
-		panic(fmt.Sprintf("Slice %d .. %d: out of range", start, limit))
-	} else if limit < start {
-		panic(fmt.Sprintf("Slice %d .. %d: invalid range", start, limit))
-	}
-	return KeyValue{append([]KeyValueEntry{}, kv.entries[start:limit]...), kv.nbytes}
-}
-
-func (kv KeyValue) SliceKey(start, limit []byte) KeyValue {
-	start_ := 0
-	limit_ := kv.Len()
-	if start != nil {
-		start_ = kv.Search(start)
-	}
-	if limit != nil {
-		limit_ = kv.Search(limit)
-	}
-	return kv.Slice(start_, limit_)
-}
-
-func (kv KeyValue) SliceKeyString(start, limit string) KeyValue {
-	return kv.SliceKey([]byte(start), []byte(limit))
-}
-
-func (kv KeyValue) SliceRange(r *util.Range) KeyValue {
-	if r != nil {
-		return kv.SliceKey(r.Start, r.Limit)
-	}
-	return kv.Clone()
-}
-
-func (kv KeyValue) Range(start, limit int) (r util.Range) {
-	if kv.Len() > 0 {
-		if start == kv.Len() {
-			r.Start = BytesAfter(kv.KeyAt(start - 1))
-		} else {
-			r.Start = kv.KeyAt(start)
-		}
-	}
-	if limit < kv.Len() {
-		r.Limit = kv.KeyAt(limit)
-	}
-	return
-}
-
-func KeyValue_EmptyKey() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("", "v")
-	return kv
-}
-
-func KeyValue_EmptyValue() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("abc", "")
-	kv.PutString("abcd", "")
-	return kv
-}
-
-func KeyValue_OneKeyValue() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("abc", "v")
-	return kv
-}
-
-func KeyValue_BigValue() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("big1", strings.Repeat("1", 200000))
-	return kv
-}
-
-func KeyValue_SpecialKey() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("\xff\xff", "v3")
-	return kv
-}
-
-func KeyValue_MultipleKeyValue() *KeyValue {
-	kv := &KeyValue{}
-	kv.PutString("a", "v")
-	kv.PutString("aa", "v1")
-	kv.PutString("aaa", "v2")
-	kv.PutString("aaacccccccccc", "v2")
-	kv.PutString("aaaccccccccccd", "v3")
-	kv.PutString("aaaccccccccccf", "v4")
-	kv.PutString("aaaccccccccccfg", "v5")
-	kv.PutString("ab", "v6")
-	kv.PutString("abc", "v7")
-	kv.PutString("abcd", "v8")
-	kv.PutString("accccccccccccccc", "v9")
-	kv.PutString("b", "v10")
-	kv.PutString("bb", "v11")
-	kv.PutString("bc", "v12")
-	kv.PutString("c", "v13")
-	kv.PutString("c1", "v13")
-	kv.PutString("czzzzzzzzzzzzzz", "v14")
-	kv.PutString("fffffffffffffff", "v15")
-	kv.PutString("g11", "v15")
-	kv.PutString("g111", "v15")
-	kv.PutString("g111\xff", "v15")
-	kv.PutString("zz", "v16")
-	kv.PutString("zzzzzzz", "v16")
-	kv.PutString("zzzzzzzzzzzzzzzz", "v16")
-	return kv
-}
-
-var keymap = []byte("012345678ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy")
-
-func KeyValue_Generate(rnd *rand.Rand, n, minlen, maxlen, vminlen, vmaxlen int) *KeyValue {
-	if rnd == nil {
-		rnd = NewRand()
-	}
-	if maxlen < minlen {
-		panic("max len should >= min len")
-	}
-
-	rrand := func(min, max int) int {
-		if min == max {
-			return max
-		}
-		return rnd.Intn(max-min) + min
-	}
-
-	kv := &KeyValue{}
-	endC := byte(len(keymap) - 1)
-	gen := make([]byte, 0, maxlen)
-	for i := 0; i < n; i++ {
-		m := rrand(minlen, maxlen)
-		last := gen
-	retry:
-		gen = last[:m]
-		if k := len(last); m > k {
-			for j := k; j < m; j++ {
-				gen[j] = 0
-			}
-		} else {
-			for j := m - 1; j >= 0; j-- {
-				c := last[j]
-				if c == endC {
-					continue
-				}
-				gen[j] = c + 1
-				for j += 1; j < m; j++ {
-					gen[j] = 0
-				}
-				goto ok
-			}
-			if m < maxlen {
-				m++
-				goto retry
-			}
-			panic(fmt.Sprintf("only able to generate %d keys out of %d keys, try increasing max len", kv.Len(), n))
-		ok:
-		}
-		key := make([]byte, m)
-		for j := 0; j < m; j++ {
-			key[j] = keymap[gen[j]]
-		}
-		value := make([]byte, rrand(vminlen, vmaxlen))
-		for n := copy(value, []byte(fmt.Sprintf("v%d", i))); n < len(value); n++ {
-			value[n] = 'x'
-		}
-		kv.Put(key, value)
-	}
-	return kv
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go
deleted file mode 100644
index a0b58f0e7..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/kvtest.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"fmt"
-	"math/rand"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/errors"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-func KeyValueTesting(rnd *rand.Rand, kv KeyValue, p DB, setup func(KeyValue) DB, teardown func(DB)) {
-	if rnd == nil {
-		rnd = NewRand()
-	}
-
-	if p == nil {
-		BeforeEach(func() {
-			p = setup(kv)
-		})
-		if teardown != nil {
-			AfterEach(func() {
-				teardown(p)
-			})
-		}
-	}
-
-	It("Should find all keys with Find", func() {
-		if db, ok := p.(Find); ok {
-			ShuffledIndex(nil, kv.Len(), 1, func(i int) {
-				key_, key, value := kv.IndexInexact(i)
-
-				// Using exact key.
-				rkey, rvalue, err := db.TestFind(key)
-				Expect(err).ShouldNot(HaveOccurred(), "Error for key %q", key)
-				Expect(rkey).Should(Equal(key), "Key")
-				Expect(rvalue).Should(Equal(value), "Value for key %q", key)
-
-				// Using inexact key.
-				rkey, rvalue, err = db.TestFind(key_)
-				Expect(err).ShouldNot(HaveOccurred(), "Error for key %q (%q)", key_, key)
-				Expect(rkey).Should(Equal(key))
-				Expect(rvalue).Should(Equal(value), "Value for key %q (%q)", key_, key)
-			})
-		}
-	})
-
-	It("Should return error if the key is not present", func() {
-		if db, ok := p.(Find); ok {
-			var key []byte
-			if kv.Len() > 0 {
-				key_, _ := kv.Index(kv.Len() - 1)
-				key = BytesAfter(key_)
-			}
-			rkey, _, err := db.TestFind(key)
-			Expect(err).Should(HaveOccurred(), "Find for key %q yield key %q", key, rkey)
-			Expect(err).Should(Equal(errors.ErrNotFound))
-		}
-	})
-
-	It("Should only find exact key with Get", func() {
-		if db, ok := p.(Get); ok {
-			ShuffledIndex(nil, kv.Len(), 1, func(i int) {
-				key_, key, value := kv.IndexInexact(i)
-
-				// Using exact key.
-				rvalue, err := db.TestGet(key)
-				Expect(err).ShouldNot(HaveOccurred(), "Error for key %q", key)
-				Expect(rvalue).Should(Equal(value), "Value for key %q", key)
-
-				// Using inexact key.
-				if len(key_) > 0 {
-					_, err = db.TestGet(key_)
-					Expect(err).Should(HaveOccurred(), "Error for key %q", key_)
-					Expect(err).Should(Equal(errors.ErrNotFound))
-				}
-			})
-		}
-	})
-
-	It("Should only find present key with Has", func() {
-		if db, ok := p.(Has); ok {
-			ShuffledIndex(nil, kv.Len(), 1, func(i int) {
-				key_, key, _ := kv.IndexInexact(i)
-
-				// Using exact key.
-				ret, err := db.TestHas(key)
-				Expect(err).ShouldNot(HaveOccurred(), "Error for key %q", key)
-				Expect(ret).Should(BeTrue(), "False for key %q", key)
-
-				// Using inexact key.
-				if len(key_) > 0 {
-					ret, err = db.TestHas(key_)
-					Expect(err).ShouldNot(HaveOccurred(), "Error for key %q", key_)
-					Expect(ret).ShouldNot(BeTrue(), "True for key %q", key)
-				}
-			})
-		}
-	})
-
-	TestIter := func(r *util.Range, _kv KeyValue) {
-		if db, ok := p.(NewIterator); ok {
-			iter := db.TestNewIterator(r)
-			Expect(iter.Error()).ShouldNot(HaveOccurred())
-
-			t := IteratorTesting{
-				KeyValue: _kv,
-				Iter:     iter,
-			}
-
-			DoIteratorTesting(&t)
-			iter.Release()
-		}
-	}
-
-	It("Should iterates and seeks correctly", func(done Done) {
-		TestIter(nil, kv.Clone())
-		done <- true
-	}, 3.0)
-
-	RandomIndex(rnd, kv.Len(), Min(kv.Len(), 50), func(i int) {
-		type slice struct {
-			r            *util.Range
-			start, limit int
-		}
-
-		key_, _, _ := kv.IndexInexact(i)
-		for _, x := range []slice{
-			{&util.Range{Start: key_, Limit: nil}, i, kv.Len()},
-			{&util.Range{Start: nil, Limit: key_}, 0, i},
-		} {
-			It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", x.start, x.limit), func(done Done) {
-				TestIter(x.r, kv.Slice(x.start, x.limit))
-				done <- true
-			}, 3.0)
-		}
-	})
-
-	RandomRange(rnd, kv.Len(), Min(kv.Len(), 50), func(start, limit int) {
-		It(fmt.Sprintf("Should iterates and seeks correctly of a slice %d .. %d", start, limit), func(done Done) {
-			r := kv.Range(start, limit)
-			TestIter(&r, kv.Slice(start, limit))
-			done <- true
-		}, 3.0)
-	})
-}
-
-func AllKeyValueTesting(rnd *rand.Rand, body, setup func(KeyValue) DB, teardown func(DB)) {
-	Test := func(kv *KeyValue) func() {
-		return func() {
-			var p DB
-			if setup != nil {
-				Defer("setup", func() {
-					p = setup(*kv)
-				})
-			}
-			if teardown != nil {
-				Defer("teardown", func() {
-					teardown(p)
-				})
-			}
-			if body != nil {
-				p = body(*kv)
-			}
-			KeyValueTesting(rnd, *kv, p, func(KeyValue) DB {
-				return p
-			}, nil)
-		}
-	}
-
-	Describe("with no key/value (empty)", Test(&KeyValue{}))
-	Describe("with empty key", Test(KeyValue_EmptyKey()))
-	Describe("with empty value", Test(KeyValue_EmptyValue()))
-	Describe("with one key/value", Test(KeyValue_OneKeyValue()))
-	Describe("with big value", Test(KeyValue_BigValue()))
-	Describe("with special key", Test(KeyValue_SpecialKey()))
-	Describe("with multiple key/value", Test(KeyValue_MultipleKeyValue()))
-	Describe("with generated key/value", Test(KeyValue_Generate(nil, 120, 1, 50, 10, 120)))
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/storage.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/storage.go
deleted file mode 100644
index 59c496d54..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/storage.go
+++ /dev/null
@@ -1,586 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/storage"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-var (
-	storageMu     sync.Mutex
-	storageUseFS  bool = true
-	storageKeepFS bool = false
-	storageNum    int
-)
-
-type StorageMode int
-
-const (
-	ModeOpen StorageMode = 1 << iota
-	ModeCreate
-	ModeRemove
-	ModeRead
-	ModeWrite
-	ModeSync
-	ModeClose
-)
-
-const (
-	modeOpen = iota
-	modeCreate
-	modeRemove
-	modeRead
-	modeWrite
-	modeSync
-	modeClose
-
-	modeCount
-)
-
-const (
-	typeManifest = iota
-	typeJournal
-	typeTable
-	typeTemp
-
-	typeCount
-)
-
-const flattenCount = modeCount * typeCount
-
-func flattenType(m StorageMode, t storage.FileType) int {
-	var x int
-	switch m {
-	case ModeOpen:
-		x = modeOpen
-	case ModeCreate:
-		x = modeCreate
-	case ModeRemove:
-		x = modeRemove
-	case ModeRead:
-		x = modeRead
-	case ModeWrite:
-		x = modeWrite
-	case ModeSync:
-		x = modeSync
-	case ModeClose:
-		x = modeClose
-	default:
-		panic("invalid storage mode")
-	}
-	x *= typeCount
-	switch t {
-	case storage.TypeManifest:
-		return x + typeManifest
-	case storage.TypeJournal:
-		return x + typeJournal
-	case storage.TypeTable:
-		return x + typeTable
-	case storage.TypeTemp:
-		return x + typeTemp
-	default:
-		panic("invalid file type")
-	}
-}
-
-func listFlattenType(m StorageMode, t storage.FileType) []int {
-	ret := make([]int, 0, flattenCount)
-	add := func(x int) {
-		x *= typeCount
-		switch {
-		case t&storage.TypeManifest != 0:
-			ret = append(ret, x+typeManifest)
-		case t&storage.TypeJournal != 0:
-			ret = append(ret, x+typeJournal)
-		case t&storage.TypeTable != 0:
-			ret = append(ret, x+typeTable)
-		case t&storage.TypeTemp != 0:
-			ret = append(ret, x+typeTemp)
-		}
-	}
-	switch {
-	case m&ModeOpen != 0:
-		add(modeOpen)
-	case m&ModeCreate != 0:
-		add(modeCreate)
-	case m&ModeRemove != 0:
-		add(modeRemove)
-	case m&ModeRead != 0:
-		add(modeRead)
-	case m&ModeWrite != 0:
-		add(modeWrite)
-	case m&ModeSync != 0:
-		add(modeSync)
-	case m&ModeClose != 0:
-		add(modeClose)
-	}
-	return ret
-}
-
-func packFile(num uint64, t storage.FileType) uint64 {
-	if num>>(64-typeCount) != 0 {
-		panic("overflow")
-	}
-	return num<<typeCount | uint64(t)
-}
-
-func unpackFile(x uint64) (uint64, storage.FileType) {
-	return x >> typeCount, storage.FileType(x) & storage.TypeAll
-}
-
-type emulatedError struct {
-	err error
-}
-
-func (err emulatedError) Error() string {
-	return fmt.Sprintf("emulated storage error: %v", err.err)
-}
-
-type storageLock struct {
-	s *Storage
-	r util.Releaser
-}
-
-func (l storageLock) Release() {
-	l.r.Release()
-	l.s.logI("storage lock released")
-}
-
-type reader struct {
-	f *file
-	storage.Reader
-}
-
-func (r *reader) Read(p []byte) (n int, err error) {
-	err = r.f.s.emulateError(ModeRead, r.f.Type())
-	if err == nil {
-		r.f.s.stall(ModeRead, r.f.Type())
-		n, err = r.Reader.Read(p)
-	}
-	r.f.s.count(ModeRead, r.f.Type(), n)
-	if err != nil && err != io.EOF {
-		r.f.s.logI("read error, num=%d type=%v n=%d err=%v", r.f.Num(), r.f.Type(), n, err)
-	}
-	return
-}
-
-func (r *reader) ReadAt(p []byte, off int64) (n int, err error) {
-	err = r.f.s.emulateError(ModeRead, r.f.Type())
-	if err == nil {
-		r.f.s.stall(ModeRead, r.f.Type())
-		n, err = r.Reader.ReadAt(p, off)
-	}
-	r.f.s.count(ModeRead, r.f.Type(), n)
-	if err != nil && err != io.EOF {
-		r.f.s.logI("readAt error, num=%d type=%v offset=%d n=%d err=%v", r.f.Num(), r.f.Type(), off, n, err)
-	}
-	return
-}
-
-func (r *reader) Close() (err error) {
-	return r.f.doClose(r.Reader)
-}
-
-type writer struct {
-	f *file
-	storage.Writer
-}
-
-func (w *writer) Write(p []byte) (n int, err error) {
-	err = w.f.s.emulateError(ModeWrite, w.f.Type())
-	if err == nil {
-		w.f.s.stall(ModeWrite, w.f.Type())
-		n, err = w.Writer.Write(p)
-	}
-	w.f.s.count(ModeWrite, w.f.Type(), n)
-	if err != nil && err != io.EOF {
-		w.f.s.logI("write error, num=%d type=%v n=%d err=%v", w.f.Num(), w.f.Type(), n, err)
-	}
-	return
-}
-
-func (w *writer) Sync() (err error) {
-	err = w.f.s.emulateError(ModeSync, w.f.Type())
-	if err == nil {
-		w.f.s.stall(ModeSync, w.f.Type())
-		err = w.Writer.Sync()
-	}
-	w.f.s.count(ModeSync, w.f.Type(), 0)
-	if err != nil {
-		w.f.s.logI("sync error, num=%d type=%v err=%v", w.f.Num(), w.f.Type(), err)
-	}
-	return
-}
-
-func (w *writer) Close() (err error) {
-	return w.f.doClose(w.Writer)
-}
-
-type file struct {
-	s *Storage
-	storage.File
-}
-
-func (f *file) pack() uint64 {
-	return packFile(f.Num(), f.Type())
-}
-
-func (f *file) assertOpen() {
-	ExpectWithOffset(2, f.s.opens).NotTo(HaveKey(f.pack()), "File open, num=%d type=%v writer=%v", f.Num(), f.Type(), f.s.opens[f.pack()])
-}
-
-func (f *file) doClose(closer io.Closer) (err error) {
-	err = f.s.emulateError(ModeClose, f.Type())
-	if err == nil {
-		f.s.stall(ModeClose, f.Type())
-	}
-	f.s.mu.Lock()
-	defer f.s.mu.Unlock()
-	if err == nil {
-		ExpectWithOffset(2, f.s.opens).To(HaveKey(f.pack()), "File closed, num=%d type=%v", f.Num(), f.Type())
-		err = closer.Close()
-	}
-	f.s.countNB(ModeClose, f.Type(), 0)
-	writer := f.s.opens[f.pack()]
-	if err != nil {
-		f.s.logISkip(1, "file close failed, num=%d type=%v writer=%v err=%v", f.Num(), f.Type(), writer, err)
-	} else {
-		f.s.logISkip(1, "file closed, num=%d type=%v writer=%v", f.Num(), f.Type(), writer)
-		delete(f.s.opens, f.pack())
-	}
-	return
-}
-
-func (f *file) Open() (r storage.Reader, err error) {
-	err = f.s.emulateError(ModeOpen, f.Type())
-	if err == nil {
-		f.s.stall(ModeOpen, f.Type())
-	}
-	f.s.mu.Lock()
-	defer f.s.mu.Unlock()
-	if err == nil {
-		f.assertOpen()
-		f.s.countNB(ModeOpen, f.Type(), 0)
-		r, err = f.File.Open()
-	}
-	if err != nil {
-		f.s.logI("file open failed, num=%d type=%v err=%v", f.Num(), f.Type(), err)
-	} else {
-		f.s.logI("file opened, num=%d type=%v", f.Num(), f.Type())
-		f.s.opens[f.pack()] = false
-		r = &reader{f, r}
-	}
-	return
-}
-
-func (f *file) Create() (w storage.Writer, err error) {
-	err = f.s.emulateError(ModeCreate, f.Type())
-	if err == nil {
-		f.s.stall(ModeCreate, f.Type())
-	}
-	f.s.mu.Lock()
-	defer f.s.mu.Unlock()
-	if err == nil {
-		f.assertOpen()
-		f.s.countNB(ModeCreate, f.Type(), 0)
-		w, err = f.File.Create()
-	}
-	if err != nil {
-		f.s.logI("file create failed, num=%d type=%v err=%v", f.Num(), f.Type(), err)
-	} else {
-		f.s.logI("file created, num=%d type=%v", f.Num(), f.Type())
-		f.s.opens[f.pack()] = true
-		w = &writer{f, w}
-	}
-	return
-}
-
-func (f *file) Remove() (err error) {
-	err = f.s.emulateError(ModeRemove, f.Type())
-	if err == nil {
-		f.s.stall(ModeRemove, f.Type())
-	}
-	f.s.mu.Lock()
-	defer f.s.mu.Unlock()
-	if err == nil {
-		f.assertOpen()
-		f.s.countNB(ModeRemove, f.Type(), 0)
-		err = f.File.Remove()
-	}
-	if err != nil {
-		f.s.logI("file remove failed, num=%d type=%v err=%v", f.Num(), f.Type(), err)
-	} else {
-		f.s.logI("file removed, num=%d type=%v", f.Num(), f.Type())
-	}
-	return
-}
-
-type Storage struct {
-	storage.Storage
-	closeFn func() error
-
-	lmu sync.Mutex
-	lb  bytes.Buffer
-
-	mu sync.Mutex
-	// Open files, true=writer, false=reader
-	opens         map[uint64]bool
-	counters      [flattenCount]int
-	bytesCounter  [flattenCount]int64
-	emulatedError [flattenCount]error
-	stallCond     sync.Cond
-	stalled       [flattenCount]bool
-}
-
-func (s *Storage) log(skip int, str string) {
-	s.lmu.Lock()
-	defer s.lmu.Unlock()
-	_, file, line, ok := runtime.Caller(skip + 2)
-	if ok {
-		// Truncate file name at last file name separator.
-		if index := strings.LastIndex(file, "/"); index >= 0 {
-			file = file[index+1:]
-		} else if index = strings.LastIndex(file, "\\"); index >= 0 {
-			file = file[index+1:]
-		}
-	} else {
-		file = "???"
-		line = 1
-	}
-	fmt.Fprintf(&s.lb, "%s:%d: ", file, line)
-	lines := strings.Split(str, "\n")
-	if l := len(lines); l > 1 && lines[l-1] == "" {
-		lines = lines[:l-1]
-	}
-	for i, line := range lines {
-		if i > 0 {
-			s.lb.WriteString("\n\t")
-		}
-		s.lb.WriteString(line)
-	}
-	s.lb.WriteByte('\n')
-}
-
-func (s *Storage) logISkip(skip int, format string, args ...interface{}) {
-	pc, _, _, ok := runtime.Caller(skip + 1)
-	if ok {
-		if f := runtime.FuncForPC(pc); f != nil {
-			fname := f.Name()
-			if index := strings.LastIndex(fname, "."); index >= 0 {
-				fname = fname[index+1:]
-			}
-			format = fname + ": " + format
-		}
-	}
-	s.log(skip+1, fmt.Sprintf(format, args...))
-}
-
-func (s *Storage) logI(format string, args ...interface{}) {
-	s.logISkip(1, format, args...)
-}
-
-func (s *Storage) Log(str string) {
-	s.log(1, "Log: "+str)
-	s.Storage.Log(str)
-}
-
-func (s *Storage) Lock() (r util.Releaser, err error) {
-	r, err = s.Storage.Lock()
-	if err != nil {
-		s.logI("storage locking failed, err=%v", err)
-	} else {
-		s.logI("storage locked")
-		r = storageLock{s, r}
-	}
-	return
-}
-
-func (s *Storage) GetFile(num uint64, t storage.FileType) storage.File {
-	return &file{s, s.Storage.GetFile(num, t)}
-}
-
-func (s *Storage) GetFiles(t storage.FileType) (files []storage.File, err error) {
-	rfiles, err := s.Storage.GetFiles(t)
-	if err != nil {
-		s.logI("get files failed, err=%v", err)
-		return
-	}
-	files = make([]storage.File, len(rfiles))
-	for i, f := range rfiles {
-		files[i] = &file{s, f}
-	}
-	s.logI("get files, type=0x%x count=%d", int(t), len(files))
-	return
-}
-
-func (s *Storage) GetManifest() (f storage.File, err error) {
-	manifest, err := s.Storage.GetManifest()
-	if err != nil {
-		if !os.IsNotExist(err) {
-			s.logI("get manifest failed, err=%v", err)
-		}
-		return
-	}
-	s.logI("get manifest, num=%d", manifest.Num())
-	return &file{s, manifest}, nil
-}
-
-func (s *Storage) SetManifest(f storage.File) error {
-	f_, ok := f.(*file)
-	ExpectWithOffset(1, ok).To(BeTrue())
-	ExpectWithOffset(1, f_.Type()).To(Equal(storage.TypeManifest))
-	err := s.Storage.SetManifest(f_.File)
-	if err != nil {
-		s.logI("set manifest failed, err=%v", err)
-	} else {
-		s.logI("set manifest, num=%d", f_.Num())
-	}
-	return err
-}
-
-func (s *Storage) openFiles() string {
-	out := "Open files:"
-	for x, writer := range s.opens {
-		num, t := unpackFile(x)
-		out += fmt.Sprintf("\n · num=%d type=%v writer=%v", num, t, writer)
-	}
-	return out
-}
-
-func (s *Storage) Close() error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	ExpectWithOffset(1, s.opens).To(BeEmpty(), s.openFiles())
-	err := s.Storage.Close()
-	if err != nil {
-		s.logI("storage closing failed, err=%v", err)
-	} else {
-		s.logI("storage closed")
-	}
-	if s.closeFn != nil {
-		if err1 := s.closeFn(); err1 != nil {
-			s.logI("close func error, err=%v", err1)
-		}
-	}
-	return err
-}
-
-func (s *Storage) countNB(m StorageMode, t storage.FileType, n int) {
-	s.counters[flattenType(m, t)]++
-	s.bytesCounter[flattenType(m, t)] += int64(n)
-}
-
-func (s *Storage) count(m StorageMode, t storage.FileType, n int) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.countNB(m, t, n)
-}
-
-func (s *Storage) ResetCounter(m StorageMode, t storage.FileType) {
-	for _, x := range listFlattenType(m, t) {
-		s.counters[x] = 0
-		s.bytesCounter[x] = 0
-	}
-}
-
-func (s *Storage) Counter(m StorageMode, t storage.FileType) (count int, bytes int64) {
-	for _, x := range listFlattenType(m, t) {
-		count += s.counters[x]
-		bytes += s.bytesCounter[x]
-	}
-	return
-}
-
-func (s *Storage) emulateError(m StorageMode, t storage.FileType) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	err := s.emulatedError[flattenType(m, t)]
-	if err != nil {
-		return emulatedError{err}
-	}
-	return nil
-}
-
-func (s *Storage) EmulateError(m StorageMode, t storage.FileType, err error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, x := range listFlattenType(m, t) {
-		s.emulatedError[x] = err
-	}
-}
-
-func (s *Storage) stall(m StorageMode, t storage.FileType) {
-	x := flattenType(m, t)
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for s.stalled[x] {
-		s.stallCond.Wait()
-	}
-}
-
-func (s *Storage) Stall(m StorageMode, t storage.FileType) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, x := range listFlattenType(m, t) {
-		s.stalled[x] = true
-	}
-}
-
-func (s *Storage) Release(m StorageMode, t storage.FileType) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	for _, x := range listFlattenType(m, t) {
-		s.stalled[x] = false
-	}
-	s.stallCond.Broadcast()
-}
-
-func NewStorage() *Storage {
-	var stor storage.Storage
-	var closeFn func() error
-	if storageUseFS {
-		for {
-			storageMu.Lock()
-			num := storageNum
-			storageNum++
-			storageMu.Unlock()
-			path := filepath.Join(os.TempDir(), fmt.Sprintf("goleveldb-test%d0%d0%d", os.Getuid(), os.Getpid(), num))
-			if _, err := os.Stat(path); os.IsNotExist(err) {
-				stor, err = storage.OpenFile(path)
-				ExpectWithOffset(1, err).NotTo(HaveOccurred(), "creating storage at %s", path)
-				closeFn = func() error {
-					if storageKeepFS {
-						return nil
-					}
-					return os.RemoveAll(path)
-				}
-				break
-			}
-		}
-	} else {
-		stor = storage.NewMemStorage()
-	}
-	s := &Storage{
-		Storage: stor,
-		closeFn: closeFn,
-		opens:   make(map[uint64]bool),
-	}
-	s.stallCond.L = &s.mu
-	return s
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/util.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil/util.go
deleted file mode 100644
index 97c5294b1..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil/util.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package testutil
-
-import (
-	"bytes"
-	"flag"
-	"math/rand"
-	"reflect"
-	"sync"
-
-	"github.com/onsi/ginkgo/config"
-
-	"github.com/syndtr/goleveldb/leveldb/comparer"
-)
-
-var (
-	runfn = make(map[string][]func())
-	runmu sync.Mutex
-)
-
-func Defer(args ...interface{}) bool {
-	var (
-		group string
-		fn    func()
-	)
-	for _, arg := range args {
-		v := reflect.ValueOf(arg)
-		switch v.Kind() {
-		case reflect.String:
-			group = v.String()
-		case reflect.Func:
-			r := reflect.ValueOf(&fn).Elem()
-			r.Set(v)
-		}
-	}
-	if fn != nil {
-		runmu.Lock()
-		runfn[group] = append(runfn[group], fn)
-		runmu.Unlock()
-	}
-	return true
-}
-
-func RunDefer(groups ...string) bool {
-	if len(groups) == 0 {
-		groups = append(groups, "")
-	}
-	runmu.Lock()
-	var runfn_ []func()
-	for _, group := range groups {
-		runfn_ = append(runfn_, runfn[group]...)
-		delete(runfn, group)
-	}
-	runmu.Unlock()
-	for _, fn := range runfn_ {
-		fn()
-	}
-	return runfn_ != nil
-}
-
-func RandomSeed() int64 {
-	if !flag.Parsed() {
-		panic("random seed not initialized")
-	}
-	return config.GinkgoConfig.RandomSeed
-}
-
-func NewRand() *rand.Rand {
-	return rand.New(rand.NewSource(RandomSeed()))
-}
-
-var cmp = comparer.DefaultComparer
-
-func BytesSeparator(a, b []byte) []byte {
-	if bytes.Equal(a, b) {
-		return b
-	}
-	i, n := 0, len(a)
-	if n > len(b) {
-		n = len(b)
-	}
-	for ; i < n && (a[i] == b[i]); i++ {
-	}
-	x := append([]byte{}, a[:i]...)
-	if i < n {
-		if c := a[i] + 1; c < b[i] {
-			return append(x, c)
-		}
-		x = append(x, a[i])
-		i++
-	}
-	for ; i < len(a); i++ {
-		if c := a[i]; c < 0xff {
-			return append(x, c+1)
-		} else {
-			x = append(x, c)
-		}
-	}
-	if len(b) > i && b[i] > 0 {
-		return append(x, b[i]-1)
-	}
-	return append(x, 'x')
-}
-
-func BytesAfter(b []byte) []byte {
-	var x []byte
-	for _, c := range b {
-		if c < 0xff {
-			return append(x, c+1)
-		} else {
-			x = append(x, c)
-		}
-	}
-	return append(x, 'x')
-}
-
-func RandomIndex(rnd *rand.Rand, n, round int, fn func(i int)) {
-	if rnd == nil {
-		rnd = NewRand()
-	}
-	for x := 0; x < round; x++ {
-		fn(rnd.Intn(n))
-	}
-	return
-}
-
-func ShuffledIndex(rnd *rand.Rand, n, round int, fn func(i int)) {
-	if rnd == nil {
-		rnd = NewRand()
-	}
-	for x := 0; x < round; x++ {
-		for _, i := range rnd.Perm(n) {
-			fn(i)
-		}
-	}
-	return
-}
-
-func RandomRange(rnd *rand.Rand, n, round int, fn func(start, limit int)) {
-	if rnd == nil {
-		rnd = NewRand()
-	}
-	for x := 0; x < round; x++ {
-		start := rnd.Intn(n)
-		length := 0
-		if j := n - start; j > 0 {
-			length = rnd.Intn(j)
-		}
-		fn(start, start+length)
-	}
-	return
-}
-
-func Max(x, y int) int {
-	if x > y {
-		return x
-	}
-	return y
-}
-
-func Min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/testutil_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/testutil_test.go
deleted file mode 100644
index 25bf2b29f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/testutil_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	. "github.com/onsi/gomega"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/testutil"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type testingDB struct {
-	*DB
-	ro   *opt.ReadOptions
-	wo   *opt.WriteOptions
-	stor *testutil.Storage
-}
-
-func (t *testingDB) TestPut(key []byte, value []byte) error {
-	return t.Put(key, value, t.wo)
-}
-
-func (t *testingDB) TestDelete(key []byte) error {
-	return t.Delete(key, t.wo)
-}
-
-func (t *testingDB) TestGet(key []byte) (value []byte, err error) {
-	return t.Get(key, t.ro)
-}
-
-func (t *testingDB) TestHas(key []byte) (ret bool, err error) {
-	return t.Has(key, t.ro)
-}
-
-func (t *testingDB) TestNewIterator(slice *util.Range) iterator.Iterator {
-	return t.NewIterator(slice, t.ro)
-}
-
-func (t *testingDB) TestClose() {
-	err := t.Close()
-	ExpectWithOffset(1, err).NotTo(HaveOccurred())
-	err = t.stor.Close()
-	ExpectWithOffset(1, err).NotTo(HaveOccurred())
-}
-
-func newTestingDB(o *opt.Options, ro *opt.ReadOptions, wo *opt.WriteOptions) *testingDB {
-	stor := testutil.NewStorage()
-	db, err := Open(stor, o)
-	// FIXME: This may be called from outside It, which may cause panic.
-	Expect(err).NotTo(HaveOccurred())
-	return &testingDB{
-		DB:   db,
-		ro:   ro,
-		wo:   wo,
-		stor: stor,
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util.go b/vendor/github.com/syndtr/goleveldb/leveldb/util.go
deleted file mode 100644
index 1a5bf71a3..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"fmt"
-	"sort"
-
-	"github.com/syndtr/goleveldb/leveldb/storage"
-)
-
-func shorten(str string) string {
-	if len(str) <= 8 {
-		return str
-	}
-	return str[:3] + ".." + str[len(str)-3:]
-}
-
-var bunits = [...]string{"", "Ki", "Mi", "Gi"}
-
-func shortenb(bytes int) string {
-	i := 0
-	for ; bytes > 1024 && i < 4; i++ {
-		bytes /= 1024
-	}
-	return fmt.Sprintf("%d%sB", bytes, bunits[i])
-}
-
-func sshortenb(bytes int) string {
-	if bytes == 0 {
-		return "~"
-	}
-	sign := "+"
-	if bytes < 0 {
-		sign = "-"
-		bytes *= -1
-	}
-	i := 0
-	for ; bytes > 1024 && i < 4; i++ {
-		bytes /= 1024
-	}
-	return fmt.Sprintf("%s%d%sB", sign, bytes, bunits[i])
-}
-
-func sint(x int) string {
-	if x == 0 {
-		return "~"
-	}
-	sign := "+"
-	if x < 0 {
-		sign = "-"
-		x *= -1
-	}
-	return fmt.Sprintf("%s%d", sign, x)
-}
-
-func minInt(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-func maxInt(a, b int) int {
-	if a > b {
-		return a
-	}
-	return b
-}
-
-type files []storage.File
-
-func (p files) Len() int {
-	return len(p)
-}
-
-func (p files) Less(i, j int) bool {
-	return p[i].Num() < p[j].Num()
-}
-
-func (p files) Swap(i, j int) {
-	p[i], p[j] = p[j], p[i]
-}
-
-func (p files) sort() {
-	sort.Sort(p)
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer.go
deleted file mode 100644
index 21de24255..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer.go
+++ /dev/null
@@ -1,293 +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 util
-
-// This a copy of Go std bytes.Buffer with some modification
-// and some features stripped.
-
-import (
-	"bytes"
-	"io"
-)
-
-// A Buffer is a variable-sized buffer of bytes with Read and Write methods.
-// The zero value for Buffer is an empty buffer ready to use.
-type Buffer struct {
-	buf       []byte   // contents are the bytes buf[off : len(buf)]
-	off       int      // read at &buf[off], write at &buf[len(buf)]
-	bootstrap [64]byte // memory to hold first slice; helps small buffers (Printf) avoid allocation.
-}
-
-// Bytes returns a slice of the contents of the unread portion of the buffer;
-// len(b.Bytes()) == b.Len().  If the caller changes the contents of the
-// returned slice, the contents of the buffer will change provided there
-// are no intervening method calls on the Buffer.
-func (b *Buffer) Bytes() []byte { return b.buf[b.off:] }
-
-// String returns the contents of the unread portion of the buffer
-// as a string.  If the Buffer is a nil pointer, it returns "<nil>".
-func (b *Buffer) String() string {
-	if b == nil {
-		// Special case, useful in debugging.
-		return "<nil>"
-	}
-	return string(b.buf[b.off:])
-}
-
-// Len returns the number of bytes of the unread portion of the buffer;
-// b.Len() == len(b.Bytes()).
-func (b *Buffer) Len() int { return len(b.buf) - b.off }
-
-// Truncate discards all but the first n unread bytes from the buffer.
-// It panics if n is negative or greater than the length of the buffer.
-func (b *Buffer) Truncate(n int) {
-	switch {
-	case n < 0 || n > b.Len():
-		panic("leveldb/util.Buffer: truncation out of range")
-	case n == 0:
-		// Reuse buffer space.
-		b.off = 0
-	}
-	b.buf = b.buf[0 : b.off+n]
-}
-
-// Reset resets the buffer so it has no content.
-// b.Reset() is the same as b.Truncate(0).
-func (b *Buffer) Reset() { b.Truncate(0) }
-
-// grow grows the buffer to guarantee space for n more bytes.
-// It returns the index where bytes should be written.
-// If the buffer can't grow it will panic with bytes.ErrTooLarge.
-func (b *Buffer) grow(n int) int {
-	m := b.Len()
-	// If buffer is empty, reset to recover space.
-	if m == 0 && b.off != 0 {
-		b.Truncate(0)
-	}
-	if len(b.buf)+n > cap(b.buf) {
-		var buf []byte
-		if b.buf == nil && n <= len(b.bootstrap) {
-			buf = b.bootstrap[0:]
-		} else if m+n <= cap(b.buf)/2 {
-			// We can slide things down instead of allocating a new
-			// slice. We only need m+n <= cap(b.buf) to slide, but
-			// we instead let capacity get twice as large so we
-			// don't spend all our time copying.
-			copy(b.buf[:], b.buf[b.off:])
-			buf = b.buf[:m]
-		} else {
-			// not enough space anywhere
-			buf = makeSlice(2*cap(b.buf) + n)
-			copy(buf, b.buf[b.off:])
-		}
-		b.buf = buf
-		b.off = 0
-	}
-	b.buf = b.buf[0 : b.off+m+n]
-	return b.off + m
-}
-
-// Alloc allocs n bytes of slice from the buffer, growing the buffer as
-// needed. If n is negative, Alloc will panic.
-// If the buffer can't grow it will panic with bytes.ErrTooLarge.
-func (b *Buffer) Alloc(n int) []byte {
-	if n < 0 {
-		panic("leveldb/util.Buffer.Alloc: negative count")
-	}
-	m := b.grow(n)
-	return b.buf[m:]
-}
-
-// Grow grows the buffer's capacity, if necessary, to guarantee space for
-// another n bytes. After Grow(n), at least n bytes can be written to the
-// buffer without another allocation.
-// If n is negative, Grow will panic.
-// If the buffer can't grow it will panic with bytes.ErrTooLarge.
-func (b *Buffer) Grow(n int) {
-	if n < 0 {
-		panic("leveldb/util.Buffer.Grow: negative count")
-	}
-	m := b.grow(n)
-	b.buf = b.buf[0:m]
-}
-
-// Write appends the contents of p to the buffer, growing the buffer as
-// needed. The return value n is the length of p; err is always nil. If the
-// buffer becomes too large, Write will panic with bytes.ErrTooLarge.
-func (b *Buffer) Write(p []byte) (n int, err error) {
-	m := b.grow(len(p))
-	return copy(b.buf[m:], p), nil
-}
-
-// MinRead is the minimum slice size passed to a Read call by
-// Buffer.ReadFrom.  As long as the Buffer has at least MinRead bytes beyond
-// what is required to hold the contents of r, ReadFrom will not grow the
-// underlying buffer.
-const MinRead = 512
-
-// ReadFrom reads data from r until EOF and appends it to the buffer, growing
-// the buffer as needed. The return value n is the number of bytes read. Any
-// error except io.EOF encountered during the read is also returned. If the
-// buffer becomes too large, ReadFrom will panic with bytes.ErrTooLarge.
-func (b *Buffer) ReadFrom(r io.Reader) (n int64, err error) {
-	// If buffer is empty, reset to recover space.
-	if b.off >= len(b.buf) {
-		b.Truncate(0)
-	}
-	for {
-		if free := cap(b.buf) - len(b.buf); free < MinRead {
-			// not enough space at end
-			newBuf := b.buf
-			if b.off+free < MinRead {
-				// not enough space using beginning of buffer;
-				// double buffer capacity
-				newBuf = makeSlice(2*cap(b.buf) + MinRead)
-			}
-			copy(newBuf, b.buf[b.off:])
-			b.buf = newBuf[:len(b.buf)-b.off]
-			b.off = 0
-		}
-		m, e := r.Read(b.buf[len(b.buf):cap(b.buf)])
-		b.buf = b.buf[0 : len(b.buf)+m]
-		n += int64(m)
-		if e == io.EOF {
-			break
-		}
-		if e != nil {
-			return n, e
-		}
-	}
-	return n, nil // err is EOF, so return nil explicitly
-}
-
-// makeSlice allocates a slice of size n. If the allocation fails, it panics
-// with bytes.ErrTooLarge.
-func makeSlice(n int) []byte {
-	// If the make fails, give a known error.
-	defer func() {
-		if recover() != nil {
-			panic(bytes.ErrTooLarge)
-		}
-	}()
-	return make([]byte, n)
-}
-
-// WriteTo writes data to w until the buffer is drained or an error occurs.
-// The return value n is the number of bytes written; it always fits into an
-// int, but it is int64 to match the io.WriterTo interface. Any error
-// encountered during the write is also returned.
-func (b *Buffer) WriteTo(w io.Writer) (n int64, err error) {
-	if b.off < len(b.buf) {
-		nBytes := b.Len()
-		m, e := w.Write(b.buf[b.off:])
-		if m > nBytes {
-			panic("leveldb/util.Buffer.WriteTo: invalid Write count")
-		}
-		b.off += m
-		n = int64(m)
-		if e != nil {
-			return n, e
-		}
-		// all bytes should have been written, by definition of
-		// Write method in io.Writer
-		if m != nBytes {
-			return n, io.ErrShortWrite
-		}
-	}
-	// Buffer is now empty; reset.
-	b.Truncate(0)
-	return
-}
-
-// WriteByte appends the byte c to the buffer, growing the buffer as needed.
-// The returned error is always nil, but is included to match bufio.Writer's
-// WriteByte. If the buffer becomes too large, WriteByte will panic with
-// bytes.ErrTooLarge.
-func (b *Buffer) WriteByte(c byte) error {
-	m := b.grow(1)
-	b.buf[m] = c
-	return nil
-}
-
-// Read reads the next len(p) bytes from the buffer or until the buffer
-// is drained.  The return value n is the number of bytes read.  If the
-// buffer has no data to return, err is io.EOF (unless len(p) is zero);
-// otherwise it is nil.
-func (b *Buffer) Read(p []byte) (n int, err error) {
-	if b.off >= len(b.buf) {
-		// Buffer is empty, reset to recover space.
-		b.Truncate(0)
-		if len(p) == 0 {
-			return
-		}
-		return 0, io.EOF
-	}
-	n = copy(p, b.buf[b.off:])
-	b.off += n
-	return
-}
-
-// Next returns a slice containing the next n bytes from the buffer,
-// advancing the buffer as if the bytes had been returned by Read.
-// If there are fewer than n bytes in the buffer, Next returns the entire buffer.
-// The slice is only valid until the next call to a read or write method.
-func (b *Buffer) Next(n int) []byte {
-	m := b.Len()
-	if n > m {
-		n = m
-	}
-	data := b.buf[b.off : b.off+n]
-	b.off += n
-	return data
-}
-
-// ReadByte reads and returns the next byte from the buffer.
-// If no byte is available, it returns error io.EOF.
-func (b *Buffer) ReadByte() (c byte, err error) {
-	if b.off >= len(b.buf) {
-		// Buffer is empty, reset to recover space.
-		b.Truncate(0)
-		return 0, io.EOF
-	}
-	c = b.buf[b.off]
-	b.off++
-	return c, nil
-}
-
-// ReadBytes reads until the first occurrence of delim in the input,
-// returning a slice containing the data up to and including the delimiter.
-// If ReadBytes encounters an error before finding a delimiter,
-// it returns the data read before the error and the error itself (often io.EOF).
-// ReadBytes returns err != nil if and only if the returned data does not end in
-// delim.
-func (b *Buffer) ReadBytes(delim byte) (line []byte, err error) {
-	slice, err := b.readSlice(delim)
-	// return a copy of slice. The buffer's backing array may
-	// be overwritten by later calls.
-	line = append(line, slice...)
-	return
-}
-
-// readSlice is like ReadBytes but returns a reference to internal buffer data.
-func (b *Buffer) readSlice(delim byte) (line []byte, err error) {
-	i := bytes.IndexByte(b.buf[b.off:], delim)
-	end := b.off + i + 1
-	if i < 0 {
-		end = len(b.buf)
-		err = io.EOF
-	}
-	line = b.buf[b.off:end]
-	b.off = end
-	return line, err
-}
-
-// NewBuffer creates and initializes a new Buffer using buf as its initial
-// contents.  It is intended to prepare a Buffer to read existing data.  It
-// can also be used to size the internal buffer for writing. To do that,
-// buf should have the desired capacity but a length of zero.
-//
-// In most cases, new(Buffer) (or just declaring a Buffer variable) is
-// sufficient to initialize a Buffer.
-func NewBuffer(buf []byte) *Buffer { return &Buffer{buf: buf} }
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go
deleted file mode 100644
index 2b8453d75..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_pool.go
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package util
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-)
-
-type buffer struct {
-	b    []byte
-	miss int
-}
-
-// BufferPool is a 'buffer pool'.
-type BufferPool struct {
-	pool      [6]chan []byte
-	size      [5]uint32
-	sizeMiss  [5]uint32
-	sizeHalf  [5]uint32
-	baseline  [4]int
-	baseline0 int
-
-	mu     sync.RWMutex
-	closed bool
-	closeC chan struct{}
-
-	get     uint32
-	put     uint32
-	half    uint32
-	less    uint32
-	equal   uint32
-	greater uint32
-	miss    uint32
-}
-
-func (p *BufferPool) poolNum(n int) int {
-	if n <= p.baseline0 && n > p.baseline0/2 {
-		return 0
-	}
-	for i, x := range p.baseline {
-		if n <= x {
-			return i + 1
-		}
-	}
-	return len(p.baseline) + 1
-}
-
-// Get returns buffer with length of n.
-func (p *BufferPool) Get(n int) []byte {
-	if p == nil {
-		return make([]byte, n)
-	}
-
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	if p.closed {
-		return make([]byte, n)
-	}
-
-	atomic.AddUint32(&p.get, 1)
-
-	poolNum := p.poolNum(n)
-	pool := p.pool[poolNum]
-	if poolNum == 0 {
-		// Fast path.
-		select {
-		case b := <-pool:
-			switch {
-			case cap(b) > n:
-				if cap(b)-n >= n {
-					atomic.AddUint32(&p.half, 1)
-					select {
-					case pool <- b:
-					default:
-					}
-					return make([]byte, n)
-				} else {
-					atomic.AddUint32(&p.less, 1)
-					return b[:n]
-				}
-			case cap(b) == n:
-				atomic.AddUint32(&p.equal, 1)
-				return b[:n]
-			default:
-				atomic.AddUint32(&p.greater, 1)
-			}
-		default:
-			atomic.AddUint32(&p.miss, 1)
-		}
-
-		return make([]byte, n, p.baseline0)
-	} else {
-		sizePtr := &p.size[poolNum-1]
-
-		select {
-		case b := <-pool:
-			switch {
-			case cap(b) > n:
-				if cap(b)-n >= n {
-					atomic.AddUint32(&p.half, 1)
-					sizeHalfPtr := &p.sizeHalf[poolNum-1]
-					if atomic.AddUint32(sizeHalfPtr, 1) == 20 {
-						atomic.StoreUint32(sizePtr, uint32(cap(b)/2))
-						atomic.StoreUint32(sizeHalfPtr, 0)
-					} else {
-						select {
-						case pool <- b:
-						default:
-						}
-					}
-					return make([]byte, n)
-				} else {
-					atomic.AddUint32(&p.less, 1)
-					return b[:n]
-				}
-			case cap(b) == n:
-				atomic.AddUint32(&p.equal, 1)
-				return b[:n]
-			default:
-				atomic.AddUint32(&p.greater, 1)
-				if uint32(cap(b)) >= atomic.LoadUint32(sizePtr) {
-					select {
-					case pool <- b:
-					default:
-					}
-				}
-			}
-		default:
-			atomic.AddUint32(&p.miss, 1)
-		}
-
-		if size := atomic.LoadUint32(sizePtr); uint32(n) > size {
-			if size == 0 {
-				atomic.CompareAndSwapUint32(sizePtr, 0, uint32(n))
-			} else {
-				sizeMissPtr := &p.sizeMiss[poolNum-1]
-				if atomic.AddUint32(sizeMissPtr, 1) == 20 {
-					atomic.StoreUint32(sizePtr, uint32(n))
-					atomic.StoreUint32(sizeMissPtr, 0)
-				}
-			}
-			return make([]byte, n)
-		} else {
-			return make([]byte, n, size)
-		}
-	}
-}
-
-// Put adds given buffer to the pool.
-func (p *BufferPool) Put(b []byte) {
-	if p == nil {
-		return
-	}
-
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	if p.closed {
-		return
-	}
-
-	atomic.AddUint32(&p.put, 1)
-
-	pool := p.pool[p.poolNum(cap(b))]
-	select {
-	case pool <- b:
-	default:
-	}
-
-}
-
-func (p *BufferPool) Close() {
-	if p == nil {
-		return
-	}
-
-	p.mu.Lock()
-	if !p.closed {
-		p.closed = true
-		p.closeC <- struct{}{}
-	}
-	p.mu.Unlock()
-}
-
-func (p *BufferPool) String() string {
-	if p == nil {
-		return "<nil>"
-	}
-
-	return fmt.Sprintf("BufferPool{B·%d Z·%v Zm·%v Zh·%v G·%d P·%d H·%d <·%d =·%d >·%d M·%d}",
-		p.baseline0, p.size, p.sizeMiss, p.sizeHalf, p.get, p.put, p.half, p.less, p.equal, p.greater, p.miss)
-}
-
-func (p *BufferPool) drain() {
-	ticker := time.NewTicker(2 * time.Second)
-	for {
-		select {
-		case <-ticker.C:
-			for _, ch := range p.pool {
-				select {
-				case <-ch:
-				default:
-				}
-			}
-		case <-p.closeC:
-			close(p.closeC)
-			for _, ch := range p.pool {
-				close(ch)
-			}
-			return
-		}
-	}
-}
-
-// NewBufferPool creates a new initialized 'buffer pool'.
-func NewBufferPool(baseline int) *BufferPool {
-	if baseline <= 0 {
-		panic("baseline can't be <= 0")
-	}
-	p := &BufferPool{
-		baseline0: baseline,
-		baseline:  [...]int{baseline / 4, baseline / 2, baseline * 2, baseline * 4},
-		closeC:    make(chan struct{}, 1),
-	}
-	for i, cap := range []int{2, 2, 4, 4, 2, 1} {
-		p.pool[i] = make(chan []byte, cap)
-	}
-	go p.drain()
-	return p
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_test.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_test.go
deleted file mode 100644
index 87d96739c..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/buffer_test.go
+++ /dev/null
@@ -1,369 +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 util
-
-import (
-	"bytes"
-	"io"
-	"math/rand"
-	"runtime"
-	"testing"
-)
-
-const N = 10000      // make this bigger for a larger (and slower) test
-var data string      // test data for write tests
-var testBytes []byte // test data; same as data but as a slice.
-
-func init() {
-	testBytes = make([]byte, N)
-	for i := 0; i < N; i++ {
-		testBytes[i] = 'a' + byte(i%26)
-	}
-	data = string(testBytes)
-}
-
-// Verify that contents of buf match the string s.
-func check(t *testing.T, testname string, buf *Buffer, s string) {
-	bytes := buf.Bytes()
-	str := buf.String()
-	if buf.Len() != len(bytes) {
-		t.Errorf("%s: buf.Len() == %d, len(buf.Bytes()) == %d", testname, buf.Len(), len(bytes))
-	}
-
-	if buf.Len() != len(str) {
-		t.Errorf("%s: buf.Len() == %d, len(buf.String()) == %d", testname, buf.Len(), len(str))
-	}
-
-	if buf.Len() != len(s) {
-		t.Errorf("%s: buf.Len() == %d, len(s) == %d", testname, buf.Len(), len(s))
-	}
-
-	if string(bytes) != s {
-		t.Errorf("%s: string(buf.Bytes()) == %q, s == %q", testname, string(bytes), s)
-	}
-}
-
-// Fill buf through n writes of byte slice fub.
-// The initial contents of buf corresponds to the string s;
-// the result is the final contents of buf returned as a string.
-func fillBytes(t *testing.T, testname string, buf *Buffer, s string, n int, fub []byte) string {
-	check(t, testname+" (fill 1)", buf, s)
-	for ; n > 0; n-- {
-		m, err := buf.Write(fub)
-		if m != len(fub) {
-			t.Errorf(testname+" (fill 2): m == %d, expected %d", m, len(fub))
-		}
-		if err != nil {
-			t.Errorf(testname+" (fill 3): err should always be nil, found err == %s", err)
-		}
-		s += string(fub)
-		check(t, testname+" (fill 4)", buf, s)
-	}
-	return s
-}
-
-func TestNewBuffer(t *testing.T) {
-	buf := NewBuffer(testBytes)
-	check(t, "NewBuffer", buf, data)
-}
-
-// Empty buf through repeated reads into fub.
-// The initial contents of buf corresponds to the string s.
-func empty(t *testing.T, testname string, buf *Buffer, s string, fub []byte) {
-	check(t, testname+" (empty 1)", buf, s)
-
-	for {
-		n, err := buf.Read(fub)
-		if n == 0 {
-			break
-		}
-		if err != nil {
-			t.Errorf(testname+" (empty 2): err should always be nil, found err == %s", err)
-		}
-		s = s[n:]
-		check(t, testname+" (empty 3)", buf, s)
-	}
-
-	check(t, testname+" (empty 4)", buf, "")
-}
-
-func TestBasicOperations(t *testing.T) {
-	var buf Buffer
-
-	for i := 0; i < 5; i++ {
-		check(t, "TestBasicOperations (1)", &buf, "")
-
-		buf.Reset()
-		check(t, "TestBasicOperations (2)", &buf, "")
-
-		buf.Truncate(0)
-		check(t, "TestBasicOperations (3)", &buf, "")
-
-		n, err := buf.Write([]byte(data[0:1]))
-		if n != 1 {
-			t.Errorf("wrote 1 byte, but n == %d", n)
-		}
-		if err != nil {
-			t.Errorf("err should always be nil, but err == %s", err)
-		}
-		check(t, "TestBasicOperations (4)", &buf, "a")
-
-		buf.WriteByte(data[1])
-		check(t, "TestBasicOperations (5)", &buf, "ab")
-
-		n, err = buf.Write([]byte(data[2:26]))
-		if n != 24 {
-			t.Errorf("wrote 25 bytes, but n == %d", n)
-		}
-		check(t, "TestBasicOperations (6)", &buf, string(data[0:26]))
-
-		buf.Truncate(26)
-		check(t, "TestBasicOperations (7)", &buf, string(data[0:26]))
-
-		buf.Truncate(20)
-		check(t, "TestBasicOperations (8)", &buf, string(data[0:20]))
-
-		empty(t, "TestBasicOperations (9)", &buf, string(data[0:20]), make([]byte, 5))
-		empty(t, "TestBasicOperations (10)", &buf, "", make([]byte, 100))
-
-		buf.WriteByte(data[1])
-		c, err := buf.ReadByte()
-		if err != nil {
-			t.Error("ReadByte unexpected eof")
-		}
-		if c != data[1] {
-			t.Errorf("ReadByte wrong value c=%v", c)
-		}
-		c, err = buf.ReadByte()
-		if err == nil {
-			t.Error("ReadByte unexpected not eof")
-		}
-	}
-}
-
-func TestLargeByteWrites(t *testing.T) {
-	var buf Buffer
-	limit := 30
-	if testing.Short() {
-		limit = 9
-	}
-	for i := 3; i < limit; i += 3 {
-		s := fillBytes(t, "TestLargeWrites (1)", &buf, "", 5, testBytes)
-		empty(t, "TestLargeByteWrites (2)", &buf, s, make([]byte, len(data)/i))
-	}
-	check(t, "TestLargeByteWrites (3)", &buf, "")
-}
-
-func TestLargeByteReads(t *testing.T) {
-	var buf Buffer
-	for i := 3; i < 30; i += 3 {
-		s := fillBytes(t, "TestLargeReads (1)", &buf, "", 5, testBytes[0:len(testBytes)/i])
-		empty(t, "TestLargeReads (2)", &buf, s, make([]byte, len(data)))
-	}
-	check(t, "TestLargeByteReads (3)", &buf, "")
-}
-
-func TestMixedReadsAndWrites(t *testing.T) {
-	var buf Buffer
-	s := ""
-	for i := 0; i < 50; i++ {
-		wlen := rand.Intn(len(data))
-		s = fillBytes(t, "TestMixedReadsAndWrites (1)", &buf, s, 1, testBytes[0:wlen])
-		rlen := rand.Intn(len(data))
-		fub := make([]byte, rlen)
-		n, _ := buf.Read(fub)
-		s = s[n:]
-	}
-	empty(t, "TestMixedReadsAndWrites (2)", &buf, s, make([]byte, buf.Len()))
-}
-
-func TestNil(t *testing.T) {
-	var b *Buffer
-	if b.String() != "<nil>" {
-		t.Errorf("expected <nil>; got %q", b.String())
-	}
-}
-
-func TestReadFrom(t *testing.T) {
-	var buf Buffer
-	for i := 3; i < 30; i += 3 {
-		s := fillBytes(t, "TestReadFrom (1)", &buf, "", 5, testBytes[0:len(testBytes)/i])
-		var b Buffer
-		b.ReadFrom(&buf)
-		empty(t, "TestReadFrom (2)", &b, s, make([]byte, len(data)))
-	}
-}
-
-func TestWriteTo(t *testing.T) {
-	var buf Buffer
-	for i := 3; i < 30; i += 3 {
-		s := fillBytes(t, "TestWriteTo (1)", &buf, "", 5, testBytes[0:len(testBytes)/i])
-		var b Buffer
-		buf.WriteTo(&b)
-		empty(t, "TestWriteTo (2)", &b, s, make([]byte, len(data)))
-	}
-}
-
-func TestNext(t *testing.T) {
-	b := []byte{0, 1, 2, 3, 4}
-	tmp := make([]byte, 5)
-	for i := 0; i <= 5; i++ {
-		for j := i; j <= 5; j++ {
-			for k := 0; k <= 6; k++ {
-				// 0 <= i <= j <= 5; 0 <= k <= 6
-				// Check that if we start with a buffer
-				// of length j at offset i and ask for
-				// Next(k), we get the right bytes.
-				buf := NewBuffer(b[0:j])
-				n, _ := buf.Read(tmp[0:i])
-				if n != i {
-					t.Fatalf("Read %d returned %d", i, n)
-				}
-				bb := buf.Next(k)
-				want := k
-				if want > j-i {
-					want = j - i
-				}
-				if len(bb) != want {
-					t.Fatalf("in %d,%d: len(Next(%d)) == %d", i, j, k, len(bb))
-				}
-				for l, v := range bb {
-					if v != byte(l+i) {
-						t.Fatalf("in %d,%d: Next(%d)[%d] = %d, want %d", i, j, k, l, v, l+i)
-					}
-				}
-			}
-		}
-	}
-}
-
-var readBytesTests = []struct {
-	buffer   string
-	delim    byte
-	expected []string
-	err      error
-}{
-	{"", 0, []string{""}, io.EOF},
-	{"a\x00", 0, []string{"a\x00"}, nil},
-	{"abbbaaaba", 'b', []string{"ab", "b", "b", "aaab"}, nil},
-	{"hello\x01world", 1, []string{"hello\x01"}, nil},
-	{"foo\nbar", 0, []string{"foo\nbar"}, io.EOF},
-	{"alpha\nbeta\ngamma\n", '\n', []string{"alpha\n", "beta\n", "gamma\n"}, nil},
-	{"alpha\nbeta\ngamma", '\n', []string{"alpha\n", "beta\n", "gamma"}, io.EOF},
-}
-
-func TestReadBytes(t *testing.T) {
-	for _, test := range readBytesTests {
-		buf := NewBuffer([]byte(test.buffer))
-		var err error
-		for _, expected := range test.expected {
-			var bytes []byte
-			bytes, err = buf.ReadBytes(test.delim)
-			if string(bytes) != expected {
-				t.Errorf("expected %q, got %q", expected, bytes)
-			}
-			if err != nil {
-				break
-			}
-		}
-		if err != test.err {
-			t.Errorf("expected error %v, got %v", test.err, err)
-		}
-	}
-}
-
-func TestGrow(t *testing.T) {
-	x := []byte{'x'}
-	y := []byte{'y'}
-	tmp := make([]byte, 72)
-	for _, startLen := range []int{0, 100, 1000, 10000, 100000} {
-		xBytes := bytes.Repeat(x, startLen)
-		for _, growLen := range []int{0, 100, 1000, 10000, 100000} {
-			buf := NewBuffer(xBytes)
-			// If we read, this affects buf.off, which is good to test.
-			readBytes, _ := buf.Read(tmp)
-			buf.Grow(growLen)
-			yBytes := bytes.Repeat(y, growLen)
-			// Check no allocation occurs in write, as long as we're single-threaded.
-			var m1, m2 runtime.MemStats
-			runtime.ReadMemStats(&m1)
-			buf.Write(yBytes)
-			runtime.ReadMemStats(&m2)
-			if runtime.GOMAXPROCS(-1) == 1 && m1.Mallocs != m2.Mallocs {
-				t.Errorf("allocation occurred during write")
-			}
-			// Check that buffer has correct data.
-			if !bytes.Equal(buf.Bytes()[0:startLen-readBytes], xBytes[readBytes:]) {
-				t.Errorf("bad initial data at %d %d", startLen, growLen)
-			}
-			if !bytes.Equal(buf.Bytes()[startLen-readBytes:startLen-readBytes+growLen], yBytes) {
-				t.Errorf("bad written data at %d %d", startLen, growLen)
-			}
-		}
-	}
-}
-
-// Was a bug: used to give EOF reading empty slice at EOF.
-func TestReadEmptyAtEOF(t *testing.T) {
-	b := new(Buffer)
-	slice := make([]byte, 0)
-	n, err := b.Read(slice)
-	if err != nil {
-		t.Errorf("read error: %v", err)
-	}
-	if n != 0 {
-		t.Errorf("wrong count; got %d want 0", n)
-	}
-}
-
-// Tests that we occasionally compact. Issue 5154.
-func TestBufferGrowth(t *testing.T) {
-	var b Buffer
-	buf := make([]byte, 1024)
-	b.Write(buf[0:1])
-	var cap0 int
-	for i := 0; i < 5<<10; i++ {
-		b.Write(buf)
-		b.Read(buf)
-		if i == 0 {
-			cap0 = cap(b.buf)
-		}
-	}
-	cap1 := cap(b.buf)
-	// (*Buffer).grow allows for 2x capacity slop before sliding,
-	// so set our error threshold at 3x.
-	if cap1 > cap0*3 {
-		t.Errorf("buffer cap = %d; too big (grew from %d)", cap1, cap0)
-	}
-}
-
-// From Issue 5154.
-func BenchmarkBufferNotEmptyWriteRead(b *testing.B) {
-	buf := make([]byte, 1024)
-	for i := 0; i < b.N; i++ {
-		var b Buffer
-		b.Write(buf[0:1])
-		for i := 0; i < 5<<10; i++ {
-			b.Write(buf)
-			b.Read(buf)
-		}
-	}
-}
-
-// Check that we don't compact too often. From Issue 5154.
-func BenchmarkBufferFullSmallReads(b *testing.B) {
-	buf := make([]byte, 1024)
-	for i := 0; i < b.N; i++ {
-		var b Buffer
-		b.Write(buf)
-		for b.Len()+20 < cap(b.buf) {
-			b.Write(buf[:10])
-		}
-		for i := 0; i < 5<<10; i++ {
-			b.Read(buf[:1])
-			b.Write(buf[:1])
-		}
-	}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/crc32.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/crc32.go
deleted file mode 100644
index 631c9d610..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/crc32.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2011 The LevelDB-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 util
-
-import (
-	"hash/crc32"
-)
-
-var table = crc32.MakeTable(crc32.Castagnoli)
-
-// CRC is a CRC-32 checksum computed using Castagnoli's polynomial.
-type CRC uint32
-
-// NewCRC creates a new crc based on the given bytes.
-func NewCRC(b []byte) CRC {
-	return CRC(0).Update(b)
-}
-
-// Update updates the crc with the given bytes.
-func (c CRC) Update(b []byte) CRC {
-	return CRC(crc32.Update(uint32(c), table, b))
-}
-
-// Value returns a masked crc.
-func (c CRC) Value() uint32 {
-	return uint32(c>>15|c<<17) + 0xa282ead8
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/hash.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/hash.go
deleted file mode 100644
index 54903660f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/hash.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package util
-
-import (
-	"bytes"
-	"encoding/binary"
-)
-
-// Hash return hash of the given data.
-func Hash(data []byte, seed uint32) uint32 {
-	// Similar to murmur hash
-	var m uint32 = 0xc6a4a793
-	var r uint32 = 24
-	h := seed ^ (uint32(len(data)) * m)
-
-	buf := bytes.NewBuffer(data)
-	for buf.Len() >= 4 {
-		var w uint32
-		binary.Read(buf, binary.LittleEndian, &w)
-		h += w
-		h *= m
-		h ^= (h >> 16)
-	}
-
-	rest := buf.Bytes()
-	switch len(rest) {
-	default:
-		panic("not reached")
-	case 3:
-		h += uint32(rest[2]) << 16
-		fallthrough
-	case 2:
-		h += uint32(rest[1]) << 8
-		fallthrough
-	case 1:
-		h += uint32(rest[0])
-		h *= m
-		h ^= (h >> r)
-	case 0:
-	}
-
-	return h
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/pool.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/pool.go
deleted file mode 100644
index 1f7fdd41f..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/pool.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build go1.3
-
-package util
-
-import (
-	"sync"
-)
-
-type Pool struct {
-	sync.Pool
-}
-
-func NewPool(cap int) *Pool {
-	return &Pool{}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
deleted file mode 100644
index 27b8d03be..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/pool_legacy.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// +build !go1.3
-
-package util
-
-type Pool struct {
-	pool chan interface{}
-}
-
-func (p *Pool) Get() interface{} {
-	select {
-	case x := <-p.pool:
-		return x
-	default:
-		return nil
-	}
-}
-
-func (p *Pool) Put(x interface{}) {
-	select {
-	case p.pool <- x:
-	default:
-	}
-}
-
-func NewPool(cap int) *Pool {
-	return &Pool{pool: make(chan interface{}, cap)}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/range.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/range.go
deleted file mode 100644
index 85159583d..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/range.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2014, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package util
-
-// Range is a key range.
-type Range struct {
-	// Start of the key range, include in the range.
-	Start []byte
-
-	// Limit of the key range, not include in the range.
-	Limit []byte
-}
-
-// BytesPrefix returns key range that satisfy the given prefix.
-// This only applicable for the standard 'bytes comparer'.
-func BytesPrefix(prefix []byte) *Range {
-	var limit []byte
-	for i := len(prefix) - 1; i >= 0; i-- {
-		c := prefix[i]
-		if c < 0xff {
-			limit = make([]byte, i+1)
-			copy(limit, prefix)
-			limit[i] = c + 1
-			break
-		}
-	}
-	return &Range{prefix, limit}
-}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/util/util.go b/vendor/github.com/syndtr/goleveldb/leveldb/util/util.go
deleted file mode 100644
index f35976865..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/util/util.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) 2013, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Package util provides utilities used throughout leveldb.
-package util
-
-import (
-	"errors"
-)
-
-var (
-	ErrReleased    = errors.New("leveldb: resource already relesed")
-	ErrHasReleaser = errors.New("leveldb: releaser already defined")
-)
-
-// Releaser is the interface that wraps the basic Release method.
-type Releaser interface {
-	// Release releases associated resources. Release should always success
-	// and can be called multipe times without causing error.
-	Release()
-}
-
-// ReleaseSetter is the interface that wraps the basic SetReleaser method.
-type ReleaseSetter interface {
-	// SetReleaser associates the given releaser to the resources. The
-	// releaser will be called once coresponding resources released.
-	// Calling SetReleaser with nil will clear the releaser.
-	//
-	// This will panic if a releaser already present or coresponding
-	// resource is already released. Releaser should be cleared first
-	// before assigned a new one.
-	SetReleaser(releaser Releaser)
-}
-
-// BasicReleaser provides basic implementation of Releaser and ReleaseSetter.
-type BasicReleaser struct {
-	releaser Releaser
-	released bool
-}
-
-// Released returns whether Release method already called.
-func (r *BasicReleaser) Released() bool {
-	return r.released
-}
-
-// Release implements Releaser.Release.
-func (r *BasicReleaser) Release() {
-	if !r.released {
-		if r.releaser != nil {
-			r.releaser.Release()
-			r.releaser = nil
-		}
-		r.released = true
-	}
-}
-
-// SetReleaser implements ReleaseSetter.SetReleaser.
-func (r *BasicReleaser) SetReleaser(releaser Releaser) {
-	if r.released {
-		panic(ErrReleased)
-	}
-	if r.releaser != nil && releaser != nil {
-		panic(ErrHasReleaser)
-	}
-	r.releaser = releaser
-}
-
-type NoopReleaser struct{}
-
-func (NoopReleaser) Release() {}
diff --git a/vendor/github.com/syndtr/goleveldb/leveldb/version.go b/vendor/github.com/syndtr/goleveldb/leveldb/version.go
deleted file mode 100644
index 011d982da..000000000
--- a/vendor/github.com/syndtr/goleveldb/leveldb/version.go
+++ /dev/null
@@ -1,457 +0,0 @@
-// Copyright (c) 2012, Suryandaru Triandana <syndtr@gmail.com>
-// All rights reserved.
-//
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-package leveldb
-
-import (
-	"sync/atomic"
-	"unsafe"
-
-	"github.com/syndtr/goleveldb/leveldb/iterator"
-	"github.com/syndtr/goleveldb/leveldb/opt"
-	"github.com/syndtr/goleveldb/leveldb/util"
-)
-
-type tSet struct {
-	level int
-	table *tFile
-}
-
-type version struct {
-	s *session
-
-	tables []tFiles
-
-	// Level that should be compacted next and its compaction score.
-	// Score < 1 means compaction is not strictly needed. These fields
-	// are initialized by computeCompaction()
-	cLevel int
-	cScore float64
-
-	cSeek unsafe.Pointer
-
-	ref int
-	// Succeeding version.
-	next *version
-}
-
-func newVersion(s *session) *version {
-	return &version{s: s, tables: make([]tFiles, s.o.GetNumLevel())}
-}
-
-func (v *version) releaseNB() {
-	v.ref--
-	if v.ref > 0 {
-		return
-	}
-	if v.ref < 0 {
-		panic("negative version ref")
-	}
-
-	tables := make(map[uint64]bool)
-	for _, tt := range v.next.tables {
-		for _, t := range tt {
-			num := t.file.Num()
-			tables[num] = true
-		}
-	}
-
-	for _, tt := range v.tables {
-		for _, t := range tt {
-			num := t.file.Num()
-			if _, ok := tables[num]; !ok {
-				v.s.tops.remove(t)
-			}
-		}
-	}
-
-	v.next.releaseNB()
-	v.next = nil
-}
-
-func (v *version) release() {
-	v.s.vmu.Lock()
-	v.releaseNB()
-	v.s.vmu.Unlock()
-}
-
-func (v *version) walkOverlapping(ikey iKey, f func(level int, t *tFile) bool, lf func(level int) bool) {
-	ukey := ikey.ukey()
-
-	// Walk tables level-by-level.
-	for level, tables := range v.tables {
-		if len(tables) == 0 {
-			continue
-		}
-
-		if level == 0 {
-			// Level-0 files may overlap each other. Find all files that
-			// overlap ukey.
-			for _, t := range tables {
-				if t.overlaps(v.s.icmp, ukey, ukey) {
-					if !f(level, t) {
-						return
-					}
-				}
-			}
-		} else {
-			if i := tables.searchMax(v.s.icmp, ikey); i < len(tables) {
-				t := tables[i]
-				if v.s.icmp.uCompare(ukey, t.imin.ukey()) >= 0 {
-					if !f(level, t) {
-						return
-					}
-				}
-			}
-		}
-
-		if lf != nil && !lf(level) {
-			return
-		}
-	}
-}
-
-func (v *version) get(ikey iKey, ro *opt.ReadOptions, noValue bool) (value []byte, tcomp bool, err error) {
-	ukey := ikey.ukey()
-
-	var (
-		tset  *tSet
-		tseek bool
-
-		// Level-0.
-		zfound bool
-		zseq   uint64
-		zkt    kType
-		zval   []byte
-	)
-
-	err = ErrNotFound
-
-	// Since entries never hope across level, finding key/value
-	// in smaller level make later levels irrelevant.
-	v.walkOverlapping(ikey, func(level int, t *tFile) bool {
-		if !tseek {
-			if tset == nil {
-				tset = &tSet{level, t}
-			} else {
-				tseek = true
-			}
-		}
-
-		var (
-			fikey, fval []byte
-			ferr        error
-		)
-		if noValue {
-			fikey, ferr = v.s.tops.findKey(t, ikey, ro)
-		} else {
-			fikey, fval, ferr = v.s.tops.find(t, ikey, ro)
-		}
-		switch ferr {
-		case nil:
-		case ErrNotFound:
-			return true
-		default:
-			err = ferr
-			return false
-		}
-
-		if fukey, fseq, fkt, fkerr := parseIkey(fikey); fkerr == nil {
-			if v.s.icmp.uCompare(ukey, fukey) == 0 {
-				if level == 0 {
-					if fseq >= zseq {
-						zfound = true
-						zseq = fseq
-						zkt = fkt
-						zval = fval
-					}
-				} else {
-					switch fkt {
-					case ktVal:
-						value = fval
-						err = nil
-					case ktDel:
-					default:
-						panic("leveldb: invalid iKey type")
-					}
-					return false
-				}
-			}
-		} else {
-			err = fkerr
-			return false
-		}
-
-		return true
-	}, func(level int) bool {
-		if zfound {
-			switch zkt {
-			case ktVal:
-				value = zval
-				err = nil
-			case ktDel:
-			default:
-				panic("leveldb: invalid iKey type")
-			}
-			return false
-		}
-
-		return true
-	})
-
-	if tseek && tset.table.consumeSeek() <= 0 {
-		tcomp = atomic.CompareAndSwapPointer(&v.cSeek, nil, unsafe.Pointer(tset))
-	}
-
-	return
-}
-
-func (v *version) sampleSeek(ikey iKey) (tcomp bool) {
-	var tset *tSet
-
-	v.walkOverlapping(ikey, func(level int, t *tFile) bool {
-		if tset == nil {
-			tset = &tSet{level, t}
-			return true
-		} else {
-			if tset.table.consumeSeek() <= 0 {
-				tcomp = atomic.CompareAndSwapPointer(&v.cSeek, nil, unsafe.Pointer(tset))
-			}
-			return false
-		}
-	}, nil)
-
-	return
-}
-
-func (v *version) getIterators(slice *util.Range, ro *opt.ReadOptions) (its []iterator.Iterator) {
-	// Merge all level zero files together since they may overlap
-	for _, t := range v.tables[0] {
-		it := v.s.tops.newIterator(t, slice, ro)
-		its = append(its, it)
-	}
-
-	strict := opt.GetStrict(v.s.o.Options, ro, opt.StrictReader)
-	for _, tables := range v.tables[1:] {
-		if len(tables) == 0 {
-			continue
-		}
-
-		it := iterator.NewIndexedIterator(tables.newIndexIterator(v.s.tops, v.s.icmp, slice, ro), strict)
-		its = append(its, it)
-	}
-
-	return
-}
-
-func (v *version) newStaging() *versionStaging {
-	return &versionStaging{base: v, tables: make([]tablesScratch, v.s.o.GetNumLevel())}
-}
-
-// Spawn a new version based on this version.
-func (v *version) spawn(r *sessionRecord) *version {
-	staging := v.newStaging()
-	staging.commit(r)
-	return staging.finish()
-}
-
-func (v *version) fillRecord(r *sessionRecord) {
-	for level, ts := range v.tables {
-		for _, t := range ts {
-			r.addTableFile(level, t)
-		}
-	}
-}
-
-func (v *version) tLen(level int) int {
-	return len(v.tables[level])
-}
-
-func (v *version) offsetOf(ikey iKey) (n uint64, err error) {
-	for level, tables := range v.tables {
-		for _, t := range tables {
-			if v.s.icmp.Compare(t.imax, ikey) <= 0 {
-				// Entire file is before "ikey", so just add the file size
-				n += t.size
-			} else if v.s.icmp.Compare(t.imin, ikey) > 0 {
-				// Entire file is after "ikey", so ignore
-				if level > 0 {
-					// Files other than level 0 are sorted by meta->min, so
-					// no further files in this level will contain data for
-					// "ikey".
-					break
-				}
-			} else {
-				// "ikey" falls in the range for this table. Add the
-				// approximate offset of "ikey" within the table.
-				var nn uint64
-				nn, err = v.s.tops.offsetOf(t, ikey)
-				if err != nil {
-					return 0, err
-				}
-				n += nn
-			}
-		}
-	}
-
-	return
-}
-
-func (v *version) pickMemdbLevel(umin, umax []byte) (level int) {
-	if !v.tables[0].overlaps(v.s.icmp, umin, umax, true) {
-		var overlaps tFiles
-		maxLevel := v.s.o.GetMaxMemCompationLevel()
-		for ; level < maxLevel; level++ {
-			if v.tables[level+1].overlaps(v.s.icmp, umin, umax, false) {
-				break
-			}
-			overlaps = v.tables[level+2].getOverlaps(overlaps, v.s.icmp, umin, umax, false)
-			if overlaps.size() > uint64(v.s.o.GetCompactionGPOverlaps(level)) {
-				break
-			}
-		}
-	}
-
-	return
-}
-
-func (v *version) computeCompaction() {
-	// Precomputed best level for next compaction
-	var bestLevel int = -1
-	var bestScore float64 = -1
-
-	for level, tables := range v.tables {
-		var score float64
-		if level == 0 {
-			// We treat level-0 specially by bounding the number of files
-			// instead of number of bytes for two reasons:
-			//
-			// (1) With larger write-buffer sizes, it is nice not to do too
-			// many level-0 compactions.
-			//
-			// (2) The files in level-0 are merged on every read and
-			// therefore we wish to avoid too many files when the individual
-			// file size is small (perhaps because of a small write-buffer
-			// setting, or very high compression ratios, or lots of
-			// overwrites/deletions).
-			score = float64(len(tables)) / float64(v.s.o.GetCompactionL0Trigger())
-		} else {
-			score = float64(tables.size()) / float64(v.s.o.GetCompactionTotalSize(level))
-		}
-
-		if score > bestScore {
-			bestLevel = level
-			bestScore = score
-		}
-	}
-
-	v.cLevel = bestLevel
-	v.cScore = bestScore
-}
-
-func (v *version) needCompaction() bool {
-	return v.cScore >= 1 || atomic.LoadPointer(&v.cSeek) != nil
-}
-
-type tablesScratch struct {
-	added   map[uint64]atRecord
-	deleted map[uint64]struct{}
-}
-
-type versionStaging struct {
-	base   *version
-	tables []tablesScratch
-}
-
-func (p *versionStaging) commit(r *sessionRecord) {
-	// Deleted tables.
-	for _, r := range r.deletedTables {
-		tm := &(p.tables[r.level])
-
-		if len(p.base.tables[r.level]) > 0 {
-			if tm.deleted == nil {
-				tm.deleted = make(map[uint64]struct{})
-			}
-			tm.deleted[r.num] = struct{}{}
-		}
-
-		if tm.added != nil {
-			delete(tm.added, r.num)
-		}
-	}
-
-	// New tables.
-	for _, r := range r.addedTables {
-		tm := &(p.tables[r.level])
-
-		if tm.added == nil {
-			tm.added = make(map[uint64]atRecord)
-		}
-		tm.added[r.num] = r
-
-		if tm.deleted != nil {
-			delete(tm.deleted, r.num)
-		}
-	}
-}
-
-func (p *versionStaging) finish() *version {
-	// Build new version.
-	nv := newVersion(p.base.s)
-	for level, tm := range p.tables {
-		btables := p.base.tables[level]
-
-		n := len(btables) + len(tm.added) - len(tm.deleted)
-		if n < 0 {
-			n = 0
-		}
-		nt := make(tFiles, 0, n)
-
-		// Base tables.
-		for _, t := range btables {
-			if _, ok := tm.deleted[t.file.Num()]; ok {
-				continue
-			}
-			if _, ok := tm.added[t.file.Num()]; ok {
-				continue
-			}
-			nt = append(nt, t)
-		}
-
-		// New tables.
-		for _, r := range tm.added {
-			nt = append(nt, p.base.s.tableFileFromRecord(r))
-		}
-
-		// Sort tables.
-		if level == 0 {
-			nt.sortByNum()
-		} else {
-			nt.sortByKey(p.base.s.icmp)
-		}
-		nv.tables[level] = nt
-	}
-
-	// Compute compaction score for new version.
-	nv.computeCompaction()
-
-	return nv
-}
-
-type versionReleaser struct {
-	v    *version
-	once bool
-}
-
-func (vr *versionReleaser) Release() {
-	v := vr.v
-	v.s.vmu.Lock()
-	if !vr.once {
-		v.releaseNB()
-		vr.once = true
-	}
-	v.s.vmu.Unlock()
-}
diff --git a/vendor/github.com/yasushi-saito/rbtree/rbtree_test.go b/vendor/github.com/yasushi-saito/rbtree/rbtree_test.go
deleted file mode 100644
index 4b8a20c12..000000000
--- a/vendor/github.com/yasushi-saito/rbtree/rbtree_test.go
+++ /dev/null
@@ -1,371 +0,0 @@
-//
-// Created by Yaz Saito on 06/10/12.
-//
-
-package rbtree
-
-import "testing"
-import "math/rand"
-import "fmt"
-import "log"
-import "sort"
-
-const testVerbose = false
-
-// Create a tree storing a set of integers
-func testNewIntSet() *Tree {
-	return NewTree(func(i1, i2 Item) int {
-		return int(i1.(int)) - int(i2.(int))
-	})
-}
-
-func testAssert(t *testing.T, b bool, message string) {
-	if !b {
-		t.Fatal(message)
-	}
-}
-
-func TestEmpty(t *testing.T) {
-	tree := testNewIntSet()
-	testAssert(t, tree.Len() == 0, "len!=0")
-	testAssert(t, tree.Max().NegativeLimit(), "neglimit")
-	testAssert(t, tree.Min().Limit(), "limit")
-	testAssert(t, tree.FindGE(10).Limit(), "Not empty")
-	testAssert(t, tree.FindLE(10).NegativeLimit(), "Not empty")
-	testAssert(t, tree.Get(10) == nil, "Not empty")
-	testAssert(t, tree.Limit().Equal(tree.Min()), "iter")
-}
-
-func TestFindGE(t *testing.T) {
-	tree := testNewIntSet()
-	testAssert(t, tree.Insert(10), "Insert1")
-	testAssert(t, !tree.Insert(10), "Insert2")
-	testAssert(t, tree.Len() == 1, "len==1")
-	testAssert(t, tree.FindGE(10).Item().(int) == 10, "FindGE 10")
-	testAssert(t, tree.FindGE(11).Limit(), "FindGE 11")
-	testAssert(t, tree.FindGE(9).Item().(int) == 10, "FindGE 10")
-}
-
-func TestFindLE(t *testing.T) {
-	tree := testNewIntSet()
-	testAssert(t, tree.Insert(10), "insert1")
-	testAssert(t, tree.FindLE(10).Item().(int) == 10, "FindLE 10")
-	testAssert(t, tree.FindLE(11).Item().(int) == 10, "FindLE 11")
-	testAssert(t, tree.FindLE(9).NegativeLimit(), "FindLE 9")
-}
-
-func TestGet(t *testing.T) {
-	tree := testNewIntSet()
-	testAssert(t, tree.Insert(10), "insert1")
-	testAssert(t, tree.Get(10).(int) == 10, "Get 10")
-	testAssert(t, tree.Get(9) == nil, "Get 9")
-	testAssert(t, tree.Get(11) == nil, "Get 11")
-}
-
-func TestDelete(t *testing.T) {
-	tree := testNewIntSet()
-	testAssert(t, !tree.DeleteWithKey(10), "del")
-	testAssert(t, tree.Len() == 0, "dellen")
-	testAssert(t, tree.Insert(10), "ins")
-	testAssert(t, tree.DeleteWithKey(10), "del")
-	testAssert(t, tree.Len() == 0, "dellen")
-}
-
-func iterToString(i Iterator) string {
-	s := ""
-	for ; !i.Limit(); i = i.Next() {
-		if s != "" { s = s + ","}
-		s = s + fmt.Sprintf("%d", i.Item().(int))
-	}
-	return s
-}
-
-func reverseIterToString(i Iterator) string {
-	s := ""
-	for ; !i.NegativeLimit(); i = i.Prev() {
-		if s != "" { s = s + ","}
-		s = s + fmt.Sprintf("%d", i.Item().(int))
-	}
-	return s
-}
-
-func TestIterator(t *testing.T) {
-	tree := testNewIntSet()
-	for i := 0; i < 10; i = i + 2 {
-		tree.Insert(i)
-	}
-	if iterToString(tree.FindGE(3)) != "4,6,8" {
-		t.Error("iter")
-	}
-	if iterToString(tree.FindGE(4)) != "4,6,8" {
-		t.Error("iter")
-	}
-	if iterToString(tree.FindGE(8)) != "8" {
-		t.Error("iter")
-	}
-	if iterToString(tree.FindGE(9)) != "" {
-		t.Error("iter")
-	}
-
-	if reverseIterToString(tree.FindLE(3)) != "2,0" {
-		t.Error("iter", reverseIterToString(tree.FindLE(3)))
-	}
-	if reverseIterToString(tree.FindLE(2)) != "2,0" {
-		t.Error("iter")
-	}
-	if reverseIterToString(tree.FindLE(0)) != "0" {
-		t.Error("iter")
-	}
-	if reverseIterToString(tree.FindLE(-1)) != "" {
-		t.Error("iter")
-	}
-}
-
-//
-// Randomized tests
-//
-
-// oracle stores provides an interface similar to rbtree, but stores
-// data in an sorted array
-type oracle struct {
-	data []int
-}
-
-func newOracle() *oracle {
-	return &oracle{data: make([]int, 0)}
-}
-
-func (o *oracle) Len() int {
-	return len(o.data)
-}
-
-// interface needed for sorting
-func (o *oracle) Less(i, j int) bool {
-	return o.data[i] < o.data[j]
-}
-
-func (o *oracle) Swap(i, j int) {
-	e := o.data[j]
-	o.data[j] = o.data[i]
-	o.data[i] = e
-}
-
-func (o *oracle) Insert(key int) bool {
-	for _, e := range o.data {
-		if e == key {
-			return false
-		}
-	}
-
-	n := len(o.data) + 1
-	newData := make([]int, n)
-	copy(newData, o.data)
-	newData[n-1] = key
-	o.data = newData
-	sort.Sort(o)
-	return true
-}
-
-func (o *oracle) RandomExistingKey(rand *rand.Rand) int {
-	index := rand.Intn(len(o.data))
-	return o.data[index]
-}
-
-func (o *oracle) FindGE(t *testing.T, key int) oracleIterator {
-	prev := int(-1)
-	for i, e := range o.data {
-		if e <= prev {
-			t.Fatal("Nonsorted oracle ", e, prev)
-		}
-		if e >= key {
-			return oracleIterator{o: o, index: i}
-		}
-	}
-	return oracleIterator{o: o, index: len(o.data)}
-}
-
-func (o *oracle) FindLE(t *testing.T, key int) oracleIterator {
-	iter := o.FindGE(t, key)
-	if !iter.Limit() && o.data[iter.index] == key {
-		return iter
-	}
-	return oracleIterator{o, iter.index - 1}
-}
-
-func (o *oracle) Delete(key int) bool {
-	for i, e := range o.data {
-		if e == key {
-			newData := make([]int, len(o.data)-1)
-			copy(newData, o.data[0:i])
-			copy(newData[i:], o.data[i+1:])
-			o.data = newData
-			return true
-		}
-	}
-	return false
-}
-
-//
-// Test iterator
-//
-type oracleIterator struct {
-	o     *oracle
-	index int
-}
-
-func (oiter oracleIterator) Limit() bool {
-	return oiter.index >= len(oiter.o.data)
-}
-
-func (oiter oracleIterator) Min() bool {
-	return oiter.index == 0
-}
-
-func (oiter oracleIterator) NegativeLimit() bool {
-	return oiter.index < 0
-}
-
-func (oiter oracleIterator) Max() bool {
-	return oiter.index == len(oiter.o.data) - 1
-}
-
-func (oiter oracleIterator) Item() int {
-	return oiter.o.data[oiter.index]
-}
-
-func (oiter oracleIterator) Next() oracleIterator {
-	return oracleIterator{oiter.o, oiter.index + 1}
-}
-
-func (oiter oracleIterator) Prev() oracleIterator {
-	return oracleIterator{oiter.o, oiter.index - 1}
-}
-
-func compareContents(t *testing.T, oiter oracleIterator, titer Iterator) {
-	oi := oiter
-	ti := titer
-
-	// Test forward iteration
-	testAssert(t, oi.NegativeLimit() == ti.NegativeLimit(), "rend")
-	if oi.NegativeLimit() {
-		oi = oi.Next()
-		ti = ti.Next()
-	}
-
-	for !oi.Limit() && !ti.Limit() {
-		// log.Print("Item: ", oi.Item(), ti.Item())
-		if ti.Item().(int) != oi.Item() {
-			t.Fatal("Wrong item", ti.Item(), oi.Item())
-		}
-		oi = oi.Next()
-		ti = ti.Next()
-	}
-	if !ti.Limit() {
-		t.Fatal("!ti.done", ti.Item())
-	}
-	if !oi.Limit() {
-		t.Fatal("!oi.done", oi.Item())
-	}
-
-	// Test reverse iteration
-	oi = oiter
-	ti = titer
-	testAssert(t, oi.Limit() == ti.Limit(), "end")
-	if oi.Limit() {
-		oi = oi.Prev()
-		ti = ti.Prev()
-	}
-
-	for !oi.NegativeLimit() && !ti.NegativeLimit() {
-		if ti.Item().(int) != oi.Item() {
-			t.Fatal("Wrong item", ti.Item(), oi.Item())
-		}
-		oi = oi.Prev()
-		ti = ti.Prev()
-	}
-	if !ti.NegativeLimit() {
-		t.Fatal("!ti.done", ti.Item())
-	}
-	if !oi.NegativeLimit() {
-		t.Fatal("!oi.done", oi.Item())
-	}
-}
-
-func compareContentsFull(t *testing.T, o *oracle, tree *Tree) {
-	compareContents(t, o.FindGE(t, int(-1)), tree.FindGE(-1))
-}
-
-func TestRandomized(t *testing.T) {
-	const numKeys = 1000
-
-	o := newOracle()
-	tree := testNewIntSet()
-	r := rand.New(rand.NewSource(0))
-	for i := 0; i < 10000; i++ {
-		op := r.Intn(100)
-		if op < 50 {
-			key := r.Intn(numKeys)
-			if testVerbose {
-				log.Print("Insert ", key)
-			}
-			o.Insert(key)
-			tree.Insert(key)
-			compareContentsFull(t, o, tree)
-		} else if op < 90 && o.Len() > 0 {
-			key := o.RandomExistingKey(r)
-			if testVerbose {
-				log.Print("DeleteExisting ", key)
-			}
-			o.Delete(key)
-			if !tree.DeleteWithKey(key) {
-				t.Fatal("DeleteExisting", key)
-			}
-			compareContentsFull(t, o, tree)
-		} else if op < 95 {
-			key := int(r.Intn(numKeys))
-			if testVerbose {
-				log.Print("FindGE ", key)
-			}
-			compareContents(t, o.FindGE(t, key), tree.FindGE(key))
-		} else {
-			key := int(r.Intn(numKeys))
-			if testVerbose {
-				log.Print("FindLE ", key)
-			}
-			compareContents(t, o.FindLE(t, key), tree.FindLE(key))
-		}
-	}
-}
-
-//
-// Examples
-//
-
-func ExampleIntString() {
-	type MyItem struct {
-		key   int
-		value string
-	}
-
-	tree := NewTree(func(a, b Item) int { return a.(MyItem).key - b.(MyItem).key })
-	tree.Insert(MyItem{10, "value10"})
-	tree.Insert(MyItem{12, "value12"})
-
-	fmt.Println("Get(10) ->", tree.Get(MyItem{10, ""}))
-	fmt.Println("Get(11) ->", tree.Get(MyItem{11, ""}))
-
-	// Find an element >= 11
-	iter := tree.FindGE(MyItem{11, ""})
-	fmt.Println("FindGE(11) ->", iter.Item())
-
-	// Find an element >= 13
-	iter = tree.FindGE(MyItem{13, ""})
-	if !iter.Limit() {
-		panic("There should be no element >= 13")
-	}
-
-	// Output:
-	// Get(10) -> {10 value10}
-	// Get(11) -> <nil>
-	// FindGE(11) -> {12 value12}
-}
diff --git a/vendor/gopkg.in/inf.v0/LICENSE b/vendor/gopkg.in/inf.v0/LICENSE
deleted file mode 100644
index efa1aa189..000000000
--- a/vendor/gopkg.in/inf.v0/LICENSE
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright (c) 2012 Péter Surányi. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------------------
-Portions of inf.Dec's source code have been derived from Go and are
-covered by the following license:
-----------------------------------------------------------------------
-
-Copyright (c) 2009 The 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/vendor/gopkg.in/inf.v0/benchmark_test.go b/vendor/gopkg.in/inf.v0/benchmark_test.go
deleted file mode 100644
index 27071da0e..000000000
--- a/vendor/gopkg.in/inf.v0/benchmark_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package inf
-
-import (
-	"fmt"
-	"math/big"
-	"math/rand"
-	"sync"
-	"testing"
-)
-
-const maxcap = 1024 * 1024
-const bits = 256
-const maxscale = 32
-
-var once sync.Once
-
-var decInput [][2]Dec
-var intInput [][2]big.Int
-
-var initBench = func() {
-	decInput = make([][2]Dec, maxcap)
-	intInput = make([][2]big.Int, maxcap)
-	max := new(big.Int).Lsh(big.NewInt(1), bits)
-	r := rand.New(rand.NewSource(0))
-	for i := 0; i < cap(decInput); i++ {
-		decInput[i][0].SetUnscaledBig(new(big.Int).Rand(r, max)).
-			SetScale(Scale(r.Int31n(int32(2*maxscale-1)) - int32(maxscale)))
-		decInput[i][1].SetUnscaledBig(new(big.Int).Rand(r, max)).
-			SetScale(Scale(r.Int31n(int32(2*maxscale-1)) - int32(maxscale)))
-	}
-	for i := 0; i < cap(intInput); i++ {
-		intInput[i][0].Rand(r, max)
-		intInput[i][1].Rand(r, max)
-	}
-}
-
-func doBenchmarkDec1(b *testing.B, f func(z *Dec)) {
-	once.Do(initBench)
-	b.ResetTimer()
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		f(&decInput[i%maxcap][0])
-	}
-}
-
-func doBenchmarkDec2(b *testing.B, f func(x, y *Dec)) {
-	once.Do(initBench)
-	b.ResetTimer()
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		f(&decInput[i%maxcap][0], &decInput[i%maxcap][1])
-	}
-}
-
-func doBenchmarkInt1(b *testing.B, f func(z *big.Int)) {
-	once.Do(initBench)
-	b.ResetTimer()
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		f(&intInput[i%maxcap][0])
-	}
-}
-
-func doBenchmarkInt2(b *testing.B, f func(x, y *big.Int)) {
-	once.Do(initBench)
-	b.ResetTimer()
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		f(&intInput[i%maxcap][0], &intInput[i%maxcap][1])
-	}
-}
-
-func Benchmark_Dec_String(b *testing.B) {
-	doBenchmarkDec1(b, func(x *Dec) {
-		x.String()
-	})
-}
-
-func Benchmark_Dec_StringScan(b *testing.B) {
-	doBenchmarkDec1(b, func(x *Dec) {
-		s := x.String()
-		d := new(Dec)
-		fmt.Sscan(s, d)
-	})
-}
-
-func Benchmark_Dec_GobEncode(b *testing.B) {
-	doBenchmarkDec1(b, func(x *Dec) {
-		x.GobEncode()
-	})
-}
-
-func Benchmark_Dec_GobEnDecode(b *testing.B) {
-	doBenchmarkDec1(b, func(x *Dec) {
-		g, _ := x.GobEncode()
-		new(Dec).GobDecode(g)
-	})
-}
-
-func Benchmark_Dec_Add(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		ys := y.Scale()
-		y.SetScale(x.Scale())
-		_ = new(Dec).Add(x, y)
-		y.SetScale(ys)
-	})
-}
-
-func Benchmark_Dec_AddMixed(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		_ = new(Dec).Add(x, y)
-	})
-}
-
-func Benchmark_Dec_Sub(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		ys := y.Scale()
-		y.SetScale(x.Scale())
-		_ = new(Dec).Sub(x, y)
-		y.SetScale(ys)
-	})
-}
-
-func Benchmark_Dec_SubMixed(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		_ = new(Dec).Sub(x, y)
-	})
-}
-
-func Benchmark_Dec_Mul(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		_ = new(Dec).Mul(x, y)
-	})
-}
-
-func Benchmark_Dec_Mul_QuoExact(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		v := new(Dec).Mul(x, y)
-		_ = new(Dec).QuoExact(v, y)
-	})
-}
-
-func Benchmark_Dec_QuoRound_Fixed_Down(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		_ = new(Dec).QuoRound(x, y, 0, RoundDown)
-	})
-}
-
-func Benchmark_Dec_QuoRound_Fixed_HalfUp(b *testing.B) {
-	doBenchmarkDec2(b, func(x, y *Dec) {
-		_ = new(Dec).QuoRound(x, y, 0, RoundHalfUp)
-	})
-}
-
-func Benchmark_Int_String(b *testing.B) {
-	doBenchmarkInt1(b, func(x *big.Int) {
-		x.String()
-	})
-}
-
-func Benchmark_Int_StringScan(b *testing.B) {
-	doBenchmarkInt1(b, func(x *big.Int) {
-		s := x.String()
-		d := new(big.Int)
-		fmt.Sscan(s, d)
-	})
-}
-
-func Benchmark_Int_GobEncode(b *testing.B) {
-	doBenchmarkInt1(b, func(x *big.Int) {
-		x.GobEncode()
-	})
-}
-
-func Benchmark_Int_GobEnDecode(b *testing.B) {
-	doBenchmarkInt1(b, func(x *big.Int) {
-		g, _ := x.GobEncode()
-		new(big.Int).GobDecode(g)
-	})
-}
-
-func Benchmark_Int_Add(b *testing.B) {
-	doBenchmarkInt2(b, func(x, y *big.Int) {
-		_ = new(big.Int).Add(x, y)
-	})
-}
-
-func Benchmark_Int_Sub(b *testing.B) {
-	doBenchmarkInt2(b, func(x, y *big.Int) {
-		_ = new(big.Int).Sub(x, y)
-	})
-}
-
-func Benchmark_Int_Mul(b *testing.B) {
-	doBenchmarkInt2(b, func(x, y *big.Int) {
-		_ = new(big.Int).Mul(x, y)
-	})
-}
-
-func Benchmark_Int_Quo(b *testing.B) {
-	doBenchmarkInt2(b, func(x, y *big.Int) {
-		_ = new(big.Int).Quo(x, y)
-	})
-}
-
-func Benchmark_Int_QuoRem(b *testing.B) {
-	doBenchmarkInt2(b, func(x, y *big.Int) {
-		_, _ = new(big.Int).QuoRem(x, y, new(big.Int))
-	})
-}
diff --git a/vendor/gopkg.in/inf.v0/dec.go b/vendor/gopkg.in/inf.v0/dec.go
deleted file mode 100644
index d17ad945d..000000000
--- a/vendor/gopkg.in/inf.v0/dec.go
+++ /dev/null
@@ -1,615 +0,0 @@
-// Package inf (type inf.Dec) implements "infinite-precision" decimal
-// arithmetic.
-// "Infinite precision" describes two characteristics: practically unlimited
-// precision for decimal number representation and no support for calculating
-// with any specific fixed precision.
-// (Although there is no practical limit on precision, inf.Dec can only
-// represent finite decimals.)
-//
-// This package is currently in experimental stage and the API may change.
-//
-// This package does NOT support:
-//  - rounding to specific precisions (as opposed to specific decimal positions)
-//  - the notion of context (each rounding must be explicit)
-//  - NaN and Inf values, and distinguishing between positive and negative zero
-//  - conversions to and from float32/64 types
-//
-// Features considered for possible addition:
-//  + formatting options
-//  + Exp method
-//  + combined operations such as AddRound/MulAdd etc
-//  + exchanging data in decimal32/64/128 formats
-//
-package inf
-
-// TODO:
-//  - avoid excessive deep copying (quo and rounders)
-
-import (
-	"fmt"
-	"io"
-	"math/big"
-	"strings"
-)
-
-// A Dec represents a signed arbitrary-precision decimal.
-// It is a combination of a sign, an arbitrary-precision integer coefficient
-// value, and a signed fixed-precision exponent value.
-// The sign and the coefficient value are handled together as a signed value
-// and referred to as the unscaled value.
-// (Positive and negative zero values are not distinguished.)
-// Since the exponent is most commonly non-positive, it is handled in negated
-// form and referred to as scale.
-//
-// The mathematical value of a Dec equals:
-//
-//  unscaled * 10**(-scale)
-//
-// Note that different Dec representations may have equal mathematical values.
-//
-//  unscaled  scale  String()
-//  -------------------------
-//         0      0    "0"
-//         0      2    "0.00"
-//         0     -2    "0"
-//         1      0    "1"
-//       100      2    "1.00"
-//        10      0   "10"
-//         1     -1   "10"
-//
-// The zero value for a Dec represents the value 0 with scale 0.
-//
-// Operations are typically performed through the *Dec type.
-// The semantics of the assignment operation "=" for "bare" Dec values is
-// undefined and should not be relied on.
-//
-// Methods are typically of the form:
-//
-//	func (z *Dec) Op(x, y *Dec) *Dec
-//
-// and implement operations z = x Op y with the result as receiver; if it
-// is one of the operands it may be overwritten (and its memory reused).
-// To enable chaining of operations, the result is also returned. Methods
-// returning a result other than *Dec take one of the operands as the receiver.
-//
-// A "bare" Quo method (quotient / division operation) is not provided, as the
-// result is not always a finite decimal and thus in general cannot be
-// represented as a Dec.
-// Instead, in the common case when rounding is (potentially) necessary,
-// QuoRound should be used with a Scale and a Rounder.
-// QuoExact or QuoRound with RoundExact can be used in the special cases when it
-// is known that the result is always a finite decimal.
-//
-type Dec struct {
-	unscaled big.Int
-	scale    Scale
-}
-
-// Scale represents the type used for the scale of a Dec.
-type Scale int32
-
-const scaleSize = 4 // bytes in a Scale value
-
-// Scaler represents a method for obtaining the scale to use for the result of
-// an operation on x and y.
-type scaler interface {
-	Scale(x *Dec, y *Dec) Scale
-}
-
-var bigInt = [...]*big.Int{
-	big.NewInt(0), big.NewInt(1), big.NewInt(2), big.NewInt(3), big.NewInt(4),
-	big.NewInt(5), big.NewInt(6), big.NewInt(7), big.NewInt(8), big.NewInt(9),
-	big.NewInt(10),
-}
-
-var exp10cache [64]big.Int = func() [64]big.Int {
-	e10, e10i := [64]big.Int{}, bigInt[1]
-	for i, _ := range e10 {
-		e10[i].Set(e10i)
-		e10i = new(big.Int).Mul(e10i, bigInt[10])
-	}
-	return e10
-}()
-
-// NewDec allocates and returns a new Dec set to the given int64 unscaled value
-// and scale.
-func NewDec(unscaled int64, scale Scale) *Dec {
-	return new(Dec).SetUnscaled(unscaled).SetScale(scale)
-}
-
-// NewDecBig allocates and returns a new Dec set to the given *big.Int unscaled
-// value and scale.
-func NewDecBig(unscaled *big.Int, scale Scale) *Dec {
-	return new(Dec).SetUnscaledBig(unscaled).SetScale(scale)
-}
-
-// Scale returns the scale of x.
-func (x *Dec) Scale() Scale {
-	return x.scale
-}
-
-// Unscaled returns the unscaled value of x for u and true for ok when the
-// unscaled value can be represented as int64; otherwise it returns an undefined
-// int64 value for u and false for ok. Use x.UnscaledBig().Int64() to avoid
-// checking the validity of the value when the check is known to be redundant.
-func (x *Dec) Unscaled() (u int64, ok bool) {
-	u = x.unscaled.Int64()
-	var i big.Int
-	ok = i.SetInt64(u).Cmp(&x.unscaled) == 0
-	return
-}
-
-// UnscaledBig returns the unscaled value of x as *big.Int.
-func (x *Dec) UnscaledBig() *big.Int {
-	return &x.unscaled
-}
-
-// SetScale sets the scale of z, with the unscaled value unchanged, and returns
-// z.
-// The mathematical value of the Dec changes as if it was multiplied by
-// 10**(oldscale-scale).
-func (z *Dec) SetScale(scale Scale) *Dec {
-	z.scale = scale
-	return z
-}
-
-// SetUnscaled sets the unscaled value of z, with the scale unchanged, and
-// returns z.
-func (z *Dec) SetUnscaled(unscaled int64) *Dec {
-	z.unscaled.SetInt64(unscaled)
-	return z
-}
-
-// SetUnscaledBig sets the unscaled value of z, with the scale unchanged, and
-// returns z.
-func (z *Dec) SetUnscaledBig(unscaled *big.Int) *Dec {
-	z.unscaled.Set(unscaled)
-	return z
-}
-
-// Set sets z to the value of x and returns z.
-// It does nothing if z == x.
-func (z *Dec) Set(x *Dec) *Dec {
-	if z != x {
-		z.SetUnscaledBig(x.UnscaledBig())
-		z.SetScale(x.Scale())
-	}
-	return z
-}
-
-// Sign returns:
-//
-//	-1 if x <  0
-//	 0 if x == 0
-//	+1 if x >  0
-//
-func (x *Dec) Sign() int {
-	return x.UnscaledBig().Sign()
-}
-
-// Neg sets z to -x and returns z.
-func (z *Dec) Neg(x *Dec) *Dec {
-	z.SetScale(x.Scale())
-	z.UnscaledBig().Neg(x.UnscaledBig())
-	return z
-}
-
-// Cmp compares x and y and returns:
-//
-//   -1 if x <  y
-//    0 if x == y
-//   +1 if x >  y
-//
-func (x *Dec) Cmp(y *Dec) int {
-	xx, yy := upscale(x, y)
-	return xx.UnscaledBig().Cmp(yy.UnscaledBig())
-}
-
-// Abs sets z to |x| (the absolute value of x) and returns z.
-func (z *Dec) Abs(x *Dec) *Dec {
-	z.SetScale(x.Scale())
-	z.UnscaledBig().Abs(x.UnscaledBig())
-	return z
-}
-
-// Add sets z to the sum x+y and returns z.
-// The scale of z is the greater of the scales of x and y.
-func (z *Dec) Add(x, y *Dec) *Dec {
-	xx, yy := upscale(x, y)
-	z.SetScale(xx.Scale())
-	z.UnscaledBig().Add(xx.UnscaledBig(), yy.UnscaledBig())
-	return z
-}
-
-// Sub sets z to the difference x-y and returns z.
-// The scale of z is the greater of the scales of x and y.
-func (z *Dec) Sub(x, y *Dec) *Dec {
-	xx, yy := upscale(x, y)
-	z.SetScale(xx.Scale())
-	z.UnscaledBig().Sub(xx.UnscaledBig(), yy.UnscaledBig())
-	return z
-}
-
-// Mul sets z to the product x*y and returns z.
-// The scale of z is the sum of the scales of x and y.
-func (z *Dec) Mul(x, y *Dec) *Dec {
-	z.SetScale(x.Scale() + y.Scale())
-	z.UnscaledBig().Mul(x.UnscaledBig(), y.UnscaledBig())
-	return z
-}
-
-// Round sets z to the value of x rounded to Scale s using Rounder r, and
-// returns z.
-func (z *Dec) Round(x *Dec, s Scale, r Rounder) *Dec {
-	return z.QuoRound(x, NewDec(1, 0), s, r)
-}
-
-// QuoRound sets z to the quotient x/y, rounded using the given Rounder to the
-// specified scale.
-//
-// If the rounder is RoundExact but the result can not be expressed exactly at
-// the specified scale, QuoRound returns nil, and the value of z is undefined.
-//
-// There is no corresponding Div method; the equivalent can be achieved through
-// the choice of Rounder used.
-//
-func (z *Dec) QuoRound(x, y *Dec, s Scale, r Rounder) *Dec {
-	return z.quo(x, y, sclr{s}, r)
-}
-
-func (z *Dec) quo(x, y *Dec, s scaler, r Rounder) *Dec {
-	scl := s.Scale(x, y)
-	var zzz *Dec
-	if r.UseRemainder() {
-		zz, rA, rB := new(Dec).quoRem(x, y, scl, true, new(big.Int), new(big.Int))
-		zzz = r.Round(new(Dec), zz, rA, rB)
-	} else {
-		zz, _, _ := new(Dec).quoRem(x, y, scl, false, nil, nil)
-		zzz = r.Round(new(Dec), zz, nil, nil)
-	}
-	if zzz == nil {
-		return nil
-	}
-	return z.Set(zzz)
-}
-
-// QuoExact sets z to the quotient x/y and returns z when x/y is a finite
-// decimal. Otherwise it returns nil and the value of z is undefined.
-//
-// The scale of a non-nil result is "x.Scale() - y.Scale()" or greater; it is
-// calculated so that the remainder will be zero whenever x/y is a finite
-// decimal.
-func (z *Dec) QuoExact(x, y *Dec) *Dec {
-	return z.quo(x, y, scaleQuoExact{}, RoundExact)
-}
-
-// quoRem sets z to the quotient x/y with the scale s, and if useRem is true,
-// it sets remNum and remDen to the numerator and denominator of the remainder.
-// It returns z, remNum and remDen.
-//
-// The remainder is normalized to the range -1 < r < 1 to simplify rounding;
-// that is, the results satisfy the following equation:
-//
-//  x / y = z + (remNum/remDen) * 10**(-z.Scale())
-//
-// See Rounder for more details about rounding.
-//
-func (z *Dec) quoRem(x, y *Dec, s Scale, useRem bool,
-	remNum, remDen *big.Int) (*Dec, *big.Int, *big.Int) {
-	// difference (required adjustment) compared to "canonical" result scale
-	shift := s - (x.Scale() - y.Scale())
-	// pointers to adjusted unscaled dividend and divisor
-	var ix, iy *big.Int
-	switch {
-	case shift > 0:
-		// increased scale: decimal-shift dividend left
-		ix = new(big.Int).Mul(x.UnscaledBig(), exp10(shift))
-		iy = y.UnscaledBig()
-	case shift < 0:
-		// decreased scale: decimal-shift divisor left
-		ix = x.UnscaledBig()
-		iy = new(big.Int).Mul(y.UnscaledBig(), exp10(-shift))
-	default:
-		ix = x.UnscaledBig()
-		iy = y.UnscaledBig()
-	}
-	// save a copy of iy in case it to be overwritten with the result
-	iy2 := iy
-	if iy == z.UnscaledBig() {
-		iy2 = new(big.Int).Set(iy)
-	}
-	// set scale
-	z.SetScale(s)
-	// set unscaled
-	if useRem {
-		// Int division
-		_, intr := z.UnscaledBig().QuoRem(ix, iy, new(big.Int))
-		// set remainder
-		remNum.Set(intr)
-		remDen.Set(iy2)
-	} else {
-		z.UnscaledBig().Quo(ix, iy)
-	}
-	return z, remNum, remDen
-}
-
-type sclr struct{ s Scale }
-
-func (s sclr) Scale(x, y *Dec) Scale {
-	return s.s
-}
-
-type scaleQuoExact struct{}
-
-func (sqe scaleQuoExact) Scale(x, y *Dec) Scale {
-	rem := new(big.Rat).SetFrac(x.UnscaledBig(), y.UnscaledBig())
-	f2, f5 := factor2(rem.Denom()), factor(rem.Denom(), bigInt[5])
-	var f10 Scale
-	if f2 > f5 {
-		f10 = Scale(f2)
-	} else {
-		f10 = Scale(f5)
-	}
-	return x.Scale() - y.Scale() + f10
-}
-
-func factor(n *big.Int, p *big.Int) int {
-	// could be improved for large factors
-	d, f := n, 0
-	for {
-		dd, dm := new(big.Int).DivMod(d, p, new(big.Int))
-		if dm.Sign() == 0 {
-			f++
-			d = dd
-		} else {
-			break
-		}
-	}
-	return f
-}
-
-func factor2(n *big.Int) int {
-	// could be improved for large factors
-	f := 0
-	for ; n.Bit(f) == 0; f++ {
-	}
-	return f
-}
-
-func upscale(a, b *Dec) (*Dec, *Dec) {
-	if a.Scale() == b.Scale() {
-		return a, b
-	}
-	if a.Scale() > b.Scale() {
-		bb := b.rescale(a.Scale())
-		return a, bb
-	}
-	aa := a.rescale(b.Scale())
-	return aa, b
-}
-
-func exp10(x Scale) *big.Int {
-	if int(x) < len(exp10cache) {
-		return &exp10cache[int(x)]
-	}
-	return new(big.Int).Exp(bigInt[10], big.NewInt(int64(x)), nil)
-}
-
-func (x *Dec) rescale(newScale Scale) *Dec {
-	shift := newScale - x.Scale()
-	switch {
-	case shift < 0:
-		e := exp10(-shift)
-		return NewDecBig(new(big.Int).Quo(x.UnscaledBig(), e), newScale)
-	case shift > 0:
-		e := exp10(shift)
-		return NewDecBig(new(big.Int).Mul(x.UnscaledBig(), e), newScale)
-	}
-	return x
-}
-
-var zeros = []byte("00000000000000000000000000000000" +
-	"00000000000000000000000000000000")
-var lzeros = Scale(len(zeros))
-
-func appendZeros(s []byte, n Scale) []byte {
-	for i := Scale(0); i < n; i += lzeros {
-		if n > i+lzeros {
-			s = append(s, zeros...)
-		} else {
-			s = append(s, zeros[0:n-i]...)
-		}
-	}
-	return s
-}
-
-func (x *Dec) String() string {
-	if x == nil {
-		return "<nil>"
-	}
-	scale := x.Scale()
-	s := []byte(x.UnscaledBig().String())
-	if scale <= 0 {
-		if scale != 0 && x.unscaled.Sign() != 0 {
-			s = appendZeros(s, -scale)
-		}
-		return string(s)
-	}
-	negbit := Scale(-((x.Sign() - 1) / 2))
-	// scale > 0
-	lens := Scale(len(s))
-	if lens-negbit <= scale {
-		ss := make([]byte, 0, scale+2)
-		if negbit == 1 {
-			ss = append(ss, '-')
-		}
-		ss = append(ss, '0', '.')
-		ss = appendZeros(ss, scale-lens+negbit)
-		ss = append(ss, s[negbit:]...)
-		return string(ss)
-	}
-	// lens > scale
-	ss := make([]byte, 0, lens+1)
-	ss = append(ss, s[:lens-scale]...)
-	ss = append(ss, '.')
-	ss = append(ss, s[lens-scale:]...)
-	return string(ss)
-}
-
-// Format is a support routine for fmt.Formatter. It accepts the decimal
-// formats 'd' and 'f', and handles both equivalently.
-// Width, precision, flags and bases 2, 8, 16 are not supported.
-func (x *Dec) Format(s fmt.State, ch rune) {
-	if ch != 'd' && ch != 'f' && ch != 'v' && ch != 's' {
-		fmt.Fprintf(s, "%%!%c(dec.Dec=%s)", ch, x.String())
-		return
-	}
-	fmt.Fprintf(s, x.String())
-}
-
-func (z *Dec) scan(r io.RuneScanner) (*Dec, error) {
-	unscaled := make([]byte, 0, 256) // collects chars of unscaled as bytes
-	dp, dg := -1, -1                 // indexes of decimal point, first digit
-loop:
-	for {
-		ch, _, err := r.ReadRune()
-		if err == io.EOF {
-			break loop
-		}
-		if err != nil {
-			return nil, err
-		}
-		switch {
-		case ch == '+' || ch == '-':
-			if len(unscaled) > 0 || dp >= 0 { // must be first character
-				r.UnreadRune()
-				break loop
-			}
-		case ch == '.':
-			if dp >= 0 {
-				r.UnreadRune()
-				break loop
-			}
-			dp = len(unscaled)
-			continue // don't add to unscaled
-		case ch >= '0' && ch <= '9':
-			if dg == -1 {
-				dg = len(unscaled)
-			}
-		default:
-			r.UnreadRune()
-			break loop
-		}
-		unscaled = append(unscaled, byte(ch))
-	}
-	if dg == -1 {
-		return nil, fmt.Errorf("no digits read")
-	}
-	if dp >= 0 {
-		z.SetScale(Scale(len(unscaled) - dp))
-	} else {
-		z.SetScale(0)
-	}
-	_, ok := z.UnscaledBig().SetString(string(unscaled), 10)
-	if !ok {
-		return nil, fmt.Errorf("invalid decimal: %s", string(unscaled))
-	}
-	return z, nil
-}
-
-// SetString sets z to the value of s, interpreted as a decimal (base 10),
-// and returns z and a boolean indicating success. The scale of z is the
-// number of digits after the decimal point (including any trailing 0s),
-// or 0 if there is no decimal point. If SetString fails, the value of z
-// is undefined but the returned value is nil.
-func (z *Dec) SetString(s string) (*Dec, bool) {
-	r := strings.NewReader(s)
-	_, err := z.scan(r)
-	if err != nil {
-		return nil, false
-	}
-	_, _, err = r.ReadRune()
-	if err != io.EOF {
-		return nil, false
-	}
-	// err == io.EOF => scan consumed all of s
-	return z, true
-}
-
-// Scan is a support routine for fmt.Scanner; it sets z to the value of
-// the scanned number. It accepts the decimal formats 'd' and 'f', and
-// handles both equivalently. Bases 2, 8, 16 are not supported.
-// The scale of z is the number of digits after the decimal point
-// (including any trailing 0s), or 0 if there is no decimal point.
-func (z *Dec) Scan(s fmt.ScanState, ch rune) error {
-	if ch != 'd' && ch != 'f' && ch != 's' && ch != 'v' {
-		return fmt.Errorf("Dec.Scan: invalid verb '%c'", ch)
-	}
-	s.SkipSpace()
-	_, err := z.scan(s)
-	return err
-}
-
-// Gob encoding version
-const decGobVersion byte = 1
-
-func scaleBytes(s Scale) []byte {
-	buf := make([]byte, scaleSize)
-	i := scaleSize
-	for j := 0; j < scaleSize; j++ {
-		i--
-		buf[i] = byte(s)
-		s >>= 8
-	}
-	return buf
-}
-
-func scale(b []byte) (s Scale) {
-	for j := 0; j < scaleSize; j++ {
-		s <<= 8
-		s |= Scale(b[j])
-	}
-	return
-}
-
-// GobEncode implements the gob.GobEncoder interface.
-func (x *Dec) GobEncode() ([]byte, error) {
-	buf, err := x.UnscaledBig().GobEncode()
-	if err != nil {
-		return nil, err
-	}
-	buf = append(append(buf, scaleBytes(x.Scale())...), decGobVersion)
-	return buf, nil
-}
-
-// GobDecode implements the gob.GobDecoder interface.
-func (z *Dec) GobDecode(buf []byte) error {
-	if len(buf) == 0 {
-		return fmt.Errorf("Dec.GobDecode: no data")
-	}
-	b := buf[len(buf)-1]
-	if b != decGobVersion {
-		return fmt.Errorf("Dec.GobDecode: encoding version %d not supported", b)
-	}
-	l := len(buf) - scaleSize - 1
-	err := z.UnscaledBig().GobDecode(buf[:l])
-	if err != nil {
-		return err
-	}
-	z.SetScale(scale(buf[l : l+scaleSize]))
-	return nil
-}
-
-// MarshalText implements the encoding.TextMarshaler interface.
-func (x *Dec) MarshalText() ([]byte, error) {
-	return []byte(x.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface.
-func (z *Dec) UnmarshalText(data []byte) error {
-	_, ok := z.SetString(string(data))
-	if !ok {
-		return fmt.Errorf("invalid inf.Dec")
-	}
-	return nil
-}
diff --git a/vendor/gopkg.in/inf.v0/dec_go1_2_test.go b/vendor/gopkg.in/inf.v0/dec_go1_2_test.go
deleted file mode 100644
index 5df0f7b55..000000000
--- a/vendor/gopkg.in/inf.v0/dec_go1_2_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build go1.2
-
-package inf
-
-import (
-	"encoding"
-	"encoding/json"
-	"testing"
-)
-
-var _ encoding.TextMarshaler = new(Dec)
-var _ encoding.TextUnmarshaler = new(Dec)
-
-type Obj struct {
-	Val *Dec
-}
-
-func TestDecJsonMarshalUnmarshal(t *testing.T) {
-	o := Obj{Val: NewDec(123, 2)}
-	js, err := json.Marshal(o)
-	if err != nil {
-		t.Fatalf("json.Marshal(%v): got %v, want ok", o, err)
-	}
-	o2 := &Obj{}
-	err = json.Unmarshal(js, o2)
-	if err != nil {
-		t.Fatalf("json.Unmarshal(%#q): got %v, want ok", js, err)
-	}
-	if o.Val.Scale() != o2.Val.Scale() ||
-		o.Val.UnscaledBig().Cmp(o2.Val.UnscaledBig()) != 0 {
-		t.Fatalf("json.Unmarshal(json.Marshal(%v)): want %v, got %v", o, o, o2)
-	}
-}
diff --git a/vendor/gopkg.in/inf.v0/dec_internal_test.go b/vendor/gopkg.in/inf.v0/dec_internal_test.go
deleted file mode 100644
index d4fbe3e5b..000000000
--- a/vendor/gopkg.in/inf.v0/dec_internal_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package inf
-
-import (
-	"math/big"
-	"testing"
-)
-
-var decQuoRemZZZ = []struct {
-	z, x, y  *Dec
-	r        *big.Rat
-	srA, srB int
-}{
-	// basic examples
-	{NewDec(1, 0), NewDec(2, 0), NewDec(2, 0), big.NewRat(0, 1), 0, 1},
-	{NewDec(15, 1), NewDec(3, 0), NewDec(2, 0), big.NewRat(0, 1), 0, 1},
-	{NewDec(1, 1), NewDec(1, 0), NewDec(10, 0), big.NewRat(0, 1), 0, 1},
-	{NewDec(0, 0), NewDec(2, 0), NewDec(3, 0), big.NewRat(2, 3), 1, 1},
-	{NewDec(0, 0), NewDec(2, 0), NewDec(6, 0), big.NewRat(1, 3), 1, 1},
-	{NewDec(1, 1), NewDec(2, 0), NewDec(12, 0), big.NewRat(2, 3), 1, 1},
-
-	// examples from the Go Language Specification
-	{NewDec(1, 0), NewDec(5, 0), NewDec(3, 0), big.NewRat(2, 3), 1, 1},
-	{NewDec(-1, 0), NewDec(-5, 0), NewDec(3, 0), big.NewRat(-2, 3), -1, 1},
-	{NewDec(-1, 0), NewDec(5, 0), NewDec(-3, 0), big.NewRat(-2, 3), 1, -1},
-	{NewDec(1, 0), NewDec(-5, 0), NewDec(-3, 0), big.NewRat(2, 3), -1, -1},
-}
-
-func TestDecQuoRem(t *testing.T) {
-	for i, a := range decQuoRemZZZ {
-		z, rA, rB := new(Dec), new(big.Int), new(big.Int)
-		s := scaleQuoExact{}.Scale(a.x, a.y)
-		z.quoRem(a.x, a.y, s, true, rA, rB)
-		if a.z.Cmp(z) != 0 || a.r.Cmp(new(big.Rat).SetFrac(rA, rB)) != 0 {
-			t.Errorf("#%d QuoRemZZZ got %v, %v, %v; expected %v, %v", i, z, rA, rB, a.z, a.r)
-		}
-		if a.srA != rA.Sign() || a.srB != rB.Sign() {
-			t.Errorf("#%d QuoRemZZZ wrong signs, got %v, %v; expected %v, %v", i, rA.Sign(), rB.Sign(), a.srA, a.srB)
-		}
-	}
-}
diff --git a/vendor/gopkg.in/inf.v0/dec_test.go b/vendor/gopkg.in/inf.v0/dec_test.go
deleted file mode 100644
index e4b09b3fd..000000000
--- a/vendor/gopkg.in/inf.v0/dec_test.go
+++ /dev/null
@@ -1,379 +0,0 @@
-package inf_test
-
-import (
-	"bytes"
-	"encoding/gob"
-	"fmt"
-	"math/big"
-	"strings"
-	"testing"
-
-	"gopkg.in/inf.v0"
-)
-
-type decFunZZ func(z, x, y *inf.Dec) *inf.Dec
-type decArgZZ struct {
-	z, x, y *inf.Dec
-}
-
-var decSumZZ = []decArgZZ{
-	{inf.NewDec(0, 0), inf.NewDec(0, 0), inf.NewDec(0, 0)},
-	{inf.NewDec(1, 0), inf.NewDec(1, 0), inf.NewDec(0, 0)},
-	{inf.NewDec(1111111110, 0), inf.NewDec(123456789, 0), inf.NewDec(987654321, 0)},
-	{inf.NewDec(-1, 0), inf.NewDec(-1, 0), inf.NewDec(0, 0)},
-	{inf.NewDec(864197532, 0), inf.NewDec(-123456789, 0), inf.NewDec(987654321, 0)},
-	{inf.NewDec(-1111111110, 0), inf.NewDec(-123456789, 0), inf.NewDec(-987654321, 0)},
-	{inf.NewDec(12, 2), inf.NewDec(1, 1), inf.NewDec(2, 2)},
-}
-
-var decProdZZ = []decArgZZ{
-	{inf.NewDec(0, 0), inf.NewDec(0, 0), inf.NewDec(0, 0)},
-	{inf.NewDec(0, 0), inf.NewDec(1, 0), inf.NewDec(0, 0)},
-	{inf.NewDec(1, 0), inf.NewDec(1, 0), inf.NewDec(1, 0)},
-	{inf.NewDec(-991*991, 0), inf.NewDec(991, 0), inf.NewDec(-991, 0)},
-	{inf.NewDec(2, 3), inf.NewDec(1, 1), inf.NewDec(2, 2)},
-	{inf.NewDec(2, -3), inf.NewDec(1, -1), inf.NewDec(2, -2)},
-	{inf.NewDec(2, 3), inf.NewDec(1, 1), inf.NewDec(2, 2)},
-}
-
-func TestDecSignZ(t *testing.T) {
-	var zero inf.Dec
-	for _, a := range decSumZZ {
-		s := a.z.Sign()
-		e := a.z.Cmp(&zero)
-		if s != e {
-			t.Errorf("got %d; want %d for z = %v", s, e, a.z)
-		}
-	}
-}
-
-func TestDecAbsZ(t *testing.T) {
-	var zero inf.Dec
-	for _, a := range decSumZZ {
-		var z inf.Dec
-		z.Abs(a.z)
-		var e inf.Dec
-		e.Set(a.z)
-		if e.Cmp(&zero) < 0 {
-			e.Sub(&zero, &e)
-		}
-		if z.Cmp(&e) != 0 {
-			t.Errorf("got z = %v; want %v", z, e)
-		}
-	}
-}
-
-func testDecFunZZ(t *testing.T, msg string, f decFunZZ, a decArgZZ) {
-	var z inf.Dec
-	f(&z, a.x, a.y)
-	if (&z).Cmp(a.z) != 0 {
-		t.Errorf("%s%+v\n\tgot z = %v; want %v", msg, a, &z, a.z)
-	}
-}
-
-func TestDecSumZZ(t *testing.T) {
-	AddZZ := func(z, x, y *inf.Dec) *inf.Dec { return z.Add(x, y) }
-	SubZZ := func(z, x, y *inf.Dec) *inf.Dec { return z.Sub(x, y) }
-	for _, a := range decSumZZ {
-		arg := a
-		testDecFunZZ(t, "AddZZ", AddZZ, arg)
-
-		arg = decArgZZ{a.z, a.y, a.x}
-		testDecFunZZ(t, "AddZZ symmetric", AddZZ, arg)
-
-		arg = decArgZZ{a.x, a.z, a.y}
-		testDecFunZZ(t, "SubZZ", SubZZ, arg)
-
-		arg = decArgZZ{a.y, a.z, a.x}
-		testDecFunZZ(t, "SubZZ symmetric", SubZZ, arg)
-	}
-}
-
-func TestDecProdZZ(t *testing.T) {
-	MulZZ := func(z, x, y *inf.Dec) *inf.Dec { return z.Mul(x, y) }
-	for _, a := range decProdZZ {
-		arg := a
-		testDecFunZZ(t, "MulZZ", MulZZ, arg)
-
-		arg = decArgZZ{a.z, a.y, a.x}
-		testDecFunZZ(t, "MulZZ symmetric", MulZZ, arg)
-	}
-}
-
-var decUnscaledTests = []struct {
-	d  *inf.Dec
-	u  int64 // ignored when ok == false
-	ok bool
-}{
-	{new(inf.Dec), 0, true},
-	{inf.NewDec(-1<<63, 0), -1 << 63, true},
-	{inf.NewDec(-(-1<<63 + 1), 0), -(-1<<63 + 1), true},
-	{new(inf.Dec).Neg(inf.NewDec(-1<<63, 0)), 0, false},
-	{new(inf.Dec).Sub(inf.NewDec(-1<<63, 0), inf.NewDec(1, 0)), 0, false},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), 0, false},
-}
-
-func TestDecUnscaled(t *testing.T) {
-	for i, tt := range decUnscaledTests {
-		u, ok := tt.d.Unscaled()
-		if ok != tt.ok {
-			t.Errorf("#%d Unscaled: got %v, expected %v", i, ok, tt.ok)
-		} else if ok && u != tt.u {
-			t.Errorf("#%d Unscaled: got %v, expected %v", i, u, tt.u)
-		}
-	}
-}
-
-var decRoundTests = [...]struct {
-	in  *inf.Dec
-	s   inf.Scale
-	r   inf.Rounder
-	exp *inf.Dec
-}{
-	{inf.NewDec(123424999999999993, 15), 2, inf.RoundHalfUp, inf.NewDec(12342, 2)},
-	{inf.NewDec(123425000000000001, 15), 2, inf.RoundHalfUp, inf.NewDec(12343, 2)},
-	{inf.NewDec(123424999999999993, 15), 15, inf.RoundHalfUp, inf.NewDec(123424999999999993, 15)},
-	{inf.NewDec(123424999999999993, 15), 16, inf.RoundHalfUp, inf.NewDec(1234249999999999930, 16)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -1, inf.RoundHalfUp, inf.NewDec(1844674407370955162, -1)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -2, inf.RoundHalfUp, inf.NewDec(184467440737095516, -2)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -3, inf.RoundHalfUp, inf.NewDec(18446744073709552, -3)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -4, inf.RoundHalfUp, inf.NewDec(1844674407370955, -4)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -5, inf.RoundHalfUp, inf.NewDec(184467440737096, -5)},
-	{inf.NewDecBig(new(big.Int).Lsh(big.NewInt(1), 64), 0), -6, inf.RoundHalfUp, inf.NewDec(18446744073710, -6)},
-}
-
-func TestDecRound(t *testing.T) {
-	for i, tt := range decRoundTests {
-		z := new(inf.Dec).Round(tt.in, tt.s, tt.r)
-		if tt.exp.Cmp(z) != 0 {
-			t.Errorf("#%d Round got %v; expected %v", i, z, tt.exp)
-		}
-	}
-}
-
-var decStringTests = []struct {
-	in     string
-	out    string
-	val    int64
-	scale  inf.Scale // skip SetString if negative
-	ok     bool
-	scanOk bool
-}{
-	{in: "", ok: false, scanOk: false},
-	{in: "a", ok: false, scanOk: false},
-	{in: "z", ok: false, scanOk: false},
-	{in: "+", ok: false, scanOk: false},
-	{in: "-", ok: false, scanOk: false},
-	{in: "g", ok: false, scanOk: false},
-	{in: ".", ok: false, scanOk: false},
-	{in: ".-0", ok: false, scanOk: false},
-	{in: ".+0", ok: false, scanOk: false},
-	// Scannable but not SetStringable
-	{"0b", "ignored", 0, 0, false, true},
-	{"0x", "ignored", 0, 0, false, true},
-	{"0xg", "ignored", 0, 0, false, true},
-	{"0.0g", "ignored", 0, 1, false, true},
-	// examples from godoc for Dec
-	{"0", "0", 0, 0, true, true},
-	{"0.00", "0.00", 0, 2, true, true},
-	{"ignored", "0", 0, -2, true, false},
-	{"1", "1", 1, 0, true, true},
-	{"1.00", "1.00", 100, 2, true, true},
-	{"10", "10", 10, 0, true, true},
-	{"ignored", "10", 1, -1, true, false},
-	// other tests
-	{"+0", "0", 0, 0, true, true},
-	{"-0", "0", 0, 0, true, true},
-	{"0.0", "0.0", 0, 1, true, true},
-	{"0.1", "0.1", 1, 1, true, true},
-	{"0.", "0", 0, 0, true, true},
-	{"-10", "-10", -1, -1, true, true},
-	{"-1", "-1", -1, 0, true, true},
-	{"-0.1", "-0.1", -1, 1, true, true},
-	{"-0.01", "-0.01", -1, 2, true, true},
-	{"+0.", "0", 0, 0, true, true},
-	{"-0.", "0", 0, 0, true, true},
-	{".0", "0.0", 0, 1, true, true},
-	{"+.0", "0.0", 0, 1, true, true},
-	{"-.0", "0.0", 0, 1, true, true},
-	{"0.0000000000", "0.0000000000", 0, 10, true, true},
-	{"0.0000000001", "0.0000000001", 1, 10, true, true},
-	{"-0.0000000000", "0.0000000000", 0, 10, true, true},
-	{"-0.0000000001", "-0.0000000001", -1, 10, true, true},
-	{"-10", "-10", -10, 0, true, true},
-	{"+10", "10", 10, 0, true, true},
-	{"00", "0", 0, 0, true, true},
-	{"023", "23", 23, 0, true, true},      // decimal, not octal
-	{"-02.3", "-2.3", -23, 1, true, true}, // decimal, not octal
-}
-
-func TestDecGetString(t *testing.T) {
-	z := new(inf.Dec)
-	for i, test := range decStringTests {
-		if !test.ok {
-			continue
-		}
-		z.SetUnscaled(test.val)
-		z.SetScale(test.scale)
-
-		s := z.String()
-		if s != test.out {
-			t.Errorf("#%da got %s; want %s", i, s, test.out)
-		}
-
-		s = fmt.Sprintf("%d", z)
-		if s != test.out {
-			t.Errorf("#%db got %s; want %s", i, s, test.out)
-		}
-	}
-}
-
-func TestDecSetString(t *testing.T) {
-	tmp := new(inf.Dec)
-	for i, test := range decStringTests {
-		if test.scale < 0 {
-			// SetString only supports scale >= 0
-			continue
-		}
-		// initialize to a non-zero value so that issues with parsing
-		// 0 are detected
-		tmp.Set(inf.NewDec(1234567890, 123))
-		n1, ok1 := new(inf.Dec).SetString(test.in)
-		n2, ok2 := tmp.SetString(test.in)
-		expected := inf.NewDec(test.val, test.scale)
-		if ok1 != test.ok || ok2 != test.ok {
-			t.Errorf("#%d (input '%s') ok incorrect (should be %t)", i, test.in, test.ok)
-			continue
-		}
-		if !ok1 {
-			if n1 != nil {
-				t.Errorf("#%d (input '%s') n1 != nil", i, test.in)
-			}
-			continue
-		}
-		if !ok2 {
-			if n2 != nil {
-				t.Errorf("#%d (input '%s') n2 != nil", i, test.in)
-			}
-			continue
-		}
-
-		if n1.Cmp(expected) != 0 {
-			t.Errorf("#%d (input '%s') got: %s want: %d", i, test.in, n1, test.val)
-		}
-		if n2.Cmp(expected) != 0 {
-			t.Errorf("#%d (input '%s') got: %s want: %d", i, test.in, n2, test.val)
-		}
-	}
-}
-
-func TestDecScan(t *testing.T) {
-	tmp := new(inf.Dec)
-	for i, test := range decStringTests {
-		if test.scale < 0 {
-			// SetString only supports scale >= 0
-			continue
-		}
-		// initialize to a non-zero value so that issues with parsing
-		// 0 are detected
-		tmp.Set(inf.NewDec(1234567890, 123))
-		n1, n2 := new(inf.Dec), tmp
-		nn1, err1 := fmt.Sscan(test.in, n1)
-		nn2, err2 := fmt.Sscan(test.in, n2)
-		if !test.scanOk {
-			if err1 == nil || err2 == nil {
-				t.Errorf("#%d (input '%s') ok incorrect, should be %t", i, test.in, test.scanOk)
-			}
-			continue
-		}
-		expected := inf.NewDec(test.val, test.scale)
-		if nn1 != 1 || err1 != nil || nn2 != 1 || err2 != nil {
-			t.Errorf("#%d (input '%s') error %d %v, %d %v", i, test.in, nn1, err1, nn2, err2)
-			continue
-		}
-		if n1.Cmp(expected) != 0 {
-			t.Errorf("#%d (input '%s') got: %s want: %d", i, test.in, n1, test.val)
-		}
-		if n2.Cmp(expected) != 0 {
-			t.Errorf("#%d (input '%s') got: %s want: %d", i, test.in, n2, test.val)
-		}
-	}
-}
-
-var decScanNextTests = []struct {
-	in   string
-	ok   bool
-	next rune
-}{
-	{"", false, 0},
-	{"a", false, 'a'},
-	{"z", false, 'z'},
-	{"+", false, 0},
-	{"-", false, 0},
-	{"g", false, 'g'},
-	{".", false, 0},
-	{".-0", false, '-'},
-	{".+0", false, '+'},
-	{"0b", true, 'b'},
-	{"0x", true, 'x'},
-	{"0xg", true, 'x'},
-	{"0.0g", true, 'g'},
-}
-
-func TestDecScanNext(t *testing.T) {
-	for i, test := range decScanNextTests {
-		rdr := strings.NewReader(test.in)
-		n1 := new(inf.Dec)
-		nn1, _ := fmt.Fscan(rdr, n1)
-		if (test.ok && nn1 == 0) || (!test.ok && nn1 > 0) {
-			t.Errorf("#%d (input '%s') ok incorrect should be %t", i, test.in, test.ok)
-			continue
-		}
-		r := rune(0)
-		nn2, err := fmt.Fscanf(rdr, "%c", &r)
-		if test.next != r {
-			t.Errorf("#%d (input '%s') next incorrect, got %c should be %c, %d, %v", i, test.in, r, test.next, nn2, err)
-		}
-	}
-}
-
-var decGobEncodingTests = []string{
-	"0",
-	"1",
-	"2",
-	"10",
-	"42",
-	"1234567890",
-	"298472983472983471903246121093472394872319615612417471234712061",
-}
-
-func TestDecGobEncoding(t *testing.T) {
-	var medium bytes.Buffer
-	enc := gob.NewEncoder(&medium)
-	dec := gob.NewDecoder(&medium)
-	for i, test := range decGobEncodingTests {
-		for j := 0; j < 2; j++ {
-			for k := inf.Scale(-5); k <= 5; k++ {
-				medium.Reset() // empty buffer for each test case (in case of failures)
-				stest := test
-				if j != 0 {
-					// negative numbers
-					stest = "-" + test
-				}
-				var tx inf.Dec
-				tx.SetString(stest)
-				tx.SetScale(k) // test with positive, negative, and zero scale
-				if err := enc.Encode(&tx); err != nil {
-					t.Errorf("#%d%c: encoding failed: %s", i, 'a'+j, err)
-				}
-				var rx inf.Dec
-				if err := dec.Decode(&rx); err != nil {
-					t.Errorf("#%d%c: decoding failed: %s", i, 'a'+j, err)
-				}
-				if rx.Cmp(&tx) != 0 {
-					t.Errorf("#%d%c: transmission failed: got %s want %s", i, 'a'+j, &rx, &tx)
-				}
-			}
-		}
-	}
-}
diff --git a/vendor/gopkg.in/inf.v0/example_test.go b/vendor/gopkg.in/inf.v0/example_test.go
deleted file mode 100644
index fa1e54d16..000000000
--- a/vendor/gopkg.in/inf.v0/example_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package inf_test
-
-import (
-	"fmt"
-	"log"
-)
-
-import "gopkg.in/inf.v0"
-
-func ExampleDec_SetString() {
-	d := new(inf.Dec)
-	d.SetString("012345.67890") // decimal; leading 0 ignored; trailing 0 kept
-	fmt.Println(d)
-	// Output: 12345.67890
-}
-
-func ExampleDec_Scan() {
-	// The Scan function is rarely used directly;
-	// the fmt package recognizes it as an implementation of fmt.Scanner.
-	d := new(inf.Dec)
-	_, err := fmt.Sscan("184467440.73709551617", d)
-	if err != nil {
-		log.Println("error scanning value:", err)
-	} else {
-		fmt.Println(d)
-	}
-	// Output: 184467440.73709551617
-}
-
-func ExampleDec_QuoRound_scale2RoundDown() {
-	// 10 / 3 is an infinite decimal; it has no exact Dec representation
-	x, y := inf.NewDec(10, 0), inf.NewDec(3, 0)
-	// use 2 digits beyond the decimal point, round towards 0
-	z := new(inf.Dec).QuoRound(x, y, 2, inf.RoundDown)
-	fmt.Println(z)
-	// Output: 3.33
-}
-
-func ExampleDec_QuoRound_scale2RoundCeil() {
-	// -42 / 400 is an finite decimal with 3 digits beyond the decimal point
-	x, y := inf.NewDec(-42, 0), inf.NewDec(400, 0)
-	// use 2 digits beyond decimal point, round towards positive infinity
-	z := new(inf.Dec).QuoRound(x, y, 2, inf.RoundCeil)
-	fmt.Println(z)
-	// Output: -0.10
-}
-
-func ExampleDec_QuoExact_ok() {
-	// 1 / 25 is a finite decimal; it has exact Dec representation
-	x, y := inf.NewDec(1, 0), inf.NewDec(25, 0)
-	z := new(inf.Dec).QuoExact(x, y)
-	fmt.Println(z)
-	// Output: 0.04
-}
-
-func ExampleDec_QuoExact_fail() {
-	// 1 / 3 is an infinite decimal; it has no exact Dec representation
-	x, y := inf.NewDec(1, 0), inf.NewDec(3, 0)
-	z := new(inf.Dec).QuoExact(x, y)
-	fmt.Println(z)
-	// Output: <nil>
-}
diff --git a/vendor/gopkg.in/inf.v0/rounder.go b/vendor/gopkg.in/inf.v0/rounder.go
deleted file mode 100644
index 3a97ef529..000000000
--- a/vendor/gopkg.in/inf.v0/rounder.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package inf
-
-import (
-	"math/big"
-)
-
-// Rounder represents a method for rounding the (possibly infinite decimal)
-// result of a division to a finite Dec. It is used by Dec.Round() and
-// Dec.Quo().
-//
-// See the Example for results of using each Rounder with some sample values.
-//
-type Rounder rounder
-
-// See http://speleotrove.com/decimal/damodel.html#refround for more detailed
-// definitions of these rounding modes.
-var (
-	RoundDown     Rounder // towards 0
-	RoundUp       Rounder // away from 0
-	RoundFloor    Rounder // towards -infinity
-	RoundCeil     Rounder // towards +infinity
-	RoundHalfDown Rounder // to nearest; towards 0 if same distance
-	RoundHalfUp   Rounder // to nearest; away from 0 if same distance
-	RoundHalfEven Rounder // to nearest; even last digit if same distance
-)
-
-// RoundExact is to be used in the case when rounding is not necessary.
-// When used with Quo or Round, it returns the result verbatim when it can be
-// expressed exactly with the given precision, and it returns nil otherwise.
-// QuoExact is a shorthand for using Quo with RoundExact.
-var RoundExact Rounder
-
-type rounder interface {
-
-	// When UseRemainder() returns true, the Round() method is passed the
-	// remainder of the division, expressed as the numerator and denominator of
-	// a rational.
-	UseRemainder() bool
-
-	// Round sets the rounded value of a quotient to z, and returns z.
-	// quo is rounded down (truncated towards zero) to the scale obtained from
-	// the Scaler in Quo().
-	//
-	// When the remainder is not used, remNum and remDen are nil.
-	// When used, the remainder is normalized between -1 and 1; that is:
-	//
-	//  -|remDen| < remNum < |remDen|
-	//
-	// remDen has the same sign as y, and remNum is zero or has the same sign
-	// as x.
-	Round(z, quo *Dec, remNum, remDen *big.Int) *Dec
-}
-
-type rndr struct {
-	useRem bool
-	round  func(z, quo *Dec, remNum, remDen *big.Int) *Dec
-}
-
-func (r rndr) UseRemainder() bool {
-	return r.useRem
-}
-
-func (r rndr) Round(z, quo *Dec, remNum, remDen *big.Int) *Dec {
-	return r.round(z, quo, remNum, remDen)
-}
-
-var intSign = []*big.Int{big.NewInt(-1), big.NewInt(0), big.NewInt(1)}
-
-func roundHalf(f func(c int, odd uint) (roundUp bool)) func(z, q *Dec, rA, rB *big.Int) *Dec {
-	return func(z, q *Dec, rA, rB *big.Int) *Dec {
-		z.Set(q)
-		brA, brB := rA.BitLen(), rB.BitLen()
-		if brA < brB-1 {
-			// brA < brB-1 => |rA| < |rB/2|
-			return z
-		}
-		roundUp := false
-		srA, srB := rA.Sign(), rB.Sign()
-		s := srA * srB
-		if brA == brB-1 {
-			rA2 := new(big.Int).Lsh(rA, 1)
-			if s < 0 {
-				rA2.Neg(rA2)
-			}
-			roundUp = f(rA2.Cmp(rB)*srB, z.UnscaledBig().Bit(0))
-		} else {
-			// brA > brB-1 => |rA| > |rB/2|
-			roundUp = true
-		}
-		if roundUp {
-			z.UnscaledBig().Add(z.UnscaledBig(), intSign[s+1])
-		}
-		return z
-	}
-}
-
-func init() {
-	RoundExact = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			if rA.Sign() != 0 {
-				return nil
-			}
-			return z.Set(q)
-		}}
-	RoundDown = rndr{false,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			return z.Set(q)
-		}}
-	RoundUp = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign() != 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[rA.Sign()*rB.Sign()+1])
-			}
-			return z
-		}}
-	RoundFloor = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign()*rB.Sign() < 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[0])
-			}
-			return z
-		}}
-	RoundCeil = rndr{true,
-		func(z, q *Dec, rA, rB *big.Int) *Dec {
-			z.Set(q)
-			if rA.Sign()*rB.Sign() > 0 {
-				z.UnscaledBig().Add(z.UnscaledBig(), intSign[2])
-			}
-			return z
-		}}
-	RoundHalfDown = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c > 0
-		})}
-	RoundHalfUp = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c >= 0
-		})}
-	RoundHalfEven = rndr{true, roundHalf(
-		func(c int, odd uint) bool {
-			return c > 0 || c == 0 && odd == 1
-		})}
-}
diff --git a/vendor/gopkg.in/inf.v0/rounder_example_test.go b/vendor/gopkg.in/inf.v0/rounder_example_test.go
deleted file mode 100644
index 803c1d7ee..000000000
--- a/vendor/gopkg.in/inf.v0/rounder_example_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package inf_test
-
-import (
-	"fmt"
-	"os"
-	"text/tabwriter"
-
-	"gopkg.in/inf.v0"
-)
-
-// This example displays the results of Dec.Round with each of the Rounders.
-//
-func ExampleRounder() {
-	var vals = []struct {
-		x string
-		s inf.Scale
-	}{
-		{"-0.18", 1}, {"-0.15", 1}, {"-0.12", 1}, {"-0.10", 1},
-		{"-0.08", 1}, {"-0.05", 1}, {"-0.02", 1}, {"0.00", 1},
-		{"0.02", 1}, {"0.05", 1}, {"0.08", 1}, {"0.10", 1},
-		{"0.12", 1}, {"0.15", 1}, {"0.18", 1},
-	}
-
-	var rounders = []struct {
-		name    string
-		rounder inf.Rounder
-	}{
-		{"RoundDown", inf.RoundDown}, {"RoundUp", inf.RoundUp},
-		{"RoundCeil", inf.RoundCeil}, {"RoundFloor", inf.RoundFloor},
-		{"RoundHalfDown", inf.RoundHalfDown}, {"RoundHalfUp", inf.RoundHalfUp},
-		{"RoundHalfEven", inf.RoundHalfEven}, {"RoundExact", inf.RoundExact},
-	}
-
-	fmt.Println("The results of new(inf.Dec).Round(x, s, inf.RoundXXX):\n")
-	w := tabwriter.NewWriter(os.Stdout, 0, 0, 1, ' ', tabwriter.AlignRight)
-	fmt.Fprint(w, "x\ts\t|\t")
-	for _, r := range rounders {
-		fmt.Fprintf(w, "%s\t", r.name[5:])
-	}
-	fmt.Fprintln(w)
-	for _, v := range vals {
-		fmt.Fprintf(w, "%s\t%d\t|\t", v.x, v.s)
-		for _, r := range rounders {
-			x, _ := new(inf.Dec).SetString(v.x)
-			z := new(inf.Dec).Round(x, v.s, r.rounder)
-			fmt.Fprintf(w, "%d\t", z)
-		}
-		fmt.Fprintln(w)
-	}
-	w.Flush()
-
-	// Output:
-	// The results of new(inf.Dec).Round(x, s, inf.RoundXXX):
-	//
-	//      x s | Down   Up Ceil Floor HalfDown HalfUp HalfEven Exact
-	//  -0.18 1 | -0.1 -0.2 -0.1  -0.2     -0.2   -0.2     -0.2 <nil>
-	//  -0.15 1 | -0.1 -0.2 -0.1  -0.2     -0.1   -0.2     -0.2 <nil>
-	//  -0.12 1 | -0.1 -0.2 -0.1  -0.2     -0.1   -0.1     -0.1 <nil>
-	//  -0.10 1 | -0.1 -0.1 -0.1  -0.1     -0.1   -0.1     -0.1  -0.1
-	//  -0.08 1 |  0.0 -0.1  0.0  -0.1     -0.1   -0.1     -0.1 <nil>
-	//  -0.05 1 |  0.0 -0.1  0.0  -0.1      0.0   -0.1      0.0 <nil>
-	//  -0.02 1 |  0.0 -0.1  0.0  -0.1      0.0    0.0      0.0 <nil>
-	//   0.00 1 |  0.0  0.0  0.0   0.0      0.0    0.0      0.0   0.0
-	//   0.02 1 |  0.0  0.1  0.1   0.0      0.0    0.0      0.0 <nil>
-	//   0.05 1 |  0.0  0.1  0.1   0.0      0.0    0.1      0.0 <nil>
-	//   0.08 1 |  0.0  0.1  0.1   0.0      0.1    0.1      0.1 <nil>
-	//   0.10 1 |  0.1  0.1  0.1   0.1      0.1    0.1      0.1   0.1
-	//   0.12 1 |  0.1  0.2  0.2   0.1      0.1    0.1      0.1 <nil>
-	//   0.15 1 |  0.1  0.2  0.2   0.1      0.1    0.2      0.2 <nil>
-	//   0.18 1 |  0.1  0.2  0.2   0.1      0.2    0.2      0.2 <nil>
-
-}
diff --git a/vendor/gopkg.in/inf.v0/rounder_test.go b/vendor/gopkg.in/inf.v0/rounder_test.go
deleted file mode 100644
index d7e14c58c..000000000
--- a/vendor/gopkg.in/inf.v0/rounder_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package inf_test
-
-import (
-	"math/big"
-	"testing"
-
-	"gopkg.in/inf.v0"
-)
-
-var decRounderInputs = [...]struct {
-	quo    *inf.Dec
-	rA, rB *big.Int
-}{
-	// examples from go language spec
-	{inf.NewDec(1, 0), big.NewInt(2), big.NewInt(3)},   //  5 /  3
-	{inf.NewDec(-1, 0), big.NewInt(-2), big.NewInt(3)}, // -5 /  3
-	{inf.NewDec(-1, 0), big.NewInt(2), big.NewInt(-3)}, //  5 / -3
-	{inf.NewDec(1, 0), big.NewInt(-2), big.NewInt(-3)}, // -5 / -3
-	// examples from godoc
-	{inf.NewDec(-1, 1), big.NewInt(-8), big.NewInt(10)},
-	{inf.NewDec(-1, 1), big.NewInt(-5), big.NewInt(10)},
-	{inf.NewDec(-1, 1), big.NewInt(-2), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(-8), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(-5), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(-2), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(0), big.NewInt(1)},
-	{inf.NewDec(0, 1), big.NewInt(2), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(5), big.NewInt(10)},
-	{inf.NewDec(0, 1), big.NewInt(8), big.NewInt(10)},
-	{inf.NewDec(1, 1), big.NewInt(2), big.NewInt(10)},
-	{inf.NewDec(1, 1), big.NewInt(5), big.NewInt(10)},
-	{inf.NewDec(1, 1), big.NewInt(8), big.NewInt(10)},
-}
-
-var decRounderResults = [...]struct {
-	rounder inf.Rounder
-	results [len(decRounderInputs)]*inf.Dec
-}{
-	{inf.RoundExact, [...]*inf.Dec{nil, nil, nil, nil,
-		nil, nil, nil, nil, nil, nil,
-		inf.NewDec(0, 1), nil, nil, nil, nil, nil, nil}},
-	{inf.RoundDown, [...]*inf.Dec{
-		inf.NewDec(1, 0), inf.NewDec(-1, 0), inf.NewDec(-1, 0), inf.NewDec(1, 0),
-		inf.NewDec(-1, 1), inf.NewDec(-1, 1), inf.NewDec(-1, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(1, 1), inf.NewDec(1, 1), inf.NewDec(1, 1)}},
-	{inf.RoundUp, [...]*inf.Dec{
-		inf.NewDec(2, 0), inf.NewDec(-2, 0), inf.NewDec(-2, 0), inf.NewDec(2, 0),
-		inf.NewDec(-2, 1), inf.NewDec(-2, 1), inf.NewDec(-2, 1),
-		inf.NewDec(-1, 1), inf.NewDec(-1, 1), inf.NewDec(-1, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(1, 1), inf.NewDec(1, 1), inf.NewDec(1, 1),
-		inf.NewDec(2, 1), inf.NewDec(2, 1), inf.NewDec(2, 1)}},
-	{inf.RoundHalfDown, [...]*inf.Dec{
-		inf.NewDec(2, 0), inf.NewDec(-2, 0), inf.NewDec(-2, 0), inf.NewDec(2, 0),
-		inf.NewDec(-2, 1), inf.NewDec(-1, 1), inf.NewDec(-1, 1),
-		inf.NewDec(-1, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(1, 1),
-		inf.NewDec(1, 1), inf.NewDec(1, 1), inf.NewDec(2, 1)}},
-	{inf.RoundHalfUp, [...]*inf.Dec{
-		inf.NewDec(2, 0), inf.NewDec(-2, 0), inf.NewDec(-2, 0), inf.NewDec(2, 0),
-		inf.NewDec(-2, 1), inf.NewDec(-2, 1), inf.NewDec(-1, 1),
-		inf.NewDec(-1, 1), inf.NewDec(-1, 1), inf.NewDec(0, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(0, 1), inf.NewDec(1, 1), inf.NewDec(1, 1),
-		inf.NewDec(1, 1), inf.NewDec(2, 1), inf.NewDec(2, 1)}},
-	{inf.RoundHalfEven, [...]*inf.Dec{
-		inf.NewDec(2, 0), inf.NewDec(-2, 0), inf.NewDec(-2, 0), inf.NewDec(2, 0),
-		inf.NewDec(-2, 1), inf.NewDec(-2, 1), inf.NewDec(-1, 1),
-		inf.NewDec(-1, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(1, 1),
-		inf.NewDec(1, 1), inf.NewDec(2, 1), inf.NewDec(2, 1)}},
-	{inf.RoundFloor, [...]*inf.Dec{
-		inf.NewDec(1, 0), inf.NewDec(-2, 0), inf.NewDec(-2, 0), inf.NewDec(1, 0),
-		inf.NewDec(-2, 1), inf.NewDec(-2, 1), inf.NewDec(-2, 1),
-		inf.NewDec(-1, 1), inf.NewDec(-1, 1), inf.NewDec(-1, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(1, 1), inf.NewDec(1, 1), inf.NewDec(1, 1)}},
-	{inf.RoundCeil, [...]*inf.Dec{
-		inf.NewDec(2, 0), inf.NewDec(-1, 0), inf.NewDec(-1, 0), inf.NewDec(2, 0),
-		inf.NewDec(-1, 1), inf.NewDec(-1, 1), inf.NewDec(-1, 1),
-		inf.NewDec(0, 1), inf.NewDec(0, 1), inf.NewDec(0, 1),
-		inf.NewDec(0, 1),
-		inf.NewDec(1, 1), inf.NewDec(1, 1), inf.NewDec(1, 1),
-		inf.NewDec(2, 1), inf.NewDec(2, 1), inf.NewDec(2, 1)}},
-}
-
-func TestDecRounders(t *testing.T) {
-	for i, a := range decRounderResults {
-		for j, input := range decRounderInputs {
-			q := new(inf.Dec).Set(input.quo)
-			rA, rB := new(big.Int).Set(input.rA), new(big.Int).Set(input.rB)
-			res := a.rounder.Round(new(inf.Dec), q, rA, rB)
-			if a.results[j] == nil && res == nil {
-				continue
-			}
-			if (a.results[j] == nil && res != nil) ||
-				(a.results[j] != nil && res == nil) ||
-				a.results[j].Cmp(res) != 0 {
-				t.Errorf("#%d,%d Rounder got %v; expected %v", i, j, res, a.results[j])
-			}
-		}
-	}
-}