diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go b/Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go
index 31f4fcf3a..bc3208009 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/fs/bench/bench_test.go
@@ -1,6 +1,7 @@
 package bench_test
 
 import (
+	"context"
 	"io"
 	"io/ioutil"
 	"os"
@@ -10,7 +11,6 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"context"
 )
 
 type benchConfig struct {
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go
index a5d28cba8..937ef16a5 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/record.go
@@ -1,12 +1,12 @@
 package record
 
 import (
+	"context"
 	"sync"
 	"sync/atomic"
 
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"context"
 )
 
 // Writes gathers data from FUSE Write calls.
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go
index e4788baae..c0ebcd164 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record/wait.go
@@ -1,12 +1,12 @@
 package record
 
 import (
+	"context"
 	"sync"
 	"time"
 
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"context"
 )
 
 type nothing struct{}
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go
index 6154951fc..215c4a625 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/testfs.go
@@ -1,11 +1,11 @@
 package fstestutil
 
 import (
+	"context"
 	"os"
 
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
-	"context"
 )
 
 // SimpleFS is a trivial FS that just implements the Root method.
diff --git a/Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go b/Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go
index 3706b436f..919ab63b4 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/fs/serve_test.go
@@ -2,6 +2,7 @@ package fs_test
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	"io"
 	"io/ioutil"
@@ -21,7 +22,6 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil/record"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fuseutil"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/syscallx"
-	"context"
 )
 
 // TO TEST:
diff --git a/Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go b/Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go
index 4c5637cb6..3a6a688fa 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/hellofs/hello.go
@@ -2,6 +2,7 @@
 package main
 
 import (
+	"context"
 	"flag"
 	"fmt"
 	"log"
@@ -10,7 +11,6 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 	_ "github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"context"
 )
 
 var Usage = func() {
diff --git a/Godeps/_workspace/src/bazil.org/fuse/options_test.go b/Godeps/_workspace/src/bazil.org/fuse/options_test.go
index f173b6d8d..6096ec031 100644
--- a/Godeps/_workspace/src/bazil.org/fuse/options_test.go
+++ b/Godeps/_workspace/src/bazil.org/fuse/options_test.go
@@ -1,6 +1,7 @@
 package fuse_test
 
 import (
+	"context"
 	"os"
 	"runtime"
 	"syscall"
@@ -9,7 +10,6 @@ import (
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs"
 	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/bazil.org/fuse/fs/fstestutil"
-	"context"
 )
 
 func init() {