Update vendored dependencies, fixing the build on Go 1.8.

.travis.yml

@@ -2,7 +2,10 @@
 # Cf. http://docs.travis-ci.com/user/languages/go/
 
 language: go
-go: 1.7
+
+go:
+  - 1.7.4
+  - tip
 
 # Use the virtualized Trusty beta Travis is running in order to get support for
 # installing fuse.

flags.go

@@ -37,10 +37,7 @@ VERSION:
    {{end}}{{if len .Authors}}
 AUTHOR(S):
    {{range .Authors}}{{ . }}{{end}}
-   {{end}}{{if .Commands}}
-COMMANDS:
-   {{range .Commands}}{{join .Names ", "}}{{ "\t" }}{{.Usage}}
-   {{end}}{{end}}{{if .Flags}}
+   {{end}}{{if .Flags}}
 GLOBAL OPTIONS:
    {{range .Flags}}{{.}}
    {{end}}{{end}}{{if .Copyright }}
@@ -61,15 +58,9 @@ func newApp() (app *cli.App) {
 		Name:     "gcsfuse",
 		Version:  getVersion(),
 		Usage:    "Mount a GCS bucket locally",
-		HideHelp: true,
 		Writer:   os.Stderr,
 		Flags: []cli.Flag{
 
-			cli.BoolFlag{
-				Name:  "help, h",
-				Usage: "Print this help text and exit successfuly.",
-			},
-
 			cli.BoolFlag{
 				Name:  "foreground",
 				Usage: "Stay in the foreground after mounting.",

internal/fs/local_modifications_test.go

@@ -2514,7 +2514,7 @@ func (t *RenameTest) OverExisting_WrongType() {
 
 	// Renaming one over the other shouldn't work.
 	err = os.Rename(filePath, dirPath)
-	ExpectThat(err, Error(HasSubstr("is a directory")))
+	ExpectThat(err, Error(MatchesRegexp("file exists|is a directory")))
 
 	err = os.Rename(dirPath, filePath)
 	ExpectThat(err, Error(HasSubstr("not a directory")))