Re-rewrite import paths.

Another run of 'godep save' fixed the import path.

So you first have to run 'godep update <packages>' and then a 'godep save'.

Let's see if this satisfies Travis.

Godeps/_workspace/src/github.com/prometheus/client_golang/extraction/metricfamilyprocessor.go

@@ -18,9 +18,9 @@ import (
 	"io"
 	"math"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/matttproud/golang_protobuf_extensions/ext"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type metricFamilyProcessor struct{}

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/counter_test.go

@@ -17,7 +17,7 @@ import (
 	"math"
 	"testing"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestCounterAdd(t *testing.T) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/desc.go

@@ -11,8 +11,8 @@ import (
 
 	"github.com/prometheus/client_golang/model"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var (

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/example_selfcollector_test.go

@@ -16,9 +16,9 @@ package prometheus_test
 import (
 	"runtime"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func NewCallbackMetric(desc *prometheus.Desc, callback func() float64) *CallbackMetric {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/examples_test.go

@@ -21,9 +21,9 @@ import (
 	"runtime"
 	"sort"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func ExampleGauge() {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/expvar_test.go

@@ -19,8 +19,8 @@ import (
 	"sort"
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
 	"github.com/prometheus/client_golang/prometheus"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func ExampleExpvarCollector() {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/gauge_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func listenGaugeStream(vals, result chan float64, done chan struct{}) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/go_collector_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func TestGoCollector(t *testing.T) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram.go

@@ -20,9 +20,9 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Histogram counts individual observations from an event or sample stream in

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/histogram_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func benchmarkHistogramObserve(w int, b *testing.B) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/http_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type respBody string

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/metric.go

@@ -16,7 +16,7 @@ package prometheus
 import (
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Metric models a single sample value with its meta data being exported to

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_procfs.go

@@ -15,7 +15,7 @@
 
 package prometheus
 
-import "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
+import "github.com/prometheus/procfs"
 
 func processCollectSupported() bool {
 	if _, err := procfs.NewStat(); err == nil {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/process_collector_test.go

@@ -8,7 +8,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/procfs"
+	"github.com/prometheus/procfs"
 )
 
 func TestProcessCollector(t *testing.T) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry.go

@@ -33,11 +33,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/bitbucket.org/ww/goautoneg"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"bitbucket.org/ww/goautoneg"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
 	"github.com/prometheus/client_golang/text"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var (

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/registry_test.go

@@ -25,8 +25,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 type fakeResponseWriter struct {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary.go

@@ -20,10 +20,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/beorn7/perks/quantile"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/beorn7/perks/quantile"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A Summary captures individual observations from an event or sample stream and

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/summary_test.go

@@ -22,7 +22,7 @@ import (
 	"testing/quick"
 	"time"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func benchmarkSummaryObserve(w int, b *testing.B) {

Godeps/_workspace/src/github.com/prometheus/client_golang/prometheus/value.go

@@ -20,8 +20,8 @@ import (
 	"sort"
 	"sync/atomic"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // ValueType is an enumeration of metric types that represent a simple value.

Godeps/_workspace/src/github.com/prometheus/client_golang/text/bench_test.go

@@ -16,8 +16,8 @@ package text
 import (
 	"bytes"
 	"compress/gzip"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/matttproud/golang_protobuf_extensions/ext"
+	dto "github.com/prometheus/client_model/go"
 	"io"
 	"io/ioutil"
 	"testing"

Godeps/_workspace/src/github.com/prometheus/client_golang/text/create.go

@@ -27,8 +27,8 @@ import (
 	"math"
 	"strings"
 
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // MetricFamilyToText converts a MetricFamily proto message into text format and

Godeps/_workspace/src/github.com/prometheus/client_golang/text/create_test.go

@@ -19,8 +19,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 func testCreate(t testing.TB) {

Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse.go

@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
 	"github.com/prometheus/client_golang/model"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // A stateFn is a function that represents a state in a state machine. By

Godeps/_workspace/src/github.com/prometheus/client_golang/text/parse_test.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	dto "github.com/prometheus/client_model/go"
 )
 
 var parser Parser

Godeps/_workspace/src/github.com/prometheus/client_golang/text/proto.go

@@ -17,9 +17,9 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/golang/protobuf/proto"
-	"github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/matttproud/golang_protobuf_extensions/ext"
-	dto "github.com/prometheus/client_golang/Godeps/_workspace/src/github.com/prometheus/client_model/go"
+	"github.com/golang/protobuf/proto"
+	"github.com/matttproud/golang_protobuf_extensions/ext"
+	dto "github.com/prometheus/client_model/go"
 )
 
 // WriteProtoDelimited writes the MetricFamily to the writer in delimited