diff --git a/.gitignore b/.gitignore
index 9f9b4b2ea..e72b30e2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,61 +41,23 @@ misc/docker/camlistored/djpeg
 # vendored data we don't want to retain
 /vendor/**/.travis.yml
 /vendor/**/.gitignore
-/vendor/cloud.google.com/go/datastore/testdata
-/vendor/github.com/cznic/kv/_testdata
-/vendor/github.com/cznic/lldb/testdata
-/vendor/github.com/cznic/zappy/testdata/zappy_error_src_dump_purego.bin
-/vendor/github.com/garyburd/go-oauth/examples
-/vendor/github.com/golang/protobuf/proto/testdata
-/vendor/github.com/gopherjs/gopherjs/tests/testdata
-/vendor/github.com/gorilla/websocket/examples
 # contains a private key
 /vendor/github.com/miekg/dns/server_test.go
 /vendor/github.com/mattn/go-sqlite3/sqlite3_windows.c
-/vendor/github.com/rwcarlsen/goexif/exif/corrupt
 /vendor/github.com/rwcarlsen/goexif/exif/example_test.go
 /vendor/github.com/rwcarlsen/goexif/exif/exif_test.go
-/vendor/github.com/rwcarlsen/goexif/exif/samples
 /vendor/github.com/rwcarlsen/goexif/exif/sample1.jpg
 /vendor/github.com/rwcarlsen/goexif/tiff/sample1.tif
 /vendor/github.com/rwcarlsen/goexif/exif/regen_regress.go
 /vendor/github.com/rwcarlsen/goexif/exif/regress_expected_test.go
 /vendor/github.com/rwcarlsen/goexif/tiff/tiff_test.go
-/vendor/github.com/russross/blackfriday/testdata
-/vendor/github.com/syndtr/goleveldb/leveldb/testutil
-/vendor/github.com/syndtr/goleveldb/manualtest
-/vendor/github.com/tgulacsi/picago/testdata
-/vendor/github.com/tgulacsi/picago/testdata
-/vendor/go4.org/jsonconfig/testdata
-/vendor/golang.org/x/image/testdata
-/vendor/golang.org/x/image/font/testdata
-/vendor/golang.org/x/net/html/charset/testdata
-/vendor/golang.org/x/net/html/testdata
-/vendor/golang.org/x/net/http2/testdata
+# contains a private key
+/vendor/golang.org/x/crypto/acme/jws_test.go
 # oauth2 tests have private keys which cause trouble for devcam review
 /vendor/golang.org/x/oauth2/google/example_test.go
 /vendor/golang.org/x/oauth2/google/google_test.go
-/vendor/golang.org/x/oauth2/google/testdata/
 /vendor/golang.org/x/oauth2/jwt/example_test.go
 /vendor/golang.org/x/oauth2/jwt/jwt_test.go
-/vendor/golang.org/x/text/encoding/testdata
-/vendor/golang.org/x/text/language/testdata
-/vendor/golang.org/x/tools/go/gcimporter15/testdata
-/vendor/google.golang.org/grpc/benchmark
-/vendor/google.golang.org/grpc/examples
-/vendor/google.golang.org/grpc/interop/client/testdata
-/vendor/google.golang.org/grpc/interop/server/testdata
-/vendor/google.golang.org/grpc/reflection
-/vendor/google.golang.org/grpc/stress
-/vendor/google.golang.org/grpc/test
-/vendor/google.golang.org/grpc/testdata
-/vendor/google.golang.org/grpc/transport/testdata
-/vendor/myitcv.io/gogenerate/_testFiles
-/vendor/myitcv.io/react/examples
 /vendor/myitcv.io/react/internal/dev/dev.inc.js
 /vendor/myitcv.io/react/internal/preact/preact.inc.js
 /vendor/myitcv.io/react/internal/prod/prod.inc.js
-/vendor/myitcv.io/react/_scripts
-/vendor/myitcv.io/react/_talks
-/vendor/myitcv.io/react/_vendor
-/vendor/rsc.io/pdf/pdfpasswd/main.go
diff --git a/Gopkg.lock b/Gopkg.lock
index 4c835f76e..e58a9af3a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -3,12 +3,26 @@
 
 [[projects]]
   name = "bazil.org/fuse"
