Repository: gobuffalo/buffalo
Pull request #1808 (2019-10-16 20:23:26)

merge v0.14.11 in


Patch:
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 54b2d577..65b45f18 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-github: markbates, stanislas-m, paganotoni, mclark4386
+github: markbates
 patreon: buffalo
diff --git a/Makefile b/Makefile
index 1d77ede8..9839789b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ GO_BIN ?= go
 
 install: deps
 	make tidy
-	packr2
 	$(GO_BIN) install -tags ${TAGS} -v ./buffalo
 	make tidy
 
@@ -16,26 +15,20 @@ endif
 
 deps:
 	$(GO_BIN) get github.com/gobuffalo/release
-	$(GO_BIN) get github.com/gobuffalo/packr/v2/packr2
-	packr2 clean
 ifneq ($(GO111MODULE),on)
 	$(GO_BIN) get -tags ${TAGS} -u -t ./...
 endif
 	make tidy
 
 build:
-	packr2
 	$(GO_BIN) build -v .
 	make tidy
 
 test:
-	packr2
 	$(GO_BIN) test -tags ${TAGS} -cover ./...
-	packr2
 	make tidy
 
 ci-deps:
-	$(GO_BIN) get -u github.com/gobuffalo/packr/v2/packr2
 	$(GO_BIN) get github.com/gobuffalo/buffalo-pop
 	$(GO_BIN) get -tags ${TAGS} -t -v ./...
 	make tidy
@@ -49,13 +42,11 @@ lint:
 update:
 	$(GO_BIN) get -u -tags ${TAGS}
 	make tidy
-	packr2
 	make test
 	make install
 	make tidy
 
 release-test:
-	make test
 	make tidy
 
 release:
diff --git a/SHOULDERS.md b/SHOULDERS.md
index b9a132c1..d9fc33a2 100644
--- a/SHOULDERS.md
+++ b/SHOULDERS.md
@@ -5,18 +5,100 @@ github.com/gobuffalo/buffalo does not try to reinvent the wheel! Instead, it use
 Thank you to the following **GIANTS**:
 
 
