diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index a7e150e215e..dd08ac91121 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "github.com/grafana/grafana",
-	"GoVersion": "go1.4.2",
+	"GoVersion": "go1.3",
 	"Packages": [
 		"./pkg/..."
 	],
@@ -13,6 +13,14 @@
 			"ImportPath": "github.com/Unknwon/macaron",
 			"Rev": "93de4f3fad97bf246b838f828e2348f46f21f20a"
 		},
+		{
+			"ImportPath": "github.com/dalu/slug",
+			"Rev": "6dbd13912e9be466e2c1de349a2c7d1466c97e07"
+		},
+		{
+			"ImportPath": "github.com/dalu/unidecode",
+			"Rev": "339814d47f3e32a6f7036a0a4c56ed9b373dd755"
+		},
 		{
 			"ImportPath": "github.com/go-sql-driver/mysql",
 			"Comment": "v1.2-26-g9543750",
@@ -27,10 +35,6 @@
 			"Comment": "v0.4.2-58-ge2889e5",
 			"Rev": "e2889e5517600b82905f1d2ba8b70deb71823ffe"
 		},
-		{
-			"ImportPath": "github.com/gosimple/slug",
-			"Rev": "a2392a4a87fa0366cbff131d3fd421f83f52492f"
-		},
 		{
 			"ImportPath": "github.com/jtolds/gls",
 			"Rev": "f1ac7f4f24f50328e6bc838ca4437d1612a0243c"
@@ -87,10 +91,6 @@
 		{
 			"ImportPath": "gopkgs.com/pool.v1",
 			"Rev": "c850f092aad1780cbffff25f471c5cc32097932a"
-		},
-		{
-			"ImportPath": "gopkgs.com/unidecode.v1",
-			"Rev": "4deae2c05236b41cc39f8144ac87a837ba974d40"
 		}
 	]
 }
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/README.md b/Godeps/_workspace/src/github.com/dalu/slug/README.md
similarity index 72%
rename from Godeps/_workspace/src/github.com/gosimple/slug/README.md
rename to Godeps/_workspace/src/github.com/dalu/slug/README.md
index a2649bdb170..ddefc36ff04 100644
--- a/Godeps/_workspace/src/github.com/gosimple/slug/README.md
+++ b/Godeps/_workspace/src/github.com/dalu/slug/README.md
@@ -4,10 +4,9 @@ slug
 Package `slug` generate slug from unicode string, URL-friendly slugify with
 multiple languages support.
 