-  packages = [".","fs","fuseutil","syscallx"]
+  packages = [
+    ".",
+    "fs",
+    "fuseutil",
+    "syscallx"
+  ]
   revision = "371fbbdaa8987b715bdd21d6adc4c9b20155f748"
 
 [[projects]]
   name = "cloud.google.com/go"
-  packages = ["compute/metadata","datastore","internal","internal/bundler","logging","logging/apiv2","logging/internal","storage"]
+  packages = [
+    "compute/metadata",
+    "datastore",
+    "internal",
+    "internal/bundler",
+    "logging",
+    "logging/apiv2",
+    "logging/internal",
+    "storage"
+  ]
   revision = "b70ccc799b9d019708c3eb9395acef6e3f6b7bc8"
 
 [[projects]]
@@ -29,7 +43,11 @@
 
 [[projects]]
   name = "github.com/cznic/internal"
-  packages = ["buffer","file","slice"]
+  packages = [
+    "buffer",
+    "file",
+    "slice"
+  ]
   revision = "4747030f7cf2f4c0a01512b00cd68734b167ac3b"
 
 [[projects]]
@@ -86,7 +104,16 @@
 [[projects]]
   branch = "master"
   name = "github.com/golang/protobuf"
-  packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/empty","ptypes/struct","ptypes/timestamp","ptypes/wrappers"]
+  packages = [
+    "proto",
+    "ptypes",
+    "ptypes/any",
+    "ptypes/duration",
+    "ptypes/empty",
+    "ptypes/struct",
+    "ptypes/timestamp",
+    "ptypes/wrappers"
+  ]
   revision = "1e59b77b52bf8e4b449a57e6f79f21226d571845"
 
 [[projects]]
@@ -101,7 +128,20 @@
 
 [[projects]]
   name = "github.com/gopherjs/gopherjs"
-  packages = [".","build","compiler","compiler/analysis","compiler/astutil","compiler/filter","compiler/natives","compiler/prelude","compiler/typesutil","internal/sysutil","js","nosync"]
+  packages = [
+    ".",
+    "build",
+    "compiler",
+    "compiler/analysis",
+    "compiler/astutil",
+    "compiler/filter",
+    "compiler/natives",
+    "compiler/prelude",
+    "compiler/typesutil",
+    "internal/sysutil",
+    "js",
+    "nosync"
+  ]
   revision = "b40cd48c38f9a18eb3db20d163bad78de12cf0b7"
 
 [[projects]]
@@ -123,7 +163,10 @@
 
 [[projects]]
   name = "github.com/hjfreyer/taglib-go"
-  packages = ["taglib","taglib/id3"]
+  packages = [
+    "taglib",
+    "taglib/id3"
+  ]
   revision = "0ef8bba9c41b66c12f60ce9833786838d2c2d3d8"
 
 [[projects]]
@@ -144,7 +187,10 @@
 
 [[projects]]
   name = "github.com/lib/pq"
-  packages = [".","oid"]
+  packages = [
+    ".",
+    "oid"
+  ]
   revision = "9afcd9aa793101bd0536da34e74ae0123345bab1"
 
 [[projects]]
@@ -197,15 +243,12 @@
 
 [[projects]]
   name = "github.com/rwcarlsen/goexif"
-  packages = ["exif","tiff"]
+  packages = [
+    "exif",
+    "tiff"
+  ]
   revision = "709fab3d192d7c62f86043caff1e7e3fb0f42bd8"
 
-[[projects]]
-  branch = "master"
-  name = "github.com/shurcooL/go"
-  packages = ["importgraphutil"]
-  revision = "004faa6b0118cf52635363b72b51cdcc297800a2"
-
 [[projects]]
   branch = "master"
   name = "github.com/shurcooL/httpfs"
@@ -229,7 +272,20 @@
 
 [[projects]]
   name = "github.com/syndtr/goleveldb"
