Merge remote-tracking branch 'origin/master'

Author: bradrydzewski

drone/exec/exec.go

@@ -136,7 +136,7 @@ var Command = cli.Command{
 		},
 		cli.StringFlag{
 			Name:  "repo",
-			Usage: "git repository name (e.g. ocotcat/hello-world)",
+			Usage: "git repository name (e.g. octocat/hello-world)",
 		},
 		cli.StringFlag{
 			Name:  "deploy-to",

drone/server/server_list.go

@@ -30,7 +30,7 @@ var serverListCmd = cli.Command{
 		},
 		cli.BoolTFlag{
 			Name:  "H",
-			Usage: "include columne headers",
+			Usage: "include column headers",
 		},
 		cli.StringFlag{
 			Name:   "format",