-[![GoDoc](https://godoc.org/github.com/gosimple/slug?status.png)](https://godoc.org/github.com/gosimple/slug)
-[![Build Status](https://drone.io/github.com/gosimple/slug/status.png)](https://drone.io/github.com/gosimple/slug/latest)
+[![GoDoc](https://godoc.org/github.com/dalu/slug?status.png)](https://godoc.org/github.com/dalu/slug)
 
-[Documentation online](http://godoc.org/github.com/gosimple/slug)
+[Documentation online](http://godoc.org/github.com/dalu/slug)
 
 ## Example
 
@@ -38,12 +37,9 @@ multiple languages support.
 		fmt.Println(textSub) // Will print 'sand-is-hot'
 	}
 
-### Requests or bugs?
-<https://github.com/gosimple/slug/issues>
-
 ## Installation
 
-	go get -u github.com/gosimple/slug
+	go get -u github.com/dalu/slug
 
 ## License
 
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go b/Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gosimple/slug/default_substitution.go
rename to Godeps/_workspace/src/github.com/dalu/slug/default_substitution.go
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/doc.go b/Godeps/_workspace/src/github.com/dalu/slug/doc.go
similarity index 91%
rename from Godeps/_workspace/src/github.com/gosimple/slug/doc.go
rename to Godeps/_workspace/src/github.com/dalu/slug/doc.go
index ffbe2c223f5..39f57b30eb4 100644
--- a/Godeps/_workspace/src/github.com/gosimple/slug/doc.go
+++ b/Godeps/_workspace/src/github.com/dalu/slug/doc.go
@@ -12,7 +12,7 @@ Example:
 	package main
 
 	import(
-		"github.com/gosimple/slug"
+		"github.com/dalu/slug"
 		"fmt"
 	)
 
@@ -35,9 +35,5 @@ Example:
 		textSub := slug.Make("water is hot")
 		fmt.Println(textSub) // Will print 'sand-is-hot'
 	}
-
-Requests or bugs?
-
-https://github.com/gosimple/slug/issues
 */
 package slug
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go b/Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gosimple/slug/languages_substitution.go
rename to Godeps/_workspace/src/github.com/dalu/slug/languages_substitution.go
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/slug.go b/Godeps/_workspace/src/github.com/dalu/slug/slug.go
similarity index 99%
rename from Godeps/_workspace/src/github.com/gosimple/slug/slug.go
rename to Godeps/_workspace/src/github.com/dalu/slug/slug.go
index 26974fbd7d8..85d614f941e 100644
--- a/Godeps/_workspace/src/github.com/gosimple/slug/slug.go
+++ b/Godeps/_workspace/src/github.com/dalu/slug/slug.go
@@ -6,7 +6,7 @@
 package slug
 
 import (
-	"gopkgs.com/unidecode.v1"
+	"github.com/dalu/unidecode"
 	"regexp"
 	"strings"
 )
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go b/Godeps/_workspace/src/github.com/dalu/slug/slug_test.go
similarity index 100%
rename from Godeps/_workspace/src/github.com/gosimple/slug/slug_test.go
rename to Godeps/_workspace/src/github.com/dalu/slug/slug_test.go
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/.gitignore b/Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/.gitignore
rename to Godeps/_workspace/src/github.com/dalu/unidecode/.gitignore
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/LICENSE b/Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/LICENSE
rename to Godeps/_workspace/src/github.com/dalu/unidecode/LICENSE
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md b/Godeps/_workspace/src/github.com/dalu/unidecode/README.md
similarity index 65%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md
rename to Godeps/_workspace/src/github.com/dalu/unidecode/README.md
index fa5d70841fb..589d955593c 100644
--- a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/README.md
+++ b/Godeps/_workspace/src/github.com/dalu/unidecode/README.md
@@ -3,10 +3,4 @@ unidecode
 
 Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations.
 
-Please, use the following import path to ensure a stable API:
-
-```go
-    import "gopkgs.com/unidecode.v1"
-```
-
 View other available versions, documentation and examples at http://gopkgs.com/unidecode
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/decode.go b/Godeps/_workspace/src/github.com/dalu/unidecode/decode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/decode.go
rename to Godeps/_workspace/src/github.com/dalu/unidecode/decode.go
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/make_table.go b/Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/make_table.go
rename to Godeps/_workspace/src/github.com/dalu/unidecode/make_table.go
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.go b/Godeps/_workspace/src/github.com/dalu/unidecode/table.go
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.go
rename to Godeps/_workspace/src/github.com/dalu/unidecode/table.go
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.txt b/Godeps/_workspace/src/github.com/dalu/unidecode/table.txt
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/table.txt
rename to Godeps/_workspace/src/github.com/dalu/unidecode/table.txt
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode.go b/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode.go
rename to Godeps/_workspace/src/github.com/dalu/unidecode/unidecode.go
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode_test.go b/Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go
similarity index 100%
rename from Godeps/_workspace/src/gopkgs.com/unidecode.v1/unidecode_test.go
rename to Godeps/_workspace/src/github.com/dalu/unidecode/unidecode_test.go
diff --git a/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore b/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore
deleted file mode 100644
index 02a8da53752..00000000000
--- a/Godeps/_workspace/src/github.com/gosimple/slug/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-_*
-cover*.out
diff --git a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go b/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go
deleted file mode 100644
index a907de14384..00000000000
--- a/Godeps/_workspace/src/gopkgs.com/unidecode.v1/gopkgs.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package unidecode
-
-import (
-	"fmt"
-	"reflect"
-)
-
-// gopkgs.go: v1
-
-// NOTE: This file is autogenerated by gopkgs.com.
-const (
-	goPkgsSrcPath = "github.com/rainycape/unidecode"
-	goPkgsName    = "unidecode"
-	goPkgsErrFmt  = "invalid import path %s - please use gopkgs.com/%s.v1 or see http://gopkgs.com/%s"
-)
-
-type goPkgsCheck struct{}
-
-func init() {
-	typ := reflect.TypeOf(goPkgsCheck{})
-	if typ.PkgPath() == goPkgsSrcPath {
-		panic(fmt.Errorf(goPkgsErrFmt, typ.PkgPath(), goPkgsName, goPkgsName))
-	}
-}
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 7c4e8db1611..159d4e1a3c6 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gosimple/slug"
+	"github.com/dalu/slug"
 )
 
 // Typed errors