+* [cloud.google.com/go](https://godoc.org/cloud.google.com/go)
+
+* [dmitri.shuralyov.com/app/changes](https://godoc.org/dmitri.shuralyov.com/app/changes)
+
+* [dmitri.shuralyov.com/html/belt](https://godoc.org/dmitri.shuralyov.com/html/belt)
+
+* [dmitri.shuralyov.com/service/change](https://godoc.org/dmitri.shuralyov.com/service/change)
+
+* [dmitri.shuralyov.com/state](https://godoc.org/dmitri.shuralyov.com/state)
+
+* [git.apache.org/thrift.git](https://godoc.org/git.apache.org/thrift.git)
+
 * [github.com/BurntSushi/toml](https://godoc.org/github.com/BurntSushi/toml)
 
+* [github.com/Masterminds/semver](https://godoc.org/github.com/Masterminds/semver)
+
+* [github.com/OneOfOne/xxhash](https://godoc.org/github.com/OneOfOne/xxhash)
+
+* [github.com/ajg/form](https://godoc.org/github.com/ajg/form)
+
+* [github.com/alecthomas/template](https://godoc.org/github.com/alecthomas/template)
+
+* [github.com/alecthomas/units](https://godoc.org/github.com/alecthomas/units)
+
+* [github.com/anmitsu/go-shlex](https://godoc.org/github.com/anmitsu/go-shlex)
+
+* [github.com/armon/consul-api](https://godoc.org/github.com/armon/consul-api)
+
+* [github.com/beorn7/perks](https://godoc.org/github.com/beorn7/perks)
+
+* [github.com/blang/semver](https://godoc.org/github.com/blang/semver)
+
+* [github.com/bradfitz/go-smtpd](https://godoc.org/github.com/bradfitz/go-smtpd)
+
+* [github.com/cespare/xxhash](https://godoc.org/github.com/cespare/xxhash)
+
+* [github.com/client9/misspell](https://godoc.org/github.com/client9/misspell)
+
+* [github.com/cockroachdb/apd](https://godoc.org/github.com/cockroachdb/apd)
+
+* [github.com/cockroachdb/cockroach-go](https://godoc.org/github.com/cockroachdb/cockroach-go)
+
+* [github.com/codegangsta/negroni](https://godoc.org/github.com/codegangsta/negroni)
+
+* [github.com/coreos/bbolt](https://godoc.org/github.com/coreos/bbolt)
+
+* [github.com/coreos/etcd](https://godoc.org/github.com/coreos/etcd)
+
+* [github.com/coreos/go-etcd](https://godoc.org/github.com/coreos/go-etcd)
+
+* [github.com/coreos/go-semver](https://godoc.org/github.com/coreos/go-semver)
+
+* [github.com/coreos/go-systemd](https://godoc.org/github.com/coreos/go-systemd)
+
+* [github.com/coreos/pkg](https://godoc.org/github.com/coreos/pkg)
+
+* [github.com/cpuguy83/go-md2man](https://godoc.org/github.com/cpuguy83/go-md2man)
+
+* [github.com/creack/pty](https://godoc.org/github.com/creack/pty)
+
+* [github.com/davecgh/go-spew](https://godoc.org/github.com/davecgh/go-spew)
+
+* [github.com/dgrijalva/jwt-go](https://godoc.org/github.com/dgrijalva/jwt-go)
+
+* [github.com/dgryski/go-sip13](https://godoc.org/github.com/dgryski/go-sip13)
+
 * [github.com/dustin/go-humanize](https://godoc.org/github.com/dustin/go-humanize)
 
 * [github.com/fatih/color](https://godoc.org/github.com/fatih/color)
 
-* [github.com/gobuffalo/attrs](https://godoc.org/github.com/gobuffalo/attrs)
+* [github.com/fatih/structs](https://godoc.org/github.com/fatih/structs)
+
+* [github.com/flynn/go-shlex](https://godoc.org/github.com/flynn/go-shlex)
+
+* [github.com/fsnotify/fsnotify](https://godoc.org/github.com/fsnotify/fsnotify)
+
+* [github.com/ghodss/yaml](https://godoc.org/github.com/ghodss/yaml)
 
-* [github.com/gobuffalo/buffalo-pop](https://godoc.org/github.com/gobuffalo/buffalo-pop)
+* [github.com/gliderlabs/ssh](https://godoc.org/github.com/gliderlabs/ssh)
+
+* [github.com/go-kit/kit](https://godoc.org/github.com/go-kit/kit)
+
+* [github.com/go-logfmt/logfmt](https://godoc.org/github.com/go-logfmt/logfmt)
+
+* [github.com/go-sql-driver/mysql](https://godoc.org/github.com/go-sql-driver/mysql)
+
+* [github.com/go-stack/stack](https://godoc.org/github.com/go-stack/stack)
+
+* [github.com/gobuffalo/attrs](https://godoc.org/github.com/gobuffalo/attrs)
 
 * [github.com/gobuffalo/clara](https://godoc.org/github.com/gobuffalo/clara)
 
+* [github.com/gobuffalo/depgen](https://godoc.org/github.com/gobuffalo/depgen)
+
 * [github.com/gobuffalo/envy](https://godoc.org/github.com/gobuffalo/envy)
 
 * [github.com/gobuffalo/events](https://godoc.org/github.com/gobuffalo/events)
@@ -27,10 +109,16 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/genny](https://godoc.org/github.com/gobuffalo/genny)
 
+* [github.com/gobuffalo/gitgen](https://godoc.org/github.com/gobuffalo/gitgen)
+
 * [github.com/gobuffalo/github_flavored_markdown](https://godoc.org/github.com/gobuffalo/github_flavored_markdown)
 
+* [github.com/gobuffalo/gogen](https://godoc.org/github.com/gobuffalo/gogen)
+
 * [github.com/gobuffalo/helpers](https://godoc.org/github.com/gobuffalo/helpers)
 
+* [github.com/gobuffalo/here](https://godoc.org/github.com/gobuffalo/here)
+
 * [github.com/gobuffalo/httptest](https://godoc.org/github.com/gobuffalo/httptest)
 
 * [github.com/gobuffalo/licenser](https://godoc.org/github.com/gobuffalo/licenser)
@@ -39,34 +127,180 @@ Thank you to the following **GIANTS**:
 
 * [github.com/gobuffalo/makr](https://godoc.org/github.com/gobuffalo/makr)
 
+* [github.com/gobuffalo/mapi](https://godoc.org/github.com/gobuffalo/mapi)
+
 * [github.com/gobuffalo/meta](https://godoc.org/github.com/gobuffalo/meta)
 
+* [github.com/gobuffalo/mw-basicauth](https://godoc.org/github.com/gobuffalo/mw-basicauth)
+
+* [github.com/gobuffalo/mw-contenttype](https://godoc.org/github.com/gobuffalo/mw-contenttype)
+
+* [github.com/gobuffalo/mw-csrf](https://godoc.org/github.com/gobuffalo/mw-csrf)
+
+* [github.com/gobuffalo/mw-forcessl](https://godoc.org/github.com/gobuffalo/mw-forcessl)
+
+* [github.com/gobuffalo/mw-i18n](https://godoc.org/github.com/gobuffalo/mw-i18n)
+
+* [github.com/gobuffalo/mw-paramlogger](https://godoc.org/github.com/gobuffalo/mw-paramlogger)
+
+* [github.com/gobuffalo/mw-tokenauth](https://godoc.org/github.com/gobuffalo/mw-tokenauth)
+
 * [github.com/gobuffalo/nulls](https://godoc.org/github.com/gobuffalo/nulls)
 
 * [github.com/gobuffalo/packd](https://godoc.org/github.com/gobuffalo/packd)
 
+* [github.com/gobuffalo/packr](https://godoc.org/github.com/gobuffalo/packr)
+
 * [github.com/gobuffalo/packr/v2](https://godoc.org/github.com/gobuffalo/packr/v2)
 
 * [github.com/gobuffalo/plush](https://godoc.org/github.com/gobuffalo/plush)
 
+* [github.com/gobuffalo/plushgen](https://godoc.org/github.com/gobuffalo/plushgen)
+
 * [github.com/gobuffalo/pop](https://godoc.org/github.com/gobuffalo/pop)
 
 * [github.com/gobuffalo/release](https://godoc.org/github.com/gobuffalo/release)
 
+* [github.com/gobuffalo/shoulders](https://godoc.org/github.com/gobuffalo/shoulders)
+
+* [github.com/gobuffalo/syncx](https://godoc.org/github.com/gobuffalo/syncx)
+
 * [github.com/gobuffalo/tags](https://godoc.org/github.com/gobuffalo/tags)
 
+* [github.com/gobuffalo/uuid](https://godoc.org/github.com/gobuffalo/uuid)
+
+* [github.com/gobuffalo/validate](https://godoc.org/github.com/gobuffalo/validate)
+
+* [github.com/gobuffalo/x](https://godoc.org/github.com/gobuffalo/x)
+
+* [github.com/gofrs/uuid](https://godoc.org/github.com/gofrs/uuid)
+
+* [github.com/gogo/protobuf](https://godoc.org/github.com/gogo/protobuf)
+
+* [github.com/golang/glog](https://godoc.org/github.com/golang/glog)
+
+* [github.com/golang/groupcache](https://godoc.org/github.com/golang/groupcache)
+
+* [github.com/golang/lint](https://godoc.org/github.com/golang/lint)
+
+* [github.com/golang/mock](https://godoc.org/github.com/golang/mock)
+
+* [github.com/golang/protobuf](https://godoc.org/github.com/golang/protobuf)
+
+* [github.com/gomodule/redigo](https://godoc.org/github.com/gomodule/redigo)
+
+* [github.com/google/btree](https://godoc.org/github.com/google/btree)
+
 * [github.com/google/go-cmp](https://godoc.org/github.com/google/go-cmp)
 
+* [github.com/google/go-github](https://godoc.org/github.com/google/go-github)
+
+* [github.com/google/go-querystring](https://godoc.org/github.com/google/go-querystring)
+
+* [github.com/google/martian](https://godoc.org/github.com/google/martian)
+
+* [github.com/google/pprof](https://godoc.org/github.com/google/pprof)
+
+* [github.com/googleapis/gax-go](https://godoc.org/github.com/googleapis/gax-go)
+
+* [github.com/googleapis/gax-go/v2](https://godoc.org/github.com/googleapis/gax-go/v2)
+
+* [github.com/gopherjs/gopherjs](https://godoc.org/github.com/gopherjs/gopherjs)
+
+* [github.com/gorilla/context](https://godoc.org/github.com/gorilla/context)
+
 * [github.com/gorilla/mux](https://godoc.org/github.com/gorilla/mux)
 
+* [github.com/gorilla/pat](https://godoc.org/github.com/gorilla/pat)
+
+* [github.com/gorilla/securecookie](https://godoc.org/github.com/gorilla/securecookie)
+
 * [github.com/gorilla/sessions](https://godoc.org/github.com/gorilla/sessions)
 
+* [github.com/gorilla/websocket](https://godoc.org/github.com/gorilla/websocket)
+
+* [github.com/gregjones/httpcache](https://godoc.org/github.com/gregjones/httpcache)
+
+* [github.com/grpc-ecosystem/go-grpc-middleware](https://godoc.org/github.com/grpc-ecosystem/go-grpc-middleware)
+
+* [github.com/grpc-ecosystem/go-grpc-prometheus](https://godoc.org/github.com/grpc-ecosystem/go-grpc-prometheus)
+
+* [github.com/grpc-ecosystem/grpc-gateway](https://godoc.org/github.com/grpc-ecosystem/grpc-gateway)
+
+* [github.com/hashicorp/hcl](https://godoc.org/github.com/hashicorp/hcl)
+
+* [github.com/hpcloud/tail](https://godoc.org/github.com/hpcloud/tail)
+
+* [github.com/inconshreveable/mousetrap](https://godoc.org/github.com/inconshreveable/mousetrap)
+
+* [github.com/jackc/chunkreader](https://godoc.org/github.com/jackc/chunkreader)
+
+* [github.com/jackc/chunkreader/v2](https://godoc.org/github.com/jackc/chunkreader/v2)
+
+* [github.com/jackc/fake](https://godoc.org/github.com/jackc/fake)
+
+* [github.com/jackc/pgconn](https://godoc.org/github.com/jackc/pgconn)
+
+* [github.com/jackc/pgio](https://godoc.org/github.com/jackc/pgio)
+
+* [github.com/jackc/pgmock](https://godoc.org/github.com/jackc/pgmock)
+
+* [github.com/jackc/pgpassfile](https://godoc.org/github.com/jackc/pgpassfile)
+
+* [github.com/jackc/pgproto3](https://godoc.org/github.com/jackc/pgproto3)
+
+* [github.com/jackc/pgproto3/v2](https://godoc.org/github.com/jackc/pgproto3/v2)
+
+* [github.com/jackc/pgtype](https://godoc.org/github.com/jackc/pgtype)
+
+* [github.com/jackc/pgx](https://godoc.org/github.com/jackc/pgx)
+
+* [github.com/jackc/pgx/v4](https://godoc.org/github.com/jackc/pgx/v4)
+
+* [github.com/jackc/puddle](https://godoc.org/github.com/jackc/puddle)
+
+* [github.com/jellevandenhooff/dkim](https://godoc.org/github.com/jellevandenhooff/dkim)
+
+* [github.com/jmoiron/sqlx](https://godoc.org/github.com/jmoiron/sqlx)
+
+* [github.com/joho/godotenv](https://godoc.org/github.com/joho/godotenv)
+
+* [github.com/jonboulle/clockwork](https://godoc.org/github.com/jonboulle/clockwork)
+
+* [github.com/julienschmidt/httprouter](https://godoc.org/github.com/julienschmidt/httprouter)
+
 * [github.com/karrick/godirwalk](https://godoc.org/github.com/karrick/godirwalk)
 
+* [github.com/kballard/go-shellquote](https://godoc.org/github.com/kballard/go-shellquote)
+
+* [github.com/kisielk/errcheck](https://godoc.org/github.com/kisielk/errcheck)
+
+* [github.com/kisielk/gotool](https://godoc.org/github.com/kisielk/gotool)
+
+* [github.com/konsorten/go-windows-terminal-sequences](https://godoc.org/github.com/konsorten/go-windows-terminal-sequences)
+
+* [github.com/kr/logfmt](https://godoc.org/github.com/kr/logfmt)
+
+* [github.com/kr/pretty](https://godoc.org/github.com/kr/pretty)
+
+* [github.com/kr/pty](https://godoc.org/github.com/kr/pty)
+
+* [github.com/kr/text](https://godoc.org/github.com/kr/text)
+
+* [github.com/lib/pq](https://godoc.org/github.com/lib/pq)
+
+* [github.com/magiconair/properties](https://godoc.org/github.com/magiconair/properties)
+
 * [github.com/markbates/deplist](https://godoc.org/github.com/markbates/deplist)
 
+* [github.com/markbates/going](https://godoc.org/github.com/markbates/going)
+
 * [github.com/markbates/grift](https://godoc.org/github.com/markbates/grift)
 
+* [github.com/markbates/hmax](https://godoc.org/github.com/markbates/hmax)
+
+* [github.com/markbates/inflect](https://godoc.org/github.com/markbates/inflect)
+
 * [github.com/markbates/oncer](https://godoc.org/github.com/markbates/oncer)
 
 * [github.com/markbates/refresh](https://godoc.org/github.com/markbates/refresh)
@@ -75,22 +309,238 @@ Thank you to the following **GIANTS**:
 
 * [github.com/markbates/sigtx](https://godoc.org/github.com/markbates/sigtx)
 
+* [github.com/markbates/willie](https://godoc.org/github.com/markbates/willie)
+
+* [github.com/mattn/go-colorable](https://godoc.org/github.com/mattn/go-colorable)
+
+* [github.com/mattn/go-isatty](https://godoc.org/github.com/mattn/go-isatty)
+
+* [github.com/mattn/go-sqlite3](https://godoc.org/github.com/mattn/go-sqlite3)
+
+* [github.com/matttproud/golang_protobuf_extensions](https://godoc.org/github.com/matttproud/golang_protobuf_extensions)
+
+* [github.com/microcosm-cc/bluemonday](https://godoc.org/github.com/microcosm-cc/bluemonday)
+
+* [github.com/mitchellh/go-homedir](https://godoc.org/github.com/mitchellh/go-homedir)
+
+* [github.com/mitchellh/mapstructure](https://godoc.org/github.com/mitchellh/mapstructure)
+
 * [github.com/monoculum/formam](https://godoc.org/github.com/monoculum/formam)
 
+* [github.com/mwitkow/go-conntrack](https://godoc.org/github.com/mwitkow/go-conntrack)
+
+* [github.com/neelance/astrewrite](https://godoc.org/github.com/neelance/astrewrite)
+
+* [github.com/neelance/sourcemap](https://godoc.org/github.com/neelance/sourcemap)
+
+* [github.com/nicksnyder/go-i18n](https://godoc.org/github.com/nicksnyder/go-i18n)
+
+* [github.com/oklog/ulid](https://godoc.org/github.com/oklog/ulid)
+
+* [github.com/onsi/ginkgo](https://godoc.org/github.com/onsi/ginkgo)
+
+* [github.com/onsi/gomega](https://godoc.org/github.com/onsi/gomega)
+
+* [github.com/openzipkin/zipkin-go](https://godoc.org/github.com/openzipkin/zipkin-go)
+
+* [github.com/pelletier/go-toml](https://godoc.org/github.com/pelletier/go-toml)
+
+* [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors)
+
+* [github.com/pmezard/go-difflib](https://godoc.org/github.com/pmezard/go-difflib)
+
+* [github.com/prometheus/client_golang](https://godoc.org/github.com/prometheus/client_golang)
+
+* [github.com/prometheus/client_model](https://godoc.org/github.com/prometheus/client_model)
+
+* [github.com/prometheus/common](https://godoc.org/github.com/prometheus/common)
+
+* [github.com/prometheus/procfs](https://godoc.org/github.com/prometheus/procfs)
+
+* [github.com/prometheus/tsdb](https://godoc.org/github.com/prometheus/tsdb)
+
+* [github.com/rogpeppe/fastuuid](https://godoc.org/github.com/rogpeppe/fastuuid)
+
+* [github.com/rogpeppe/go-internal](https://godoc.org/github.com/rogpeppe/go-internal)
+
+* [github.com/rs/xid](https://godoc.org/github.com/rs/xid)
+
+* [github.com/rs/zerolog](https://godoc.org/github.com/rs/zerolog)
+
+* [github.com/russross/blackfriday](https://godoc.org/github.com/russross/blackfriday)
+
+* [github.com/satori/go.uuid](https://godoc.org/github.com/satori/go.uuid)
+
+* [github.com/serenize/snaker](https://godoc.org/github.com/serenize/snaker)
+
+* [github.com/sergi/go-diff](https://godoc.org/github.com/sergi/go-diff)
+
+* [github.com/shopspring/decimal](https://godoc.org/github.com/shopspring/decimal)
+
+* [github.com/shurcooL/component](https://godoc.org/github.com/shurcooL/component)
+
+* [github.com/shurcooL/events](https://godoc.org/github.com/shurcooL/events)
+
+* [github.com/shurcooL/github_flavored_markdown](https://godoc.org/github.com/shurcooL/github_flavored_markdown)
+
+* [github.com/shurcooL/go](https://godoc.org/github.com/shurcooL/go)
+
+* [github.com/shurcooL/go-goon](https://godoc.org/github.com/shurcooL/go-goon)
+
+* [github.com/shurcooL/gofontwoff](https://godoc.org/github.com/shurcooL/gofontwoff)
+
+* [github.com/shurcooL/gopherjslib](https://godoc.org/github.com/shurcooL/gopherjslib)
+
+* [github.com/shurcooL/highlight_diff](https://godoc.org/github.com/shurcooL/highlight_diff)
+
+* [github.com/shurcooL/highlight_go](https://godoc.org/github.com/shurcooL/highlight_go)
+
+* [github.com/shurcooL/home](https://godoc.org/github.com/shurcooL/home)
+
+* [github.com/shurcooL/htmlg](https://godoc.org/github.com/shurcooL/htmlg)
+
+* [github.com/shurcooL/httperror](https://godoc.org/github.com/shurcooL/httperror)
+
+* [github.com/shurcooL/httpfs](https://godoc.org/github.com/shurcooL/httpfs)
+
+* [github.com/shurcooL/httpgzip](https://godoc.org/github.com/shurcooL/httpgzip)
+
+* [github.com/shurcooL/issues](https://godoc.org/github.com/shurcooL/issues)
+
+* [github.com/shurcooL/issuesapp](https://godoc.org/github.com/shurcooL/issuesapp)
+
+* [github.com/shurcooL/notifications](https://godoc.org/github.com/shurcooL/notifications)
+
+* [github.com/shurcooL/octicon](https://godoc.org/github.com/shurcooL/octicon)
+
+* [github.com/shurcooL/reactions](https://godoc.org/github.com/shurcooL/reactions)
+
+* [github.com/shurcooL/sanitized_anchor_name](https://godoc.org/github.com/shurcooL/sanitized_anchor_name)
+
+* [github.com/shurcooL/users](https://godoc.org/github.com/shurcooL/users)
+
+* [github.com/shurcooL/webdavfs](https://godoc.org/github.com/shurcooL/webdavfs)
+
 * [github.com/sirupsen/logrus](https://godoc.org/github.com/sirupsen/logrus)
 
+* [github.com/soheilhy/cmux](https://godoc.org/github.com/soheilhy/cmux)
+
+* [github.com/sourcegraph/annotate](https://godoc.org/github.com/sourcegraph/annotate)
+
+* [github.com/sourcegraph/syntaxhighlight](https://godoc.org/github.com/sourcegraph/syntaxhighlight)
+
+* [github.com/spaolacci/murmur3](https://godoc.org/github.com/spaolacci/murmur3)
+
+* [github.com/spf13/afero](https://godoc.org/github.com/spf13/afero)
+
+* [github.com/spf13/cast](https://godoc.org/github.com/spf13/cast)
+
 * [github.com/spf13/cobra](https://godoc.org/github.com/spf13/cobra)
 
+* [github.com/spf13/jwalterweatherman](https://godoc.org/github.com/spf13/jwalterweatherman)
+
 * [github.com/spf13/pflag](https://godoc.org/github.com/spf13/pflag)
 
 * [github.com/spf13/viper](https://godoc.org/github.com/spf13/viper)
 
+* [github.com/stretchr/objx](https://godoc.org/github.com/stretchr/objx)
+
 * [github.com/stretchr/testify](https://godoc.org/github.com/stretchr/testify)
 
+* [github.com/tarm/serial](https://godoc.org/github.com/tarm/serial)
+
+* [github.com/tmc/grpc-websocket-proxy](https://godoc.org/github.com/tmc/grpc-websocket-proxy)
+
+* [github.com/ugorji/go](https://godoc.org/github.com/ugorji/go)
+
+* [github.com/ugorji/go/codec](https://godoc.org/github.com/ugorji/go/codec)
+
+* [github.com/unrolled/secure](https://godoc.org/github.com/unrolled/secure)
+
+* [github.com/xiang90/probing](https://godoc.org/github.com/xiang90/probing)
+
+* [github.com/xordataexchange/crypt](https://godoc.org/github.com/xordataexchange/crypt)
+
+* [github.com/zenazn/goji](https://godoc.org/github.com/zenazn/goji)
+
+* [go.etcd.io/bbolt](https://godoc.org/go.etcd.io/bbolt)
+
+* [go.opencensus.io](https://godoc.org/go.opencensus.io)
+
+* [go.uber.org/atomic](https://godoc.org/go.uber.org/atomic)
+
+* [go.uber.org/multierr](https://godoc.org/go.uber.org/multierr)
+
+* [go.uber.org/zap](https://godoc.org/go.uber.org/zap)
+
+* [go4.org](https://godoc.org/go4.org)
+
+* [golang.org/x/build](https://godoc.org/golang.org/x/build)
+
+* [golang.org/x/crypto](https://godoc.org/golang.org/x/crypto)
+
+* [golang.org/x/exp](https://godoc.org/golang.org/x/exp)
+
+* [golang.org/x/lint](https://godoc.org/golang.org/x/lint)
+
+* [golang.org/x/net](https://godoc.org/golang.org/x/net)
+
+* [golang.org/x/oauth2](https://godoc.org/golang.org/x/oauth2)
+
+* [golang.org/x/perf](https://godoc.org/golang.org/x/perf)
+
 * [golang.org/x/sync](https://godoc.org/golang.org/x/sync)
 
+* [golang.org/x/sys](https://godoc.org/golang.org/x/sys)
+
+* [golang.org/x/text](https://godoc.org/golang.org/x/text)
+
+* [golang.org/x/time](https://godoc.org/golang.org/x/time)
+
 * [golang.org/x/tools](https://godoc.org/golang.org/x/tools)
 
+* [golang.org/x/xerrors](https://godoc.org/golang.org/x/xerrors)
+
+* [google.golang.org/api](https://godoc.org/google.golang.org/api)
+
+* [google.golang.org/appengine](https://godoc.org/google.golang.org/appengine)
+
+* [google.golang.org/genproto](https://godoc.org/google.golang.org/genproto)
+
+* [google.golang.org/grpc](https://godoc.org/google.golang.org/grpc)
+
+* [gopkg.in/airbrake/gobrake.v2](https://godoc.org/gopkg.in/airbrake/gobrake.v2)
+
+* [gopkg.in/alecthomas/kingpin.v2](https://godoc.org/gopkg.in/alecthomas/kingpin.v2)
+
 * [gopkg.in/alexcesaro/quotedprintable.v3](https://godoc.org/gopkg.in/alexcesaro/quotedprintable.v3)
 
+* [gopkg.in/check.v1](https://godoc.org/gopkg.in/check.v1)
+
+* [gopkg.in/errgo.v2](https://godoc.org/gopkg.in/errgo.v2)
+
+* [gopkg.in/fsnotify.v1](https://godoc.org/gopkg.in/fsnotify.v1)
+
+* [gopkg.in/gemnasium/logrus-airbrake-hook.v2](https://godoc.org/gopkg.in/gemnasium/logrus-airbrake-hook.v2)
+
+* [gopkg.in/gomail.v2](https://godoc.org/gopkg.in/gomail.v2)
+
+* [gopkg.in/inconshreveable/log15.v2](https://godoc.org/gopkg.in/inconshreveable/log15.v2)
+
+* [gopkg.in/inf.v0](https://godoc.org/gopkg.in/inf.v0)
+
+* [gopkg.in/mail.v2](https://godoc.org/gopkg.in/mail.v2)
+
+* [gopkg.in/resty.v1](https://godoc.org/gopkg.in/resty.v1)
+
+* [gopkg.in/tomb.v1](https://godoc.org/gopkg.in/tomb.v1)
+
 * [gopkg.in/yaml.v2](https://godoc.org/gopkg.in/yaml.v2)
+
+* [grpc.go4.org](https://godoc.org/grpc.go4.org)
+
+* [honnef.co/go/tools](https://godoc.org/honnef.co/go/tools)
+
+* [sourcegraph.com/sourcegraph/go-diff](https://godoc.org/sourcegraph.com/sourcegraph/go-diff)
+
+* [sourcegraph.com/sqs/pbtypes](https://godoc.org/sourcegraph.com/sqs/pbtypes)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index ec6ecdde..64155c6c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,36 +1,27 @@
 variables:
+  GOPROXY: "https://proxy.golang.org"
   GOBIN:  "$(GOPATH)/bin" # Go binaries path
   GOPATH: "$(system.defaultWorkingDirectory)/gopath" # Go workspace path
-  GOPROXY: "https://proxy.golang.org"
   modulePath: "$(GOPATH)/src/github.com/$(build.repository.name)" # Path to the module"s code
 
 jobs:
-- job: IntegrationTests
-  pool:
-    vmImage: "ubuntu-16.04"
-  steps:
-    - script: docker build .
-      displayName: "Integration Tests"
 
 - job: Windows
   pool:
     vmImage: "vs2017-win2016"
   strategy:
     matrix:
-      go 1.10:
-        go_version: "1.10"
-        GO111MODULE: "off"
-      go 1.11 (on):
-        go_version: "1.11.5"
-        GO111MODULE: "on"
-      go 1.11 (off):
-        go_version: "1.11.5"
-        GO111MODULE: "off"
       go 1.12 (on):
-        go_version: "1.12"
+        go_version: "1.12.10"
         GO111MODULE: "on"
       go 1.12 (off):
-        go_version: "1.12"
+        go_version: "1.12.10"
+        GO111MODULE: "off"
+      go 1.13.1 (on):
+        go_version: "1.13.1"
+        GO111MODULE: "on"
+      go 1.13.1 (off):
+        go_version: "1.13.1"
         GO111MODULE: "off"
   steps:
     - template: azure-tests.yml
@@ -40,20 +31,17 @@ jobs:
     vmImage: "macOS-10.13"
   strategy:
     matrix:
-      go 1.10:
-        go_version: "1.10"
-        GO111MODULE: "off"
-      go 1.11 (on):
-        go_version: "1.11.5"
-        GO111MODULE: "on"
-      go 1.11 (off):
-        go_version: "1.11.5"
-        GO111MODULE: "off"
       go 1.12 (on):
-        go_version: "1.12"
+        go_version: "1.12.10"
         GO111MODULE: "on"
       go 1.12 (off):
-        go_version: "1.12"
+        go_version: "1.12.10"
+        GO111MODULE: "off"
+      go 1.13.1 (on):
+        go_version: "1.13.1"
+        GO111MODULE: "on"
+      go 1.13.1 (off):
+        go_version: "1.13.1"
         GO111MODULE: "off"
   steps:
     - template: azure-tests.yml
@@ -63,20 +51,17 @@ jobs:
     vmImage: "ubuntu-16.04"
   strategy:
     matrix:
-      go 1.10:
-        go_version: "1.10"
-        GO111MODULE: "off"
-      go 1.11 (on):
-        go_version: "1.11.5"
-        GO111MODULE: "on"
-      go 1.11 (off):
-        go_version: "1.11.5"
-        GO111MODULE: "off"
       go 1.12 (on):
-        go_version: "1.12"
+        go_version: "1.12.10"
         GO111MODULE: "on"
       go 1.12 (off):
-        go_version: "1.12"
+        go_version: "1.12.10"
+        GO111MODULE: "off"
+      go 1.13.1 (on):
+        go_version: "1.13.1"
+        GO111MODULE: "on"
+      go 1.13.1 (off):
+        go_version: "1.13.1"
         GO111MODULE: "off"
   steps:
     - template: azure-tests.yml
diff --git a/context.go b/context.go
index a4ea8b27..1c720172 100644
--- a/context.go
+++ b/context.go
@@ -63,19 +63,20 @@ func (a *App) newContext(info RouteInfo, res http.ResponseWriter, req *http.Requ
 	session := a.getSession(req, res)
 
 	ct := httpx.ContentType(req)
-	contextData := map[string]interface{}{
-		"app":           a,
-		"env":           a.Env,
-		"routes":        a.Routes(),
-		"current_route": info,
-		"current_path":  req.URL.Path,
-		"contentType":   ct,
-		"method":        req.Method,
-	}
+
+	data := &sync.Map{}
+
+	data.Store("app", a)
+	data.Store("env", a.Env)
+	data.Store("routes", a.Routes())
+	data.Store("current_route", info)
+	data.Store("current_path", req.URL.Path)
+	data.Store("contentType", ct)
+	data.Store("method", req.Method)
 
 	for _, route := range a.Routes() {
 		cRoute := route
-		contextData[cRoute.PathName] = cRoute.BuildPathHelper()
+		data.Store(cRoute.PathName, cRoute.BuildPathHelper())
 	}
 
 	return &DefaultContext{
@@ -87,7 +88,6 @@ func (a *App) newContext(info RouteInfo, res http.ResponseWriter, req *http.Requ
 		logger:      a.Logger,
 		session:     session,
 		flash:       newFlash(session),
-		data:        contextData,
-		moot:        &sync.RWMutex{},
+		data:        data,
 	}
 }
diff --git a/default_context.go b/default_context.go
index 559dae6f..2a8c41cb 100644
--- a/default_context.go
+++ b/default_context.go
@@ -33,9 +33,8 @@ type DefaultContext struct {
 	logger      Logger
 	session     *Session
 	contentType string
-	data        map[string]interface{}
+	data        *sync.Map
 	flash       *Flash
-	moot        *sync.RWMutex
 }
 
 // Response returns the original Response for the request.
@@ -68,17 +67,13 @@ func (d *DefaultContext) Param(key string) string {
 // Set a value onto the Context. Any value set onto the Context
 // will be automatically available in templates.
 func (d *DefaultContext) Set(key string, value interface{}) {
-	d.moot.Lock()
-	d.data[key] = value
-	d.moot.Unlock()
+	d.data.Store(key, value)
 }
 
 // Value that has previously stored on the context.
 func (d *DefaultContext) Value(key interface{}) interface{} {
 	if k, ok := key.(string); ok {
-		d.moot.RLock()
-		defer d.moot.RUnlock()
-		if v, ok := d.data[k]; ok {
+		if v, ok := d.data.Load(k); ok {
 			return v
 		}
 	}
@@ -222,12 +217,15 @@ func (d *DefaultContext) Redirect(status int, url string, args ...interface{}) e
 
 // Data contains all the values set through Get/Set.
 func (d *DefaultContext) Data() map[string]interface{} {
-	d.moot.Lock()
 	m := map[string]interface{}{}
-	for k, v := range d.data {
-		m[k] = v
-	}
-	d.moot.Unlock()
+	d.data.Range(func(k, v interface{}) bool {
+		s, ok := k.(string)
+		if !ok {
+			return false
+		}
+		m[s] = v
+		return true
+	})
 	return m
 }
 
diff --git a/errors.go b/errors.go
index 13035421..eaf4e3cf 100644
--- a/errors.go
+++ b/errors.go
@@ -196,15 +196,18 @@ func defaultErrorHandler(status int, origErr error, c Context) error {
 			trace = fmt.Sprintf("%s\n%s", err.Error(), trace)
 		}
 		routes := c.Value("routes")
-		if cd, ok := c.(*DefaultContext); ok {
-			delete(cd.data, "app")
-			delete(cd.data, "routes")
-		}
+
+		cd := c.Data()
+		// if cd, ok := c.(*DefaultContext); ok {
+		// 		data := cd.Data()
+		delete(cd, "app")
+		delete(cd, "routes")
+		// }
 		data := map[string]interface{}{
 			"routes":      routes,
 			"error":       trace,
 			"status":      status,
-			"data":        c.Data(),
+			"data":        cd,
 			"params":      c.Params(),
 			"posted_form": c.Request().Form,
 			"context":     c,
diff --git a/go.mod b/go.mod
index cedfcc32..fad086e2 100644
--- a/go.mod
+++ b/go.mod
@@ -7,9 +7,9 @@ require (
 	github.com/dustin/go-humanize v1.0.0
 	github.com/fatih/color v1.7.0
 	github.com/gobuffalo/attrs v0.1.0
-	github.com/gobuffalo/buffalo-pop v1.20.1
+	github.com/gobuffalo/buffalo-pop v1.22.0
 	github.com/gobuffalo/clara v0.9.1
-	github.com/gobuffalo/envy v1.7.0
+	github.com/gobuffalo/envy v1.7.1
 	github.com/gobuffalo/events v1.4.0
 	github.com/gobuffalo/flect v0.1.6
 	github.com/gobuffalo/genny v0.4.1
@@ -21,15 +21,15 @@ require (
 	github.com/gobuffalo/meta v0.2.0
 	github.com/gobuffalo/nulls v0.1.0
 	github.com/gobuffalo/packd v0.3.0
-	github.com/gobuffalo/packr/v2 v2.6.0
+	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/gobuffalo/plush v3.8.3+incompatible
-	github.com/gobuffalo/pop v4.11.6+incompatible
-	github.com/gobuffalo/release v1.13.2
-	github.com/gobuffalo/tags v2.1.0+incompatible
+	github.com/gobuffalo/pop v4.12.1+incompatible
+	github.com/gobuffalo/release v1.13.4
+	github.com/gobuffalo/tags v2.1.5+incompatible
 	github.com/google/go-cmp v0.3.1
 	github.com/gorilla/mux v1.7.3
 	github.com/gorilla/sessions v1.2.0
-	github.com/karrick/godirwalk v1.10.12
+	github.com/karrick/godirwalk v1.12.0
 	github.com/markbates/grift v1.1.0
 	github.com/markbates/oncer v1.0.0
 	github.com/markbates/refresh v1.8.0
@@ -38,11 +38,11 @@ require (
 	github.com/monoculum/formam v0.0.0-20190830100315-7ff9597b1407
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
-	github.com/spf13/pflag v1.0.3
+	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.4.0
 	github.com/stretchr/testify v1.4.0
-	golang.org/x/sync v0.0.0-20190423024810-112230192c58
-	golang.org/x/tools v0.0.0-20190909030654-5b82db07426d
+	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
+	golang.org/x/tools v0.0.0-20191016194801-f0068bd333b2
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
-	gopkg.in/yaml.v2 v2.2.2
+	gopkg.in/yaml.v2 v2.2.4
 )
diff --git a/go.sum b/go.sum
index 7ffd08e6..2ec64ef8 100644
--- a/go.sum
+++ b/go.sum
@@ -8,8 +8,9 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc=
 github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
+github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
+github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
@@ -24,10 +25,10 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c h1:2zRrJWIt/f9c9HhNHAgrRgq0San5gRRUJTBXLkchal0=
 github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
+github.com/cockroachdb/cockroach-go v0.0.0-20190916165215-ad57a61cc915 h1:QX2Zc22B15gdWwDCwS7BXmbeD/SWdcRK12gOfZ5BsIs=
+github.com/cockroachdb/cockroach-go v0.0.0-20190916165215-ad57a61cc915/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk=
 github.com/codegangsta/negroni v1.0.0/go.mod h1:v0y3T5G7Y1UlFfyxFn/QLRU4a2EuNau2iZY63YTKWo0=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
@@ -35,8 +36,10 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -129,8 +132,8 @@ github.com/gobuffalo/buffalo-pop v1.12.0/go.mod h1:pO2ONSJOCjyroGp4BwVHfMkfd7sLg
 github.com/gobuffalo/buffalo-pop v1.13.0/go.mod h1:h+zfyXCUFwihFqz6jmo9xsdsZ1Tm9n7knYpQjW0gv18=
 github.com/gobuffalo/buffalo-pop v1.16.0/go.mod h1:XYA72cNFvL6m1o7PZ+Z7Yd/WDQTPcOiuDukiHvEo2KY=
 github.com/gobuffalo/buffalo-pop v1.17.2/go.mod h1:nyOm0mtmp9/+m2NaXrp+9SqtuKZslA7Ys2DBaT/t2n4=
-github.com/gobuffalo/buffalo-pop v1.20.1 h1:Q+Jg6AcOQfWdhxXTs3v9GUqmc73lweOfQC6TaCFZ0iY=
-github.com/gobuffalo/buffalo-pop v1.20.1/go.mod h1:cAZAlI7fDl0YaOnAraLBuyBWUz3DJXnOJBlSdP58zx8=
+github.com/gobuffalo/buffalo-pop v1.22.0 h1:yeQTQUndCpkek2arBDnDp6e3bJcGDFYlxFCH2bFvpKk=
+github.com/gobuffalo/buffalo-pop v1.22.0/go.mod h1:S8uJpbC9PUMFA6ZWbPnbk3c32n4vJ32p5NLsREcz+H8=
 github.com/gobuffalo/clara v0.4.1/go.mod h1:3QgAPqYgPqAzhfGbNLlp4UztaZRi2SOg+ZrZwaq9L94=
 github.com/gobuffalo/clara v0.6.0/go.mod h1:RKZxkcH80pLykRi2hLkoxGMxA8T06Dc9fN/pFvutMFY=
 github.com/gobuffalo/clara v0.7.0/go.mod h1:pen7ZMmnuYUYVF/3BbnvidYVAbMEfkyO4O+Tc+FKICU=
@@ -154,8 +157,9 @@ github.com/gobuffalo/envy v1.6.11/go.mod h1:Fiq52W7nrHGDggFPhn2ZCcHw4u/rqXkqo+i7
 github.com/gobuffalo/envy v1.6.12/go.mod h1:qJNrJhKkZpEW0glh5xP2syQHH5kgdmgsKss2Kk8PTP0=
 github.com/gobuffalo/envy v1.6.13/go.mod h1:w9DJppgl51JwUFWWd/M/6/otrPtWV3WYMa+NNLunqKA=
 github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
+github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
+github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
 github.com/gobuffalo/events v1.0.3/go.mod h1:Txo8WmqScapa7zimEQIwgiJBvMECMe9gJjsKNPN3uZw=
 github.com/gobuffalo/events v1.0.7/go.mod h1:z8txf6H9jWhQ5Scr7YPLWg/cgXBRj8Q4uYI+rsVCCSQ=
 github.com/gobuffalo/events v1.0.8/go.mod h1:A5KyqT1sA+3GJiBE4QKZibse9mtOcI9nw8gGrDdqYGs=
@@ -307,7 +311,6 @@ github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8z
 github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg=
 github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
 github.com/gobuffalo/makr v1.1.5/go.mod h1:Y+o0btAH1kYAMDJW/TX3+oAXEu0bmSLLoC9mIFxtzOw=
-github.com/gobuffalo/makr v1.2.0 h1:TA6ThoZEcq0F9FCrc/7xS1ycdCIL0K6Ux+5wmwYV7BY=
 github.com/gobuffalo/makr v1.2.0/go.mod h1:SFQUrDtwDpmQ6BxKJqxg0emc4KkNzzvUtAtnHiVK/QQ=
 github.com/gobuffalo/mapi v1.0.0/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
 github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc=
@@ -406,8 +409,9 @@ github.com/gobuffalo/packr/v2 v2.4.0/go.mod h1:ra341gygw9/61nSjAbfwcwh8IrYL4WmR4
 github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
 github.com/gobuffalo/packr/v2 v2.5.2/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
 github.com/gobuffalo/packr/v2 v2.5.3/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
-github.com/gobuffalo/packr/v2 v2.6.0 h1:EMUzJIb5rof6r087PtGmgdzdLKpRBESJ/8jyL9MexfY=
 github.com/gobuffalo/packr/v2 v2.6.0/go.mod h1:sgEE1xNZ6G0FNN5xn9pevVu4nywaxHvgup67xisti08=
+github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
+github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
 github.com/gobuffalo/plush v3.7.16+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
 github.com/gobuffalo/plush v3.7.20+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
 github.com/gobuffalo/plush v3.7.21+incompatible/go.mod h1:rQ4zdtUUyZNqULlc6bqd5scsPfLKfT0+TGMChgduDvI=
@@ -449,8 +453,9 @@ github.com/gobuffalo/pop v4.11.0+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcV
 github.com/gobuffalo/pop v4.11.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
 github.com/gobuffalo/pop v4.11.2+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
 github.com/gobuffalo/pop v4.11.3+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
-github.com/gobuffalo/pop v4.11.6+incompatible h1:/pzf+e6Sj3RDIEww15Q8aMwRWXW80wpFDh4NGHYyG7Y=
-github.com/gobuffalo/pop v4.11.6+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
+github.com/gobuffalo/pop v4.12.0+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
+github.com/gobuffalo/pop v4.12.1+incompatible h1:6f+JzSpp7N0dqpakJzGvxuQKuoecSTbAuffP5hT14w4=
+github.com/gobuffalo/pop v4.12.1+incompatible/go.mod h1:DwBz3SD5SsHpTZiTubcsFWcVDpJWGsxjVjMPnkiThWg=
 github.com/gobuffalo/release v1.0.35/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4=
 github.com/gobuffalo/release v1.0.38/go.mod h1:VtHFAKs61vO3wboCec5xr9JPTjYyWYcvaM3lclkc4x4=
 github.com/gobuffalo/release v1.0.42/go.mod h1:RPs7EtafH4oylgetOJpGP0yCZZUiO4vqHfTHJjSdpug=
@@ -470,8 +475,8 @@ github.com/gobuffalo/release v1.2.5/go.mod h1:tkFFZua2N5WRxyGDk2cSwQjzkZ/apKKXl5
 github.com/gobuffalo/release v1.4.0/go.mod h1:f4uUPnD9dxrWxVy9yy0k/mvDf3EzhFtf7/byl0tTdY4=
 github.com/gobuffalo/release v1.7.0/go.mod h1:xH2NjAueVSY89XgC4qx24ojEQ4zQ9XCGVs5eXwJTkEs=
 github.com/gobuffalo/release v1.8.3/go.mod h1:gCk/x5WD+aIGkPodO4CuLxdnhYn9Jgp7yFYxntK/8mk=
-github.com/gobuffalo/release v1.13.2 h1:ojKpuCE61griEgAQoZowUaU0qvV5fAQEFmvp4kw/mKg=
-github.com/gobuffalo/release v1.13.2/go.mod h1:LhGNfxuq+L/LHNhX8OUGNd8/Z3pWc8YntN6HT7SLhn0=
+github.com/gobuffalo/release v1.13.4 h1:VHQwm/VftDLkhun4hTVqEw+eng9n0drZ3uYjM7u5TJ4=
+github.com/gobuffalo/release v1.13.4/go.mod h1:5Cc4TSNxP4QFV2ZUYcgPiBBV7YyRomHecGTQuuy26G4=
 github.com/gobuffalo/shoulders v1.0.1/go.mod h1:V33CcVmaQ4gRUmHKwq1fiTXuf8Gp/qjQBUL5tHPmvbA=
 github.com/gobuffalo/shoulders v1.0.3/go.mod h1:LqMcHhKRuBPMAYElqOe3POHiZ1x7Ry0BE8ZZ84Bx+k4=
 github.com/gobuffalo/shoulders v1.0.4/go.mod h1:LqMcHhKRuBPMAYElqOe3POHiZ1x7Ry0BE8ZZ84Bx+k4=
@@ -485,8 +490,9 @@ github.com/gobuffalo/tags v2.0.11+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s6
 github.com/gobuffalo/tags v2.0.14+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
 github.com/gobuffalo/tags v2.0.15+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
 github.com/gobuffalo/tags v2.0.16+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
-github.com/gobuffalo/tags v2.1.0+incompatible h1:qQjj3n2RtHxfooqXQ4/A9SsEfZ7/7guv8cp/GdAPa+Y=
 github.com/gobuffalo/tags v2.1.0+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
+github.com/gobuffalo/tags v2.1.5+incompatible h1:aYMwNlKa2ZX1yPMxa+syV85rv+gwqQSv8IArC0UoIi8=
+github.com/gobuffalo/tags v2.1.5+incompatible/go.mod h1:9XmhOkyaB7UzvuY4UoZO4s67q8/xRMVJEaakauVQYeY=
 github.com/gobuffalo/uuid v2.0.3+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
 github.com/gobuffalo/uuid v2.0.4+incompatible/go.mod h1:ErhIzkRhm0FtRuiE/PeORqcw4cVi1RtSpnwYrxuvkfE=
 github.com/gobuffalo/uuid v2.0.5+incompatible h1:c5uWRuEnYggYCrT9AJm0U2v1QTG7OVDAvxhj8tIV5Gc=
@@ -553,12 +559,41 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 h1:vr3AYkKovP8uR8AvSGGUK1IDqRa5lAAvEkZG1LKaCRc=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/jackc/chunkreader/v2 v2.0.0 h1:DUwgMQuuPnS0rhMXenUtZpqZqrR/30NWY+qQvTpSvEs=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ=
+github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
+github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
+github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.0.1 h1:ZANo4pIkeHKIVD1cQMcxu8fwrwIICLblzi9HCjooZeQ=
+github.com/jackc/pgconn v1.0.1/go.mod h1:GgY/Lbj1VonNaVdNUHs9AwWom3yP2eymFQ1C8z9r/Lk=
+github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
+github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
+github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=
+github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgproto3/v2 v2.0.0 h1:FApgMJ/GtaXfI0s8Lvd0kaLaRwMOhs4VH92pwkwQQvU=
+github.com/jackc/pgproto3/v2 v2.0.0/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
+github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
+github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
 github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
 github.com/jackc/pgx v3.3.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
-github.com/jackc/pgx v3.5.0+incompatible h1:BRJ4G3UPtvml5R1ey0biqqGuYUGayMYekm3woO75orY=
 github.com/jackc/pgx v3.5.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I=
+github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
+github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
+github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
+github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
 github.com/jmoiron/sqlx v0.0.0-20180614180643-0dae4fefe7c0/go.mod h1:IiEW3SEiiErVyFdH8NTuWjSifiEQKUoyK3LNqr2kCHU=
 github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA=
@@ -573,8 +608,9 @@ github.com/karrick/godirwalk v1.7.7/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46s
 github.com/karrick/godirwalk v1.7.8/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
-github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU=
 github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/karrick/godirwalk v1.12.0 h1:nkS4xxsjiZMvVlazd0mFyiwD4BR9f3m6LXGhM2TUx3Y=
+github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -588,10 +624,13 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM=
@@ -611,7 +650,6 @@ github.com/markbates/hmax v1.1.0/go.mod h1:hhn8pJiRwNTEmNlxhfiTbL+CtEYiAX3wuhSf/
 github.com/markbates/inflect v1.0.0/go.mod h1:oTeZL2KHA7CUX6X+fovmK9OvIOFuqu0TwdQrZjLTh88=
 github.com/markbates/inflect v1.0.1/go.mod h1:uv3UVNBe5qBIfCm8O8Q+DW+S1EopeyINj+Ikhc7rnCk=
 github.com/markbates/inflect v1.0.3/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
-github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g=
 github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs=
 github.com/markbates/oncer v0.0.0-20180924031910-e862a676800b/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/oncer v0.0.0-20180924034138-723ad0170a46/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
@@ -704,16 +742,18 @@ github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.2 h1:XU784Pr0wdahMY2bYcyK6N1KuaRAdLtqD4qd8D18Bfs=
 github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY=
+github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516 h1:ofR1ZdrNSkiWcMsRrubK9tb2/SlZVWttAfqUjJi6QYc=
 github.com/serenize/snaker v0.0.0-20171204205717-a683aaf2d516/go.mod h1:Yow6lPLSAXx2ifx470yD/nUe22Dv5vBvxK/UK9UUTVs=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
 github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
@@ -768,8 +808,9 @@ github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tL
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.2.1/go.mod h1:P4AexN0a+C9tGAnUFNwDMYYZv3pjFuvmeiMyKRaNVlI=
 github.com/spf13/viper v1.3.0/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.3.1/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
@@ -778,6 +819,7 @@ github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
@@ -792,10 +834,13 @@ github.com/unrolled/secure v0.0.0-20181022170031-4b6b7cf51606/go.mod h1:mnPT77IA
 github.com/unrolled/secure v0.0.0-20190103195806-76e6d4e9b90c/go.mod h1:mnPT77IAdsi/kV7+Es7y+pXALeV3h7G6dQF6mNYjcLA=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
@@ -821,11 +866,13 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190403202508-8e1b8d32e692/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A=
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586 h1:7KByu05hhLed2MO29w7p1XfZvZ13m8mub3shuVftRs0=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -857,8 +904,9 @@ golang.org/x/net v0.0.0-20190514140710-3ec191127204/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -868,8 +916,9 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180816055513-1c9583448a9c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -971,6 +1020,7 @@ golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190407030857-0fdf0c73855b/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190603152906-08e0b306e832/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190603231351-8aaa1484dc10/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
@@ -979,12 +1029,17 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190809145639-6d4652c779c4/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190825031127-d72b05d2b1b6/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190905035308-adb45749da8e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190906203814-12febf440ab1/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190909030654-5b82db07426d h1:PhtdWYteEBebOX7KXm4qkIAVSUTHQ883/2hRB92r9lk=
-golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191016194801-f0068bd333b2 h1:FY4XZvYWVYktjuISUgAXWD4c1jmb+M8L2wo4iWH/hb0=
+golang.org/x/tools v0.0.0-20191016194801-f0068bd333b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
 google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
@@ -1018,6 +1073,7 @@ gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
+gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
@@ -1025,8 +1081,9 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/it.sh b/it.sh
index 1ee954ec..e3e6e254 100644
--- a/it.sh
+++ b/it.sh
@@ -81,9 +81,6 @@ filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/gener
 buffalo g actions comments destroy
 filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_action_existing.json
 
-buffalo g resource user
-filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_singular.json
-
 buffalo g resource cars
 filetest -c $GOPATH/src/github.com/gobuffalo/buffalo/buffalo/cmd/filetests/generate_resource_plural.json
 
diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go
index 35fd45a2..8d1eefd7 100644
--- a/packrd/packed-packr.go
+++ b/packrd/packed-packr.go
@@ -26,7 +26,6 @@ var _ = func() error {
 		"1d008b8139b4fb2ec09d8c313f8e8f95": "1f8b08000000000000ff9456dd6ee3bc11bdf7534c75651b3685f6aa709105b2d96453c09b049177b74051248c34b289501c96a4acb881dfbd185272ec00d9fdbe8b2032393c73e687676865f92cd708b20c8a8c1f8d5463c905188f00b2b50a9bf64994d4e46b7a6aeb5a6acad16c77d987bbfd7f36a8c995e8bdfec0b2e9e683055b5be964a369bd46f7f18123a3f7145ae3486bac728f65eb301b8d005e5f41d520c8062fcead153f55d8dc9185fd9e0fbfbebeed7ca30ab5bf7b5eeff7bf8d6d6ec9e6fd5fd365c90f9a0ae6fb3d7b2dbdab3f0e8177f98cfaebdfcdc756bcfb31112e9acbb77fcb4693d128cfe1f2e607280fadc70a02c106b505dfa9506ec06308caac3d3c49de2503dd061d42d8209f94d66a554aae3d233ca1326b70ad11f0056bd9eac0ab59855bd4641b342113a3ad74d1e319702b88af18c6d9d7db87cb9b1fd9ecd476126da5b530eda973b2e3e20aa61ca3583969bc96815c8ce4dc5af698384aadc1511bd083341534aaaa3476d221b716f4887cca6fa8d5153c2154582b839580d54679460a1b04836e8b50a209e8806ad851ebde052f4679ce4bf7d472ba6647ce66b076d45a3f030ca51002984085a5960e2b58dddec1fc137cb9fd79c318c96f83d2786ebd1db520ab0ae431f940f028ad7d84a9ac03ba690fc699970c11ddcd206c6448dfd029ade1e676051bb9c5b461b03bc2e47811bc6c6251396cd72287ead053ebca81708cd583f4d0a1d643d0ff0c20b5a79e76841fd2ee10ca0d96cf5881323199e42a74fcb53b49440cfeb1e04c5f298dfe915948b8385f5d5ccfcf97cb8438034fa0c25030a93bb9e3aee3c356cb122bd0d287c1573c73427dc6dc554819b10eb76806b28c71284bcc2c1b0602835b74dc1ca5648110a3ba352577da7872d297f0cad7b28efd7a760646e9b8026961e8377183dd78f8beb591553203b834db055f8d59ffbb40ef15991bd9e002b28763c1e135c199daef1f7c32cbd2b1fd6414fff36d680335322826be0387957258c6988a62395013df3d8ea39216c5723c793bbda43538fc6f8b3e2475c580cec3b8563a7e70fbef26e204e74860c5dd7066197fbf01df390acc43aea5323ec045717f053204593e7b019b10ac5fe479d775823ae9ad20b7ce95a9f045d88dcd2f1c793f2f54c087fbc4eee18adc1addee61cc4893c1cd3d36b48dd7a5525e3e69ee7ce54ff9b29a72457a72bf14fc08fad349eb0165b939e4461990105887d21014832d94e287d42d8eb3f0924dc4786ac98a0b3206a3dd9f221a674552bbe465dcc49123be7c9e4c06ee3c44d20c89b80586d646e96b3d26863a5d83c509f6f1cea10178f3ebe56a9ce5d90caea9c16b692a7d28236fbfddd66425bdc7e03fd3cb84bdfba89a356f43eda88937d2b64f5a95901a91dc6e0410f93a0cad338c3ada47213fe6946eab265981a652ea1e75c6c3095a1b81c3610ec063ff1611abc7599469532584c1c93b318dc9a184cf5025b9784d065fe462bd19aa2f79142b5e6fc8212853936b22d5c5a17b0fc356287ef2e415953e8f88ea7fd134a9c869ea0f1af1ed40f08aad581f78e8a18b7fe492d0ac6671e52cbe05a2aec4c11ebf3269ed2245e079ac0a910fbf2633c8d0ccbf17d9e41f11e02fefc44a1481ec189d9bc4f21caab33ae2359ef4851a94e31729e681d0eff60a240d285352135f0b29a771f0d42cb9ca83a100d7abd55d2120e38c2ef21c5f646335f24b2683b34f69ddbfdb381aa16ffe2b420fd3a9a1309d029a78c18a6229620579969f0c725811541449335887e0b0a4a6c1788de29005ebe865f79b5a479b3fd0271fbe40f3d4216fcafcabeee8f33e3c888f0b95d04e474d512ceffb5a2cd2e4e1f7d81964d651d5c6ebd34f93a258de7124d7282b747e018db4fff6815f1bff49ff5eb37fcdafc875d25558cd59db295bf4e5c9f68cb2e75ef97f000000fffffc509619290c0000",
 		"1d2a7dc90d5509ab525ab3147a1a4bf9": "1f8b08000000000000ff348e314fc330148477ff8ac3ca9030383b12030b124b8580bd7ab8afa9456c07bfe7012cff77948a6e77a7d3ddb791ffa285415e434e624c885b2e8ad100565934a4c59add2c412ff5d3f91c67d1c2ea2f65be16ce3f73e1ef1a0a5b3399d650282d8c81f0f008f73f8cdecdb9268f9104f74fd7f0bd06e5091f2c7a6c6d70795371078aecde58722d9e7bbfa9636b18c8bd92785ac32fa3f771423300897ba6b08ef690152f715b3972523eddd9c9f41d87d3697fff0b0000ffffd638316cea000000",
 		"20f0fffdc5b71982ce85ee87b75fb3db": "1f8b08000000000000ff1cc9b16ac3301000d0d9fa8a4393548c6a3a163ad4a6d4433bd9d0b11cf2d988c8ba44270d21e4df43bcbe77467fc28d007d099c44a9b5260f06055e3e0f9a6a2864612629ff23ef34625a226563e1a69a4c02ef1f80e2c6f9f7c7e8576ddd371563956a50dcd7a562346f5dd7422671032f648f1838150c49cc937b5eae6e2a39a4cdd816f41f45cf3b4161e8ebba62646dd55d3d020000ffffeff2ca6daa000000",
-		"219f70cdf30f6f12b6c726d0cb3c36b8": "1f8b08000000000000ff9490cb4ef3301085f7798aa9aafc6a16b137ff86aa170995dba61bd845883af124b67032953d2e1215ef8e720116b0e9caf2f89cef1ccf1ceed11dd187242966c575b44ec3232b8ee17961988f6129a5c69350efd1a3a8a895adf2afa5620cb28c75ad1cc91775b4fdcd3a2dc3e0950d4d8fc28cf86de9555799bd6a71ddaac0e8b30b0246b6eb87bcd558dbceb2a5ee41afff5ffdfb4d2e66c51deda8fa4968485325c837b2b16c6239047d97945f25c7f6229c9aec526f96e4799eec8971094fc606a8ad43b0015464ca1becd02b462d6047b027861b6d79b024ab740d357958980c6c07130fce906e92f91c8a432f30a2ff20a49bc35fc546c56d746e526503d5d6b03062475506678f1c7d07fd7235bd75d3fca30f59a5309c9f010000ffff3df549080c020000",
 		"249b50674fa80d5d2389e61231cdbc08": "1f8b08000000000000ff2a484cce4e4c4f55484c2ec9cccf2be6e2cacc2dc82f2a51504acf2cc9284dd24bcecfd54fcf4f2a4d4b4bccc9d787d24a5c80000000ffffdd06e7bf37000000",
 		"2b101e95a5f58f9db6a47dae28e04166": "1f8b08000000000000ff7c52cd8a1b3d10bcfb29fa1318fc416686dc72900cf9bb267b302c3985b6a667d56b8d24a4f62c8ef1bb87b16cafc3929c24d155d5adaad6ff7df9fe79f3e3e12b3819fd7aa1eb01a01d613f5f00f44882107024a326a69714b328b031080531ea857b71a6a7892d35e7c73be0c0c2e89b62d19379afee85acc35c488cdacbd07cb89684c5d3fad37e18d04768e07884362629edc794da6f3852bb9911fc8be074d25d852f008ec706788010e50effc8e21e699bd0eee074aa0d96068a1c3c1547241b7c5aa96d6dd6da52d4ffb0bcaa51e8ff41c2943c5b148ee19ef8a74bb6e4a1499871bcf309f7e228085b96c34f893b0a0ababf702fe51b771ee42d1f96eb5709cf610799bc516c6350e0320d176229240f286ea578c4272add80d30c6ad9c6f307ce21e8ee1ab9dec6feb05e54dd9e27b01e4b316a1e073950be84560d4a98e7ac576af0585c3b2fd0ab2b157260f2fdcda8aee7e9aabe34f08c13169b39bd35f8f9e6afeeea4cbaab0bfa3b0000ffff85cad3beb8020000",
 		"380ebe4d9806da77bde6826811c711a7": "1f8b08000000000000ff84524d6bdc3010bdeb573c9425b40549ec2d98f410dab23d357b28ed31c8f25816ebb584242f856dfe7b91ec7c7443e9e99937efc333a8a5de477a4826ba901b06088c1344826a67377609ca7a95a2519b7764060f7e3e4b1f72927721c8bd36076d697fb08f8f1cbf61e60cd1812b0ed16fdfd734d33d47fccb5a75c743e722444098dbd119a553a29ceac87a58ca1033accbc3dc4ae38fcafa76ee7b3d7a7581ec7c16703d5eba7eba3c7ca680b5698dfb2b6bd493551d05658e5dc12aec2880a63447aa993426bac81019e204a9a4948b64ea9e14f42bf898b1bffbfef523df146836bbfb82aa7513672c656d292d27cf943263b28038e9981a5c3f7f33e0a4a3d3edb8a881ddfdc3976f3f1af0a2e18c5d615717c08962727e8219bc338481c64091c93991585614eea82d35b87e458dbab603eb6ca19b95fe9f7b2b6ede58b7f286b1e22ebf7b854f839e2c217bf0dbdb061fde74f3329b13210f8485c2ce3f6dc3804bdb525ad9d767aa176db0aef3f2a4cb85d7c7b10cff040000ffff5b69610df5020000",
@@ -288,12 +287,6 @@ var _ = func() error {
 		}()
 
 
-	func() {
-		b := packr.New("github.com/gobuffalo/helpers/genny/docs/templates", "../docs/templates")
-		b.SetResolver("README.md.plush", packr.Pointer{ForwardBox: gk, ForwardPath: "219f70cdf30f6f12b6c726d0cb3c36b8"})
-		}()
-
-
 	func() {
 		b := packr.New("pop:genny:config", "../config/templates")
 		b.SetResolver("cockroach.yml.tmpl", packr.Pointer{ForwardBox: gk, ForwardPath: "50f60207eb74d1b7f2b9b07fa815c278"})
diff --git a/runtime/version.go b/runtime/version.go
index 42cff956..5dd9aaf1 100644
--- a/runtime/version.go
+++ b/runtime/version.go
@@ -1,4 +1,4 @@
 package runtime
 
 // Version is the current version of the buffalo binary
-const Version = "development"
+const Version = "v0.14.11"


Test patch:
diff --git a/default_context_test.go b/default_context_test.go
index ea635136..fd4db7fb 100644
--- a/default_context_test.go
+++ b/default_context_test.go
@@ -18,9 +18,8 @@ func basicContext() DefaultContext {
 	return DefaultContext{
 		Context: context.Background(),
 		logger:  logger.New(logger.DebugLevel),
-		data:    make(map[string]interface{}),
+		data:    &sync.Map{},
 		flash:   &Flash{data: make(map[string][]string)},
-		moot:    &sync.RWMutex{},
 	}
 }