-  packages = ["leveldb","leveldb/cache","leveldb/comparer","leveldb/errors","leveldb/filter","leveldb/iterator","leveldb/journal","leveldb/memdb","leveldb/opt","leveldb/storage","leveldb/table","leveldb/util"]
+  packages = [
+    "leveldb",
+    "leveldb/cache",
+    "leveldb/comparer",
+    "leveldb/errors",
+    "leveldb/filter",
+    "leveldb/iterator",
+    "leveldb/journal",
+    "leveldb/memdb",
+    "leveldb/opt",
+    "leveldb/storage",
+    "leveldb/table",
+    "leveldb/util"
+  ]
   revision = "34011bf325bce385408353a30b101fe5e923eb6e"
 
 [[projects]]
@@ -239,27 +295,87 @@
 
 [[projects]]
   name = "go4.org"
-  packages = ["cloud/cloudlaunch","cloud/google/gceutil","cloud/google/gcsutil","ctxutil","errorutil","fault","jsonconfig","legal","lock","net/throttle","oauthutil","readerutil","strutil","syncutil","syncutil/singleflight","types","wkfs","wkfs/gcs","writerutil"]
+  packages = [
+    "cloud/cloudlaunch",
+    "cloud/google/gceutil",
+    "cloud/google/gcsutil",
+    "ctxutil",
+    "errorutil",
+    "fault",
+    "jsonconfig",
+    "legal",
+    "lock",
+    "net/throttle",
+    "oauthutil",
+    "readerutil",
+    "strutil",
+    "syncutil",
+    "syncutil/singleflight",
+    "types",
+    "wkfs",
+    "wkfs/gcs",
+    "writerutil"
+  ]
   revision = "c3a8ba339e20006b054736f8eb9fc5e1d5fa6eab"
 
 [[projects]]
   name = "golang.org/x/crypto"
-  packages = ["acme","acme/autocert","cast5","nacl/secretbox","openpgp","openpgp/armor","openpgp/elgamal","openpgp/errors","openpgp/packet","openpgp/s2k","pbkdf2","poly1305","salsa20/salsa","scrypt","ssh/terminal"]
+  packages = [
+    "acme",
+    "acme/autocert",
+    "cast5",
+    "nacl/secretbox",
+    "openpgp",
+    "openpgp/armor",
+    "openpgp/elgamal",
+    "openpgp/errors",
+    "openpgp/packet",
+    "openpgp/s2k",
+    "pbkdf2",
+    "poly1305",
+    "salsa20/salsa",
+    "scrypt",
+    "ssh/terminal"
+  ]
   revision = "13931e22f9e72ea58bb73048bc752b48c6d4d4ac"
 
 [[projects]]
   name = "golang.org/x/image"
-  packages = ["draw","math/f64","tiff","tiff/lzw"]
+  packages = [
+    "draw",
+    "math/f64",
+    "tiff",
+    "tiff/lzw"
+  ]
   revision = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7"
 
 [[projects]]
   name = "golang.org/x/net"
-  packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace","xsrftoken"]
+  packages = [
+    "context",
+    "context/ctxhttp",
+    "html",
+    "html/atom",
+    "html/charset",
+    "http2",
+    "http2/hpack",
+    "idna",
+    "internal/timeseries",
+    "lex/httplex",
+    "trace",
+    "xsrftoken"
+  ]
   revision = "d866cfc389cec985d6fda2859936a575a55a3ab6"
 
 [[projects]]
   name = "golang.org/x/oauth2"
-  packages = [".","google","internal","jws","jwt"]
+  packages = [
+    ".",
+    "google",
+    "internal",
+    "jws",
+    "jwt"
+  ]
   revision = "197281d4e0ecd78c33865daf9c6e51626feefcb2"
 
 [[projects]]
@@ -269,12 +385,43 @@
 
 [[projects]]
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
+  packages = [
+    "unix",
+    "windows"
+  ]
   revision = "fff93fa7cd278d84afc205751523809c464168ab"
 
 [[projects]]
   name = "golang.org/x/text"
