diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ba077a4
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+bin
diff --git a/go.mod b/go.mod
index 90b77cf..ccd6634 100644
--- a/go.mod
+++ b/go.mod
@@ -4,6 +4,9 @@ require (
 	github.com/mikefarah/yaml/v2 v2.4.0
 	github.com/pkg/errors v0.8.1
 	github.com/spf13/cobra v0.0.5
+	golang.org/x/tools v0.0.0-20191030203535-5e247c9ad0a0 // indirect
 	gopkg.in/imdario/mergo.v0 v0.3.7
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
 )
+
+go 1.13
diff --git a/go.sum b/go.sum
index 310785f..40ff65e 100644
--- a/go.sum
+++ b/go.sum
@@ -31,8 +31,15 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20191030203535-5e247c9ad0a0 h1:s5lp4ug7qHzUccgyFdjsX7OZDzHXRaePrF3B3vmUiuM=
+golang.org/x/tools v0.0.0-20191030203535-5e247c9ad0a0/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/imdario/mergo.v0 v0.3.7 h1:QDotlIZtaO/p+Um0ok18HRTpq5i5/SAk/qprsor+9c8=
diff --git a/scripts/devtools.sh b/scripts/devtools.sh
index 6d488f9..3113b04 100755
--- a/scripts/devtools.sh
+++ b/scripts/devtools.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
-
-wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.21.0
\ No newline at end of file
+set -e
+wget -O - -q https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.21.0
+go get golang.org/x/tools/cmd/goimports
\ No newline at end of file
diff --git a/yq.go b/yq.go
index 1675cb4..c59128f 100644
--- a/yq.go
+++ b/yq.go
@@ -13,8 +13,8 @@ import (
 	errors "github.com/pkg/errors"
 
 	yaml "github.com/mikefarah/yaml/v2"
-	logging "gopkg.in/op/go-logging.v1"
 	"github.com/spf13/cobra"
+	logging "gopkg.in/op/go-logging.v1"
 )
 
 var trimOutput = true