diff --git a/samples/go/decent/ipfs-chat/main.go b/samples/go/decent/ipfs-chat/main.go
index 7514c9e2f6..7f23a45cd5 100644
--- a/samples/go/decent/ipfs-chat/main.go
+++ b/samples/go/decent/ipfs-chat/main.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
@@ -21,7 +24,7 @@ import (
 	"github.com/attic-labs/noms/samples/go/decent/lib"
 	"github.com/ipfs/go-ipfs/core"
 	"github.com/jroimartin/gocui"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func main() {
diff --git a/samples/go/decent/lib/datapager.go b/samples/go/decent/lib/datapager.go
index 4b694b0496..4970678d55 100644
--- a/samples/go/decent/lib/datapager.go
+++ b/samples/go/decent/lib/datapager.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/event.go b/samples/go/decent/lib/event.go
index 7d15df73cf..08b4401cc8 100644
--- a/samples/go/decent/lib/event.go
+++ b/samples/go/decent/lib/event.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/importer.go b/samples/go/decent/lib/importer.go
index 60c08405fe..0bfca3760d 100644
--- a/samples/go/decent/lib/importer.go
+++ b/samples/go/decent/lib/importer.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/logger.go b/samples/go/decent/lib/logger.go
index 5ab349f044..cc4761788a 100644
--- a/samples/go/decent/lib/logger.go
+++ b/samples/go/decent/lib/logger.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/model.go b/samples/go/decent/lib/model.go
index e7118594ff..24f6266f62 100644
--- a/samples/go/decent/lib/model.go
+++ b/samples/go/decent/lib/model.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/model_test.go b/samples/go/decent/lib/model_test.go
index 1addda1cc4..0d908179d7 100644
--- a/samples/go/decent/lib/model_test.go
+++ b/samples/go/decent/lib/model_test.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/pubsub.go b/samples/go/decent/lib/pubsub.go
index 1cd6eb2f8f..28013a2955 100644
--- a/samples/go/decent/lib/pubsub.go
+++ b/samples/go/decent/lib/pubsub.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
@@ -13,7 +16,7 @@ import (
 	"github.com/attic-labs/noms/go/hash"
 	"github.com/attic-labs/noms/samples/go/decent/dbg"
 	"github.com/ipfs/go-ipfs/core"
-	"github.com/jbenet/go-base58"
+	"github.com/mr-tron/base58/base58"
 )
 
 var (
diff --git a/samples/go/decent/lib/term_index.go b/samples/go/decent/lib/term_index.go
index bbe6f73352..453b0e768d 100644
--- a/samples/go/decent/lib/term_index.go
+++ b/samples/go/decent/lib/term_index.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/term_index_test.go b/samples/go/decent/lib/term_index_test.go
index 83995552d9..a703e62ea0 100644
--- a/samples/go/decent/lib/term_index_test.go
+++ b/samples/go/decent/lib/term_index_test.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/lib/termui.go b/samples/go/decent/lib/termui.go
index 8bd8d9d77b..652d30be5a 100644
--- a/samples/go/decent/lib/termui.go
+++ b/samples/go/decent/lib/termui.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
diff --git a/samples/go/decent/p2p-chat/main.go b/samples/go/decent/p2p-chat/main.go
index 5a8f9662cc..851c49e2f5 100644
--- a/samples/go/decent/p2p-chat/main.go
+++ b/samples/go/decent/p2p-chat/main.go
@@ -1,3 +1,6 @@
+// See: https://github.com/attic-labs/noms/issues/3808
+// +build ignore
+
 // Copyright 2017 Attic Labs, Inc. All rights reserved.
 // Licensed under the Apache License, version 2.0:
 // http://www.apache.org/licenses/LICENSE-2.0
@@ -22,7 +25,7 @@ import (
 	"github.com/attic-labs/noms/samples/go/decent/dbg"
 	"github.com/attic-labs/noms/samples/go/decent/lib"
 	"github.com/jroimartin/gocui"
-	"gopkg.in/alecthomas/kingpin.v2"
+	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
 func main() {