Fixing godep

105 files changed, 146 insertions, 146 deletions

diff --git a/Godeps/_workspace/src/code.google.com/p/log4go/examples/ConsoleLogWriter_Manual.go b/Godeps/_workspace/src/code.google.com/p/log4go/examples/ConsoleLogWriter_Manual.go
index d5ab3fa6c..394ca8380 100644
--- a/Godeps/_workspace/src/code.google.com/p/log4go/examples/ConsoleLogWriter_Manual.go
+++ b/Godeps/_workspace/src/code.google.com/p/log4go/examples/ConsoleLogWriter_Manual.go
@@ -4,7 +4,7 @@ import (
 	"time"
 )
 
-import l4g "github.com/mattermost/platform/Godeps/_workspace/src/code.google.com/p/log4go"
+import l4g "code.google.com/p/log4go"
 
 func main() {
 	log := l4g.NewLogger()
diff --git a/Godeps/_workspace/src/code.google.com/p/log4go/examples/FileLogWriter_Manual.go b/Godeps/_workspace/src/code.google.com/p/log4go/examples/FileLogWriter_Manual.go
index 2f73bf3ee..efd596aa6 100644
--- a/Godeps/_workspace/src/code.google.com/p/log4go/examples/FileLogWriter_Manual.go
+++ b/Godeps/_workspace/src/code.google.com/p/log4go/examples/FileLogWriter_Manual.go
@@ -8,7 +8,7 @@ import (
 	"time"
 )
 
-import l4g "github.com/mattermost/platform/Godeps/_workspace/src/code.google.com/p/log4go"
+import l4g "code.google.com/p/log4go"
 
 const (
 	filename = "flw.log"
diff --git a/Godeps/_workspace/src/code.google.com/p/log4go/examples/SocketLogWriter_Manual.go b/Godeps/_workspace/src/code.google.com/p/log4go/examples/SocketLogWriter_Manual.go
index 6371d5933..400b698ca 100644
--- a/Godeps/_workspace/src/code.google.com/p/log4go/examples/SocketLogWriter_Manual.go
+++ b/Godeps/_workspace/src/code.google.com/p/log4go/examples/SocketLogWriter_Manual.go
@@ -4,7 +4,7 @@ import (
 	"time"
 )
 
-import l4g "github.com/mattermost/platform/Godeps/_workspace/src/code.google.com/p/log4go"
+import l4g "code.google.com/p/log4go"
 
 func main() {
 	log := l4g.NewLogger()
diff --git a/Godeps/_workspace/src/code.google.com/p/log4go/examples/XMLConfigurationExample.go b/Godeps/_workspace/src/code.google.com/p/log4go/examples/XMLConfigurationExample.go
index 5297f0728..164c2add4 100644
--- a/Godeps/_workspace/src/code.google.com/p/log4go/examples/XMLConfigurationExample.go
+++ b/Godeps/_workspace/src/code.google.com/p/log4go/examples/XMLConfigurationExample.go
@@ -1,6 +1,6 @@
 package main
 
-import l4g "github.com/mattermost/platform/Godeps/_workspace/src/code.google.com/p/log4go"
+import l4g "code.google.com/p/log4go"
 
 func main() {
 	// Load the configuration (isn't this easy?)
diff --git a/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock.go b/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock.go
index f2271475e..29a1f4b23 100644
--- a/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock.go
+++ b/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock.go
@@ -1,6 +1,6 @@
 package apns
 
-import "github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/mock"
+import "github.com/stretchr/testify/mock"
 
 type MockClient struct {
 	mock.Mock
diff --git a/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock_test.go b/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock_test.go
index 84bbcf8e8..86e997b5a 100644
--- a/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock_test.go
+++ b/Godeps/_workspace/src/github.com/anachronistic/apns/client_mock_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestMockClientConnectAndWrite(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/braintree/manners/server_test.go b/Godeps/_workspace/src/github.com/braintree/manners/server_test.go
index e73613aa8..1ab7f19b4 100644
--- a/Godeps/_workspace/src/github.com/braintree/manners/server_test.go
+++ b/Godeps/_workspace/src/github.com/braintree/manners/server_test.go
@@ -1,7 +1,7 @@
 package manners
 
 import (
-	helpers "github.com/mattermost/platform/Godeps/_workspace/src/github.com/braintree/manners/test_helpers"
+	helpers "github.com/braintree/manners/test_helpers"
 	"net"
 	"net/http"
 	"testing"
diff --git a/Godeps/_workspace/src/github.com/braintree/manners/transition_test.go b/Godeps/_workspace/src/github.com/braintree/manners/transition_test.go
index 303ff1e98..34fe5c688 100644
--- a/Godeps/_workspace/src/github.com/braintree/manners/transition_test.go
+++ b/Godeps/_workspace/src/github.com/braintree/manners/transition_test.go
@@ -1,7 +1,7 @@
 package manners
 
 import (
-	helpers "github.com/mattermost/platform/Godeps/_workspace/src/github.com/braintree/manners/test_helpers"
+	helpers "github.com/braintree/manners/test_helpers"
 	"net/http"
 	"strings"
 	"testing"
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common_test.go
index a25252cc1..39b7525b3 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/common_test.go
@@ -21,7 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // custom type to test Stinger interface on non-pointer receiver.
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump_test.go
index 0762e59ae..2b320401d 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dump_test.go
@@ -67,7 +67,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // dumpTest is used to describe a test to be perfomed against the Dump method.
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dumpcgo_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dumpcgo_test.go
index 01f521794..18a38358e 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dumpcgo_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/dumpcgo_test.go
@@ -26,7 +26,7 @@ package spew_test
 import (
 	"fmt"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/testdata"
+	"github.com/davecgh/go-spew/spew/testdata"
 )
 
 func addCgoDumpTests() {
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/example_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/example_test.go
index 2f739f278..de6c4e309 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/example_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/example_test.go
@@ -19,7 +19,7 @@ package spew_test
 import (
 	"fmt"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 )
 
 type Flag int
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format_test.go
index 793f9fb88..b664b3f13 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/format_test.go
@@ -72,7 +72,7 @@ import (
 	"testing"
 	"unsafe"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // formatterTest is used to describe a test to be perfomed against NewFormatter.
diff --git a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew_test.go b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew_test.go
index ada4256b0..dbbc08567 100644
--- a/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew_test.go
+++ b/Godeps/_workspace/src/github.com/davecgh/go-spew/spew/spew_test.go
@@ -23,7 +23,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
+	"github.com/davecgh/go-spew/spew"
 )
 
 // spewFunc is used to identify which public function of the spew package or
diff --git a/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go b/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
index 247962f2d..79967ae44 100644
--- a/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
+++ b/Godeps/_workspace/src/github.com/disintegration/imaging/helpers.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/bmp"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/tiff"
+	"golang.org/x/image/bmp"
+	"golang.org/x/image/tiff"
 )
 
 type Format int
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go b/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go
index 3eb4bcd77..b6f205b7f 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/internal/redistest/testdb.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 type testConn struct {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go
index 06a2c8fa7..24887cf03 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/conn_test.go
@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 type testConn struct {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go
index c29b35f81..d66ef84b6 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool.go
@@ -25,7 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/internal"
+	"github.com/garyburd/redigo/internal"
 )
 
 var nowFunc = time.Now // for testing
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
index 89e46e08d..9419a128f 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pool_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 type poolTestConn struct {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go
index 05e60763c..a3ed84e68 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/pubsub_test.go
@@ -20,7 +20,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 func publish(channel, value interface{}) {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go
index 83c0c7b98..2c774866d 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/reply_test.go
@@ -19,7 +19,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 type valueError struct {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go
index af1f2c2da..d364dff42 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/scan_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 var scanConversionTests = []struct {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go
index 5d414ea59..42f3c0363 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/script_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 func ExampleScript(c redis.Conn, reply interface{}, err error) {
diff --git a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go
index 3e4bca418..1d86ee6ce 100644
--- a/Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go
+++ b/Godeps/_workspace/src/github.com/garyburd/redigo/redis/zpop_example_test.go
@@ -16,7 +16,7 @@ package redis_test
 
 import (
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 // zpop pops a value from the ZSET key using WATCH/MULTI/EXEC commands.
diff --git a/Godeps/_workspace/src/github.com/go-gorp/gorp/gorp_test.go b/Godeps/_workspace/src/github.com/go-gorp/gorp/gorp_test.go
index f6739e82d..895ab450e 100644
--- a/Godeps/_workspace/src/github.com/go-gorp/gorp/gorp_test.go
+++ b/Godeps/_workspace/src/github.com/go-gorp/gorp/gorp_test.go
@@ -28,8 +28,8 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/mattermost/platform/Godeps/_workspace/src/github.com/go-sql-driver/mysql"
-	_ "github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq"
+	_ "github.com/go-sql-driver/mysql"
+	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
 	_ "github.com/ziutek/mymysql/godrv"
 )
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/aws/attempt_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/aws/attempt_test.go
index 2f60dca6d..8ba497715 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/aws/attempt_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/aws/attempt_test.go
@@ -3,7 +3,7 @@ package aws_test
 import (
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws.go b/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws.go
index 9680072ba..77bf563d6 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws.go
@@ -20,7 +20,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/vaughan0/go-ini"
+	"github.com/vaughan0/go-ini"
 )
 
 // Defines the valid signers
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws_test.go
index 80e93dee5..0c74a7905 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/aws/aws_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/aws/client_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/aws/client_test.go
index 2298f43dd..c66a86333 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/aws/client_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/aws/client_test.go
@@ -2,7 +2,7 @@ package aws_test
 
 import (
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/aws/sign_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/aws/sign_test.go
index aa1bbede1..c6b685e20 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/aws/sign_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/aws/sign_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/export_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/export_test.go
index dc468e510..4ff913cde 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/export_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/export_test.go
@@ -1,7 +1,7 @@
 package s3
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 )
 
 func Sign(auth aws.Auth, method, path string, params, headers map[string][]string) {
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/multi_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/multi_test.go
index 8813276d7..5c788d9cc 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/multi_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/multi_test.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"strings"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
+	"github.com/goamz/goamz/s3"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3.go
index 9b135f3ce..9490c9b96 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3.go
@@ -18,7 +18,7 @@ import (
 	"encoding/base64"
 	"encoding/xml"
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3_test.go
index 807344258..24d4dfcc0 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/s3"
 	"github.com/goamz/goamz/testutil"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3i_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3i_test.go
index 01344256a..1b898efc4 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3i_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3i_test.go
@@ -11,9 +11,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/s3"
 	"github.com/goamz/goamz/testutil"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3t_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3t_test.go
index e9e216f00..e98c50b29 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3t_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3t_test.go
@@ -1,9 +1,9 @@
 package s3_test
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3test"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/s3"
+	"github.com/goamz/goamz/s3/s3test"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3test/server.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3test/server.go
index 6a1866167..2016b5659 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3test/server.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/s3test/server.go
@@ -7,7 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/xml"
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
+	"github.com/goamz/goamz/s3"
 	"io"
 	"io/ioutil"
 	"log"
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign.go
index 715f2d8d3..722d97d29 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign.go
@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/aws"
 	"log"
 	"sort"
 	"strings"
diff --git a/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign_test.go b/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign_test.go
index 32c478ed7..112e1ca3e 100644
--- a/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign_test.go
+++ b/Godeps/_workspace/src/github.com/goamz/goamz/s3/sign_test.go
@@ -1,8 +1,8 @@
 package s3_test
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/aws"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/goamz/goamz/s3"
+	"github.com/goamz/goamz/aws"
+	"github.com/goamz/goamz/s3"
 	. "gopkg.in/check.v1"
 )
 
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/drawer/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/drawer/main.go
index 0f57d1767..4af981f9f 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/drawer/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/drawer/main.go
@@ -23,9 +23,9 @@ import (
 	"math"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/truetype"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/truetype"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/freetype/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/freetype/main.go
index 50cf246ec..21657a381 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/freetype/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/freetype/main.go
@@ -22,8 +22,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
+	"github.com/golang/freetype"
+	"golang.org/x/image/font"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/gamma/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/gamma/main.go
index 81f476e89..778697f4f 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/gamma/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/gamma/main.go
@@ -19,8 +19,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/raster"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/raster"
+	"golang.org/x/image/math/fixed"
 )
 
 func p(x, y int) fixed.Point26_6 {
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/raster/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/raster/main.go
index ca3cddfdc..ae9c57f97 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/raster/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/raster/main.go
@@ -20,8 +20,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/raster"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/raster"
+	"golang.org/x/image/math/fixed"
 )
 
 type node struct {
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/round/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/round/main.go
index b849f614f..6c3012e62 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/round/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/round/main.go
@@ -26,8 +26,8 @@ import (
 	"math"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/raster"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/raster"
+	"golang.org/x/image/math/fixed"
 )
 
 // pDot returns the dot product p·q.
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/example/truetype/main.go b/Godeps/_workspace/src/github.com/golang/freetype/example/truetype/main.go
index e6b4d28eb..5fc72f771 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/example/truetype/main.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/example/truetype/main.go
@@ -16,9 +16,9 @@ import (
 	"io/ioutil"
 	"log"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/truetype"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/truetype"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 var fontfile = flag.String("fontfile", "../../testdata/luxisr.ttf", "filename of the ttf font")
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/freetype.go b/Godeps/_workspace/src/github.com/golang/freetype/freetype.go
index 27d1c5162..bec01f6b7 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/freetype.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/freetype.go
@@ -13,10 +13,10 @@ import (
 	"image"
 	"image/draw"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/raster"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/truetype"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/raster"
+	"github.com/golang/freetype/truetype"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 // These constants determine the size of the glyph cache. The cache is keyed
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/raster/geom.go b/Godeps/_workspace/src/github.com/golang/freetype/raster/geom.go
index 1a2b8a77b..f3696ea98 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/raster/geom.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/raster/geom.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // maxAbs returns the maximum of abs(a) and abs(b).
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/raster/raster.go b/Godeps/_workspace/src/github.com/golang/freetype/raster/raster.go
index 859bee657..995925e2a 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/raster/raster.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/raster/raster.go
@@ -18,7 +18,7 @@ package raster
 import (
 	"strconv"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // A cell is part of a linked list (for a given yi co-ordinate) of accumulated
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/raster/stroke.go b/Godeps/_workspace/src/github.com/golang/freetype/raster/stroke.go
index fa9ba640b..8d4379757 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/raster/stroke.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/raster/stroke.go
@@ -6,7 +6,7 @@
 package raster
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // Two points are considered practically equal if the square of the distance
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/face.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/face.go
index e800cd1bd..d64a014c3 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/face.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/face.go
@@ -8,9 +8,9 @@ package truetype
 import (
 	"image"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/freetype/raster"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"github.com/golang/freetype/raster"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 func powerOf2(i int) bool {
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/face_test.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/face_test.go
index 6833e18bf..856581dff 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/face_test.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/face_test.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 func BenchmarkDrawString(b *testing.B) {
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/glyph.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/glyph.go
index eca2623d1..c2935a58e 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/glyph.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/glyph.go
@@ -6,8 +6,8 @@
 package truetype
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 // TODO: implement VerticalHinting.
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint.go
index e4eaf9294..0315de511 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint.go
@@ -12,7 +12,7 @@ import (
 	"errors"
 	"math"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint_test.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint_test.go
index d218bb0f6..7eb43dde0 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint_test.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/hint_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 func TestBytecode(t *testing.T) {
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype.go
index c69194d33..692e01526 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype.go
@@ -20,7 +20,7 @@ package truetype
 import (
 	"fmt"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // An Index is a Font's index of a rune.
diff --git a/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype_test.go b/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype_test.go
index 2382ab112..bd62d1da1 100644
--- a/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype_test.go
+++ b/Godeps/_workspace/src/github.com/golang/freetype/truetype/truetype_test.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 func parseTestdataFont(name string) (f *Font, testdataIsOptional bool, err error) {
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
index 3c51cca5e..68c4ea5d8 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
+++ b/Godeps/_workspace/src/github.com/gorilla/mux/mux.go
@@ -11,7 +11,7 @@ import (
 	"path"
 	"regexp"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/context"
+	"github.com/gorilla/context"
 )
 
 // NewRouter returns a new router instance.
diff --git a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go b/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
index 0f9bde0c1..d1eae9265 100644
--- a/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
+++ b/Godeps/_workspace/src/github.com/gorilla/mux/mux_test.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/context"
+	"github.com/gorilla/context"
 )
 
 func (r *Route) GoString() string {
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
index d0b1c3158..d96ac84db 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/autobahn/server.go
@@ -8,7 +8,7 @@ package main
 import (
 	"errors"
 	"flag"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 	"io"
 	"log"
 	"net/http"
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
index 675d64113..22816f09f 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/chat/conn.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 	"log"
 	"net/http"
 	"time"
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/command/main.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/command/main.go
index 3531b368c..f3f022edb 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/command/main.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/command/main.go
@@ -15,7 +15,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/client.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/client.go
index 998d54462..45a023175 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/client.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/client.go
@@ -12,7 +12,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 )
 
 var addr = flag.String("addr", "localhost:8080", "http service address")
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/server.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/server.go
index 87f14ceb5..a685b0974 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/server.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/echo/server.go
@@ -12,7 +12,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 )
 
 var addr = flag.String("addr", "localhost:8080", "http service address")
diff --git a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
index 04244bc0f..a2c7b85fa 100644
--- a/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
+++ b/Godeps/_workspace/src/github.com/gorilla/websocket/examples/filewatch/main.go
@@ -14,7 +14,7 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/gorilla/websocket"
+	"github.com/gorilla/websocket"
 )
 
 const (
diff --git a/Godeps/_workspace/src/github.com/lib/pq/bench_test.go b/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
index 8ceadc69b..e71f41d06 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/bench_test.go
@@ -17,7 +17,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq/oid"
+	"github.com/lib/pq/oid"
 )
 
 var (
diff --git a/Godeps/_workspace/src/github.com/lib/pq/buf.go b/Godeps/_workspace/src/github.com/lib/pq/buf.go
index fd7a3c573..666b0012a 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/buf.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/buf.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq/oid"
+	"github.com/lib/pq/oid"
 )
 
 type readBuf []byte
diff --git a/Godeps/_workspace/src/github.com/lib/pq/conn.go b/Godeps/_workspace/src/github.com/lib/pq/conn.go
index 7b9aa5dc9..ce661d66e 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/conn.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/conn.go
@@ -22,7 +22,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq/oid"
+	"github.com/lib/pq/oid"
 )
 
 // Common error types
diff --git a/Godeps/_workspace/src/github.com/lib/pq/encode.go b/Godeps/_workspace/src/github.com/lib/pq/encode.go
index a09f1a164..88422eb3d 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/encode.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/encode.go
@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq/oid"
+	"github.com/lib/pq/oid"
 )
 
 func binaryEncode(parameterStatus *parameterStatus, x interface{}) []byte {
diff --git a/Godeps/_workspace/src/github.com/lib/pq/encode_test.go b/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
index 3e2f490d7..97b663886 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/encode_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq/oid"
+	"github.com/lib/pq/oid"
 )
 
 func TestScanTimestamp(t *testing.T) {
@@ -468,11 +468,11 @@ func TestBinaryByteSlicetoUUID(t *testing.T) {
 	db := openTestConn(t)
 	defer db.Close()
 
-	b := []byte{'\xa0', '\xee', '\xbc', '\x99',
-		'\x9c', '\x0b',
-		'\x4e', '\xf8',
-		'\xbb', '\x00', '\x6b',
-		'\xb9', '\xbd', '\x38', '\x0a', '\x11'}
+	b := []byte{'\xa0','\xee','\xbc','\x99',
+				'\x9c', '\x0b',
+				'\x4e', '\xf8',
+				'\xbb', '\x00', '\x6b',
+				'\xb9', '\xbd', '\x38', '\x0a', '\x11'}
 	row := db.QueryRow("SELECT $1::uuid", b)
 
 	var result string
diff --git a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
index 219ba6626..c9c108fc3 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/hstore/hstore_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	_ "github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq"
+	_ "github.com/lib/pq"
 )
 
 type Fatalistic interface {
diff --git a/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go b/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
index d59942047..cd4aea808 100644
--- a/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
+++ b/Godeps/_workspace/src/github.com/lib/pq/oid/gen.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"os/exec"
 
-	_ "github.com/mattermost/platform/Godeps/_workspace/src/github.com/lib/pq"
+	_ "github.com/lib/pq"
 )
 
 func main() {
diff --git a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/example_test.go b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/example_test.go
index dd99da6db..45fd5d4ad 100644
--- a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/example_test.go
+++ b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/example_test.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"os"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif"
+	"github.com/rwcarlsen/goexif/exif"
 	"github.com/rwcarlsen/goexif/mknote"
 )
 
diff --git a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif.go b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif.go
index b24793a3c..b420729da 100644
--- a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif.go
+++ b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif.go
@@ -16,7 +16,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/rwcarlsen/goexif/tiff"
+	"github.com/rwcarlsen/goexif/tiff"
 )
 
 const (
@@ -574,7 +574,7 @@ func newAppSec(marker byte, r io.Reader) (*appSec, error) {
 		}
 
 		dataLenBytes := make([]byte, 2)
-		for k, _ := range dataLenBytes {
+		for k,_ := range dataLenBytes {
 			c, err := br.ReadByte()
 			if err != nil {
 				return nil, err
diff --git a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif_test.go b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif_test.go
index 70dad6009..c53f1ddda 100644
--- a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif_test.go
+++ b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/exif_test.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/rwcarlsen/goexif/tiff"
+	"github.com/rwcarlsen/goexif/tiff"
 )
 
 var dataDir = flag.String("test_data_dir", ".", "Directory where the data files for testing are located")
diff --git a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/regen_regress.go b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/regen_regress.go
index 52fb2dd08..17bac5287 100644
--- a/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/regen_regress.go
+++ b/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif/regen_regress.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/rwcarlsen/goexif/exif"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/rwcarlsen/goexif/tiff"
+	"github.com/rwcarlsen/goexif/exif"
+	"github.com/rwcarlsen/goexif/tiff"
 )
 
 func main() {
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
index 03915399b..ce5d8e4aa 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/accessors_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
index 3f68f7061..e9ccd2987 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/conversions_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
index 9e8b55a75..27f7d9049 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/fixture_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
index e1430512e..1f8b45c61 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/map_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
index fb0fccfca..e20ee23bc 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/mutations_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
index a438fa65a..8f0898f62 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/security_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
index 345c7ce54..5408c7fd3 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/simple_example_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
index 81ad09005..bcc1eb03d 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/tests_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
index f76783485..f7a4fceea 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/type_specific_codegen_test.go
@@ -2,7 +2,7 @@ package objx
 
 import (
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go b/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
index 924406010..521405801 100644
--- a/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/objx/value_test.go
@@ -1,7 +1,7 @@
 package objx
 
 import (
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"testing"
 )
 
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
index fac7ab828..1935d18da 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/assert/assertions.go
@@ -14,8 +14,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/davecgh/go-spew/spew"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/pmezard/go-difflib/difflib"
+	"github.com/davecgh/go-spew/spew"
+	"github.com/pmezard/go-difflib/difflib"
 )
 
 // TestingT is an interface wrapper around *testing.T
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
index 36de9e659..111a281b4 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock.go
@@ -9,8 +9,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/objx"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/objx"
+	"github.com/stretchr/testify/assert"
 )
 
 // TestingT is an interface wrapper around *testing.T
diff --git a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
index 403534dbc..1315ceccb 100644
--- a/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
+++ b/Godeps/_workspace/src/github.com/stretchr/testify/mock/mock_test.go
@@ -2,7 +2,7 @@ package mock
 
 import (
 	"errors"
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
diff --git a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
index aa50fdc61..b8e18d744 100644
--- a/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
+++ b/Godeps/_workspace/src/golang.org/x/crypto/bcrypt/bcrypt.go
@@ -12,7 +12,7 @@ import (
 	"crypto/subtle"
 	"errors"
 	"fmt"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/crypto/blowfish"
+	"golang.org/x/crypto/blowfish"
 	"io"
 	"strconv"
 )
diff --git a/Godeps/_workspace/src/golang.org/x/image/font/basicfont/basicfont.go b/Godeps/_workspace/src/golang.org/x/image/font/basicfont/basicfont.go
index 8875bd1cc..7eae19c8b 100644
--- a/Godeps/_workspace/src/golang.org/x/image/font/basicfont/basicfont.go
+++ b/Godeps/_workspace/src/golang.org/x/image/font/basicfont/basicfont.go
@@ -10,7 +10,7 @@ package basicfont
 import (
 	"image"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // Range maps a contiguous range of runes to vertically adjacent sub-images of
diff --git a/Godeps/_workspace/src/golang.org/x/image/font/basicfont/gen.go b/Godeps/_workspace/src/golang.org/x/image/font/basicfont/gen.go
index 4efb03322..67a21a74a 100644
--- a/Godeps/_workspace/src/golang.org/x/image/font/basicfont/gen.go
+++ b/Godeps/_workspace/src/golang.org/x/image/font/basicfont/gen.go
@@ -18,9 +18,9 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font/plan9font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/plan9font"
+	"golang.org/x/image/math/fixed"
 )
 
 func main() {
diff --git a/Godeps/_workspace/src/golang.org/x/image/font/font.go b/Godeps/_workspace/src/golang.org/x/image/font/font.go
index 1eae5c7ab..de8802fcc 100644
--- a/Godeps/_workspace/src/golang.org/x/image/font/font.go
+++ b/Godeps/_workspace/src/golang.org/x/image/font/font.go
@@ -14,7 +14,7 @@ import (
 	"image/draw"
 	"io"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/math/fixed"
 )
 
 // TODO: who is responsible for caches (glyph images, glyph indices, kerns)?
diff --git a/Godeps/_workspace/src/golang.org/x/image/font/plan9font/example_test.go b/Godeps/_workspace/src/golang.org/x/image/font/plan9font/example_test.go
index 1114fd7d2..c1eacb230 100644
--- a/Godeps/_workspace/src/golang.org/x/image/font/plan9font/example_test.go
+++ b/Godeps/_workspace/src/golang.org/x/image/font/plan9font/example_test.go
@@ -13,9 +13,9 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font/plan9font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/font/plan9font"
+	"golang.org/x/image/math/fixed"
 )
 
 func ExampleParseFont() {
diff --git a/Godeps/_workspace/src/golang.org/x/image/font/plan9font/plan9font.go b/Godeps/_workspace/src/golang.org/x/image/font/plan9font/plan9font.go
index 705258c3b..9c686b776 100644
--- a/Godeps/_workspace/src/golang.org/x/image/font/plan9font/plan9font.go
+++ b/Godeps/_workspace/src/golang.org/x/image/font/plan9font/plan9font.go
@@ -21,8 +21,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/font"
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/math/fixed"
+	"golang.org/x/image/font"
+	"golang.org/x/image/math/fixed"
 )
 
 // fontchar describes one character glyph in a subfont.
diff --git a/Godeps/_workspace/src/golang.org/x/image/tiff/reader.go b/Godeps/_workspace/src/golang.org/x/image/tiff/reader.go
index 651fa8026..714e3dda7 100644
--- a/Godeps/_workspace/src/golang.org/x/image/tiff/reader.go
+++ b/Godeps/_workspace/src/golang.org/x/image/tiff/reader.go
@@ -17,7 +17,7 @@ import (
 	"io/ioutil"
 	"math"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/golang.org/x/image/tiff/lzw"
+	"golang.org/x/image/tiff/lzw"
 )
 
 // A FormatError reports that the input is not a valid TIFF image.
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/custom/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/custom/main.go
index 128e08b81..b3fe993e8 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/custom/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/custom/main.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-many/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-many/main.go
index 03fcfce80..51a4ca023 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-many/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-many/main.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-vary/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-vary/main.go
index f84e1e41f..f43cdc122 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-vary/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval-vary/main.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval/main.go
index f89067816..ef8ee2cb8 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/interval/main.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/memstats/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/memstats/main.go
index 823de9b25..50d4cc69b 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/memstats/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/memstats/main.go
@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/rate-limit/main.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/rate-limit/main.go
index 1e4c1cb8f..b00119f63 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/rate-limit/main.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/examples/rate-limit/main.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store"
+	"github.com/garyburd/redigo/redis"
+	"gopkg.in/throttled/throttled.v1"
+	"gopkg.in/throttled/throttled.v1/store"
 )
 
 var (
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/interval.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/interval.go
index ab4d45251..628a5593e 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/interval.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/interval.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/groupcache/lru"
+	"github.com/golang/groupcache/lru"
 )
 
 // Static check to ensure that the interval limiters implement the Limiter interface.
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/mem.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/mem.go
index 74d48a73e..22d200e8d 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/mem.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/mem.go
@@ -4,8 +4,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/golang/groupcache/lru"
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"github.com/golang/groupcache/lru"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 // memStore implements an in-memory Store.
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis.go
index 44ef43122..b089f9f4e 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis.go
@@ -3,8 +3,8 @@ package store
 import (
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
-	"github.com/mattermost/platform/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1"
+	"github.com/garyburd/redigo/redis"
+	"gopkg.in/throttled/throttled.v1"
 )
 
 // redisStore implements a Redis-based store.
diff --git a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis_test.go b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis_test.go
index d7d1d1743..a282d6d25 100644
--- a/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis_test.go
+++ b/Godeps/_workspace/src/gopkg.in/throttled/throttled.v1/store/redis_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/Godeps/_workspace/src/github.com/garyburd/redigo/redis"
+	"github.com/garyburd/redigo/redis"
 )
 
 func getPool() *redis.Pool {