diff --git a/.travis.yml b/.travis.yml
index 622cad9e3..fc9b5d777 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,16 @@
 language: go
 
 go:
-  - 1.4
   - 1.5
   - 1.6
-  - 1.7
-  - tip
 
-matrix:
-  allow_failures:
-    - go: tip
-    - go: 1.4
+env:
+  - GO15VENDOREXPERIMENT=1
 
 install:
    - go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
-   - glide up
+   - glide install
 
 script:
-  - gotestcover -coverprofile="cover.out" -race -covermode="count" ./...
+  - gotestcover -coverprofile="cover.out" -race -covermode="count" $(glide novendor)
   - goveralls -coverprofile="cover.out"
diff --git a/README.md b/README.md
index b51678ef3..af4d3ef05 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ OAuth2 stack, that's no problem. Or custom assertions, what ever you like and as
 
 ## Installation
 
-You will need [Go](https://golang.org) installed on your machine and it is required that you have set up your
+[Go 1.5+](https://golang.org) must be installed on your system and it is required that you have set up your
 GOPATH environment variable.
 
 ```
diff --git a/glide.lock b/glide.lock
index 527a13996..ea54849bb 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,12 +1,25 @@
-hash: a4e6ff3f483b22d0046fe1013102aa7dcf637f2d313cb68619dd97407578aa0f
-updated: 2016-08-08T11:04:30.0478717+02:00
+hash: bfdddfe32cacf648c65b3dd8350e6c748c3ab84e46b47ea4548e0c20fb068034
+updated: 2016-08-09T09:17:29.732545671+02:00
 imports:
+- name: camlistore.org
+  version: 41516af23d58b64efe7712e8be2d3f9fd94fb693
+  subpackages:
+  - pkg/googlestorage
+  - pkg/blob
+  - pkg/constants
+- name: cloud.google.com/go
+  version: 3261f00d16e92932f49a39672dfd540896ed30d0
+  subpackages:
+  - compute/metadata
+  - internal
 - name: github.com/asaskevich/govalidator
-  version: 593d64559f7600f29581a3ee42177f5dbded27a9
+  version: 7664702784775e51966f0885f5cd27435916517b
 - name: github.com/dgrijalva/jwt-go
   version: 268038b363c7a8d7306b8e35bf77a1fde4b0c402
 - name: github.com/go-errors/errors
   version: a41850380601eeb43f4350f7d17c6bbd8944aaf8
+- name: github.com/golang/glog
+  version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998
 - name: github.com/golang/mock
   version: bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
   subpackages:
@@ -15,52 +28,160 @@ imports:
   version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
   subpackages:
   - proto
+  - proto/testdata
+  - ptypes/any
+  - protoc-gen-go/descriptor
+  - ptypes/duration
+  - ptypes/empty
+  - ptypes/wrappers
+  - ptypes/timestamp
+  - ptypes/struct
+- name: github.com/googleapis/gax-go
+  version: 8b0741b94759890156bc4a00cedd6e4f7cf744de
+- name: github.com/googleapis/proto-client-go
+  version: e5790fe2658ab48a2a8f8bf5247be730d7f844f2
+  subpackages:
+  - logging/v2
+  - api
+  - logging/type_
+  - rpc
+- name: github.com/gorilla/context
+  version: 1ea25387ff6f684839d82767c1733ff4d4d15d0a
+- name: github.com/gorilla/mux
+  version: 0eeaf8392f5b04950925b8a69fe70f110fa7cbfc
 - name: github.com/moul/http2curl
   version: b1479103caacaa39319f75e7f57fc545287fca0d
+- name: github.com/oleiade/reflections
+  version: ec27669d960a245738b87ffa688dac28fa288c33
 - name: github.com/ory-am/common
-  version: 930cc805232909c38f2e68310b1e21f71b056d59
-  subpackages:
-  - pkg
+  version: d93c852f2d09c219fd058756caf67bbdf8cf4be4
 - name: github.com/parnurzeal/gorequest
-  version: e213a02fb0082d41e66996deeaab5ae96039d913
+  version: b64673b971a1742b8ba91f228f1c029632d4b686
 - name: github.com/pborman/uuid
-  version: c55201b036063326c5b1b89ccfe45a184973d073
+  version: a97ce2ca70fa5a848076093f05e639a89ca34d06
 - name: github.com/pkg/errors
-  version: a22138067af1c4942683050411a841ade67fe1eb
+  version: 01fa4104b9c248c8945d14d9f128454d5b28d595
 - name: github.com/Sirupsen/logrus
-  version: a283a10442df8dc09befd873fab202bf8a253d6a
+  version: 4b6ea7319e214d98c938f12692336f7ca9348d6b
+- name: go4.org
+  version: 401618586120d672bfd8ddf033bafd1c96c31241
+  subpackages:
+  - syncutil/singleflight
+  - readerutil
 - name: golang.org/x/crypto
   version: e0d166c33c321d0ff863f459a5882096e334f508
   subpackages:
   - bcrypt
   - blowfish
+  - ssh/terminal
 - name: golang.org/x/net
   version: 075e191f18186a8ff2becaf64478e30f4545cdad
   subpackages:
   - context
   - publicsuffix
+  - http2
+  - trace
+  - http2/hpack
+  - lex/httplex
+  - internal/timeseries
 - name: golang.org/x/oauth2
   version: 04e1573abc896e70388bd387a69753c378d46466
   subpackages:
   - clientcredentials
   - internal
+  - jws
+  - jwt
 - name: golang.org/x/sys
   version: a646d33e2ee3172a661fc09bca23bb4889a41bc8
   subpackages:
   - unix
+- name: google.golang.org/api
+  version: 518eda9a0920a55ffe7190db96fe8ed85a62e376
+  subpackages:
+  - compute/v1
+  - storage/v1
+  - gensupport
+  - googleapi
+  - googleapi/internal/uritemplates
+  - option
+  - transport
+  - internal
+  - bigquery/v2
+  - container/v1
+  - logging/v1beta3
+  - pubsub/v1
+  - cloudtrace/v1
 - name: google.golang.org/appengine
   version: b4728023490a62e70ba739ff62aa65ffcca84210
   subpackages:
+  - urlfetch
   - internal
+  - internal/urlfetch
+  - internal/app_identity
+  - internal/modules
+  - user
+  - datastore
   - internal/base
+  - internal/blobstore
+  - internal/capability
+  - log
+  - internal/channel
   - internal/datastore
+  - taskqueue
+  - internal/image
   - internal/log
   - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
+- name: google.golang.org/cloud
+  version: c14fbfa4d259bf20a9a236a19c03a8b05f12b444
+  subpackages:
+  - compute/metadata
+  - internal
+  - bigtable/internal/option
+  - bigtable/internal/cbtrc
+  - bigtable/internal/stat
+  - logging
+  - pubsub
+  - storage
+- name: google.golang.org/genproto
+  version: 8fd005e65f7937d0cb1a83436c5c5bd3b9df0e43
+  subpackages:
+  - googleapis/bigtable/admin/v2
+  - googleapis/bigtable/v2
+  - googleapis/rpc
+  - googleapis/datastore/v1beta3
+  - googleapis/type
+  - googleapis/api/serviceconfig
+  - googleapis/longrunning
+  - googleapis/rpc/status
+  - googleapis/api/label
+  - googleapis/api/metric
+  - googleapis/api/monitoredres
+  - protobuf
+- name: google.golang.org/grpc
+  version: 35896af9ad39c1fb1b1cd925fe3621be361e3d81
+  subpackages:
+  - codes
+  - credentials
+  - grpclog
+  - internal
+  - metadata
+  - naming
+  - transport
+  - benchmark/grpc_testing
+  - benchmark/stats
+  - examples/helloworld/helloworld
+  - examples/route_guide/routeguide
+  - health/grpc_health_v1
+  - interop/grpc_testing
+  - reflection/grpc_reflection_v1alpha
+  - stress/grpc_testing
+- name: gopkg.in/airbrake/gobrake.v2
+  version: 31c8ff1fb8b79a6947e6565e9a6df535f98a6b94
+- name: gopkg.in/gemnasium/logrus-airbrake-hook.v2
+  version: 31e6fd4bd5a98d8ee7673d24bc54ec73c31810dd
 testImports:
 - name: github.com/davecgh/go-spew
-  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
+  version: 2df174808ee097f90d259e432cc04442cf60be21
   subpackages:
   - spew
 - name: github.com/pmezard/go-difflib
@@ -68,7 +189,7 @@ testImports:
   subpackages:
   - difflib
 - name: github.com/stretchr/testify
-  version: d77da356e56a7428ad25149ca77381849a6a5232
+  version: f390dcf405f7b83c997eac1b06768bb9f44dec18
   subpackages:
   - assert
   - require
diff --git a/glide.yaml b/glide.yaml
index 7be0ccf6f..4b566674f 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -1,17 +1,20 @@
 package: github.com/ory-am/fosite
 import:
+- package: github.com/Sirupsen/logrus
+  version: ~0.10.0
 - package: github.com/asaskevich/govalidator
+  version: ~4.0.0
 - package: github.com/dgrijalva/jwt-go
   version: ~2.7.0
-- package: github.com/go-errors/errors
 - package: github.com/golang/mock
   subpackages:
   - gomock
-- package: github.com/ory-am/common
-  subpackages:
-  - pkg
 - package: github.com/parnurzeal/gorequest
+  version: ~0.2.13
 - package: github.com/pborman/uuid
+  version: ~1.0.0
+- package: github.com/pkg/errors
+  version: ~0.7.0
 - package: golang.org/x/crypto
   subpackages:
   - bcrypt
@@ -21,3 +24,17 @@ import:
 - package: golang.org/x/oauth2
   subpackages:
   - clientcredentials
+- package: github.com/gorilla/mux
+  version: ~1.1.0
+- package: github.com/gorilla/context
+  version: ~1.1.0
+- package: github.com/go-errors/errors
+- package: github.com/oleiade/reflections
+  version: ~0.1.2
+- package: github.com/ory-am/common
+testImport:
+- package: github.com/stretchr/testify
+  version: ~1.1.3
+  subpackages:
+  - assert
+  - require