diff --git a/Gopkg.lock b/Gopkg.lock
index 1d6ad607..ac906fb8 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -1,4 +1,5 @@
-memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
 
 [[projects]]
   name = "code.cloudfoundry.org/bytefmt"
@@ -20,8 +21,12 @@ memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
 [[projects]]
   branch = "master"
   name = "github.com/goshuirc/irc-go"
-  packages = ["ircfmt","ircmatch","ircmsg"]
-  revision = "1cb16094f055aa5f5b49a1609aeada54d963433c"
+  packages = [
+    "ircfmt",
+    "ircmatch",
+    "ircmsg"
+  ]
+  revision = "8d136c4f92871c1c132bf702022363add479291b"
 
 [[projects]]
   branch = "master"
@@ -50,7 +55,11 @@ memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
 [[projects]]
   branch = "master"
   name = "github.com/stackimpact/stackimpact-go"
-  packages = [".","internal","internal/pprof/profile"]
+  packages = [
+    ".",
+    "internal",
+    "internal/pprof/profile"
+  ]
   revision = "8b5b02c181e477dafcf505342d8a79b5c8241da7"
 
 [[projects]]
@@ -86,7 +95,10 @@ memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
 [[projects]]
   branch = "master"
   name = "github.com/tidwall/rtree"
-  packages = [".","base"]
+  packages = [
+    ".",
+    "base"
+  ]
   revision = "6cd427091e0e662cb4f8e2c9eb1a41e1c46ff0d3"
 
 [[projects]]
@@ -98,19 +110,46 @@ memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
-  packages = ["bcrypt","blowfish","ssh/terminal"]
+  packages = [
+    "bcrypt",
+    "blowfish",
+    "ssh/terminal"
+  ]
   revision = "5119cf507ed5294cc409c092980c7497ee5d6fd2"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
+  packages = [
+    "unix",
+    "windows"
+  ]
   revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/text"
-  packages = ["cases","collate","collate/build","internal","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","runes","secure/bidirule","secure/precis","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"]
+  packages = [
+    "cases",
+    "collate",
+    "collate/build",
+    "internal",
+    "internal/colltab",
+    "internal/gen",
+    "internal/tag",
+    "internal/triegen",
+    "internal/ucd",
+    "language",
+    "runes",
+    "secure/bidirule",
+    "secure/precis",
+    "transform",
+    "unicode/bidi",
+    "unicode/cldr",
+    "unicode/norm",
+    "unicode/rangetable",
+    "width"
+  ]
   revision = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1"
 
 [[projects]]
@@ -118,3 +157,10 @@ memo = "d665cbc0144a6e4c06ed8fcfbee8594a7203e47e654eeca63e11d651ae62a3a7"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
   revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1f6e6db999e9e75b04aee6f0018be1557848f8248a28cf21783188fdeb866718"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 47c02714..08debd28 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -57,7 +57,7 @@
 
 [[dependencies]]
   branch = "master"
-  name = "github.com/DanielOaks/girc-go"
+  name = "github.com/DanielOaks/irc-go"
 
 [[dependencies]]
   branch = "master"
@@ -67,14 +67,6 @@
   branch = "master"
   name = "github.com/docopt/docopt-go"
 
-[[dependencies]]
-  branch = "master"
-  name = "github.com/gorilla/mux"
-
-[[dependencies]]
-  branch = "master"
-  name = "github.com/gorilla/websocket"
-
 [[dependencies]]
   branch = "master"
   name = "github.com/mattn/go-colorable"
diff --git a/vendor b/vendor
index f606564d..9dd7467d 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit f606564da4732e70afeb93a0fc5d80a9f8a04c56
+Subproject commit 9dd7467d3dfc045cf5dee2f6f6951465437e2ac5