-  packages = [".","collate","collate/build","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
+  packages = [
+    ".",
+    "collate",
+    "collate/build",
+    "encoding",
+    "encoding/charmap",
+    "encoding/htmlindex",
+    "encoding/internal",
+    "encoding/internal/identifier",
+    "encoding/japanese",
+    "encoding/korean",
+    "encoding/simplifiedchinese",
+    "encoding/traditionalchinese",
+    "encoding/unicode",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "internal/utf8internal",
+    "language",
+    "runes",
+    "secure/bidirule",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable"
+  ]
   revision = "88f656faf3f37f690df1a32515b479415e1a6769"
 
 [[projects]]
@@ -284,35 +431,97 @@
 
 [[projects]]
   name = "golang.org/x/tools"
-  packages = ["go/buildutil","go/gcimporter15","go/types/typeutil","refactor/importgraph"]
+  packages = [
+    "go/gcimporter15",
+    "go/types/typeutil"
+  ]
   revision = "e531a2a1c15f94033f6fa87666caeb19a688175f"
 
 [[projects]]
   name = "google.golang.org/api"
-  packages = ["cloudresourcemanager/v1","compute/v1","drive/v2","drive/v3","gensupport","googleapi","googleapi/internal/uritemplates","googleapi/transport","internal","iterator","option","servicemanagement/v1","sqladmin/v1beta3","storage/v1","transport"]
+  packages = [
+    "cloudresourcemanager/v1",
+    "compute/v1",
+    "drive/v2",
+    "drive/v3",
+    "gensupport",
+    "googleapi",
+    "googleapi/internal/uritemplates",
+    "googleapi/transport",
+    "internal",
+    "iterator",
+    "option",
+    "servicemanagement/v1",
+    "sqladmin/v1beta3",
+    "storage/v1",
+    "transport"
+  ]
   revision = "48e49d1645e228d1c50c3d54fb476b2224477303"
 
 [[projects]]
   name = "google.golang.org/appengine"
-  packages = [".","internal","internal/app_identity","internal/base","internal/datastore","internal/log","internal/modules","internal/remote_api","internal/socket","internal/urlfetch","socket","urlfetch"]
+  packages = [
+    ".",
+    "internal",
+    "internal/app_identity",
+    "internal/base",
+    "internal/datastore",
+    "internal/log",
+    "internal/modules",
+    "internal/remote_api",
+    "internal/socket",
+    "internal/urlfetch",
+    "socket",
+    "urlfetch"
+  ]
   revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a"
   version = "v1.0.0"
 
 [[projects]]
   name = "google.golang.org/genproto"
-  packages = ["googleapis/api/label","googleapis/api/metric","googleapis/api/monitoredres","googleapis/api/serviceconfig","googleapis/datastore/v1","googleapis/logging/type","googleapis/logging/v2","googleapis/rpc/status","googleapis/type/latlng","protobuf"]
+  packages = [
+    "googleapis/api/label",
+    "googleapis/api/metric",
+    "googleapis/api/monitoredres",
+    "googleapis/api/serviceconfig",
+    "googleapis/datastore/v1",
+    "googleapis/logging/type",
+    "googleapis/logging/v2",
+    "googleapis/rpc/status",
+    "googleapis/type/latlng",
+    "protobuf"
+  ]
   revision = "08f135d1a31b6ba454287638a3ce23a55adace6f"
 
 [[projects]]
   name = "google.golang.org/grpc"
-  packages = [".","codes","credentials","credentials/oauth","grpclog","internal","metadata","naming","peer","stats","tap","transport"]
+  packages = [
+    ".",
+    "codes",
+    "credentials",
+    "credentials/oauth",
+    "grpclog",
+    "internal",
+    "metadata",
+    "naming",
+    "peer",
+    "stats",
+    "tap",
+    "transport"
+  ]
   revision = "188a132adcfba339f1f2d5da52498451341f9ee8"
   source = "https://github.com/bradfitz/grpc-go.git"
 
 [[projects]]
   branch = "v2"
   name = "gopkg.in/mgo.v2"
-  packages = [".","bson","internal/json","internal/sasl","internal/scram"]
+  packages = [
+    ".",
+    "bson",
+    "internal/json",
+    "internal/sasl",
+    "internal/scram"
+  ]
   revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
 
 [[projects]]
@@ -327,7 +536,15 @@
 
 [[projects]]
   name = "myitcv.io/react"
-  packages = [".","cmd/reactGen","internal/bundle","internal/core","internal/dev","internal/preact","internal/prod"]
+  packages = [
+    ".",
+    "cmd/reactGen",
+    "internal/bundle",
+    "internal/core",
+    "internal/dev",
+    "internal/preact",
+    "internal/prod"
+  ]
   revision = "bca7c66b77ed8a5b86fb77cff70914c4a7cc3ce5"
 
 [[projects]]
@@ -337,12 +554,16 @@
 
 [[projects]]
   name = "rsc.io/qr"
-  packages = [".","coding","gf256"]
+  packages = [
+    ".",
+    "coding",
+    "gf256"
+  ]
   revision = "48b2ede4844e13f1a2b7ce4d2529c9af7e359fc5"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "a2ecdc0803aa21574f5ee8c98508ba753307c78105b6969514bfb87c3c443c68"
+  inputs-digest = "1816b3ce31399ab6398d05881faaa48f6545d46dc62277f72672098e397fb448"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index e8252e433..7b4fc7aa8 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -33,6 +33,56 @@ required = [
   "myitcv.io/gogenerate"
 ]
 
+
+# Try to eliminate as much cruft as possible to keep the vendor
+# directory small.  Each entry is a directory that you want to eliminate.
+# To omit individual files add to the top-level .gitignore
+
+ignored = [
+  "cloud.google.com/go/datastore/testdata",
+  "github.com/cznic/kv/_testdata",
+  "github.com/cznic/lldb/testdata",
+  "github.com/cznic/zappy/testdata",
+  "github.com/garyburd/go-oauth/examples",
+  "github.com/golang/protobuf/proto/testdata",
+  "github.com/gopherjs/gopherjs/tests",
+  "github.com/gopherjs/gopherjs/tests/*",
+  "github.com/gorilla/websocket/examples",
+  "github.com/rwcarlsen/goexif/exif/corrupt",
+  "github.com/rwcarlsen/goexif/exif/samples",
+  "github.com/russross/blackfriday/testdata",
+  "github.com/shurcooL/go/importgraphutil",
+  "github.com/syndtr/goleveldb/leveldb/testutil",
+  "github.com/syndtr/goleveldb/manualtest",
+  "github.com/tgulacsi/picago/testdata",
+  "github.com/tgulacsi/picago/testdata",
+  "go4.org/jsonconfig/testdata",
+  "golang.org/x/image/testdata",
+  "golang.org/x/image/font/testdata",
+  "golang.org/x/net/html/charset/testdata",
+  "golang.org/x/net/html/testdata",
+  "golang.org/x/net/http2/testdata",
+  "golang.org/x/oauth2/google/testdata",
+  "golang.org/x/text/encoding/testdata",
+  "golang.org/x/text/language/testdata",
+  "golang.org/x/tools/go/gcimporter15/testdata",
+  "golang.org/x/tools/refactor/importgraph",
+  "google.golang.org/grpc/benchmark",
+  "google.golang.org/grpc/examples",
+  "google.golang.org/grpc/interop/client/testdata",
+  "google.golang.org/grpc/interop/server/testdata",
+  "google.golang.org/grpc/reflection",
+  "google.golang.org/grpc/stress",
+  "google.golang.org/grpc/test",
+  "google.golang.org/grpc/testdata",
+  "google.golang.org/grpc/transport/testdata",
+  "myitcv.io/gogenerate/_testFiles",
+  "myitcv.io/react/examples",
+  "myitcv.io/react/_scripts",
+  "myitcv.io/react/_talks",
+  "myitcv.io/react/_vendor"
+]
+
 # Constraints / Overrides follow
 # Semantic versions (like v1.0.0) are preferred
 # Please keep alphabetized