integrating changes from Marty, changing go import to original. Curio…

…us what is the correct way to fork go code

client.go

@@ -17,9 +17,9 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/mschoch/elastigo/cluster"
-	"github.com/mschoch/elastigo/core"
-	"github.com/mschoch/elastigo/indices"
+	"github.com/mattbaird/elastigo/cluster"
+	"github.com/mattbaird/elastigo/core"
+	"github.com/mattbaird/elastigo/indices"
 	"log"
 )
 

cluster/clusterReroute.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The cluster health API allows to get a very simple status on the health of the cluster.

cluster/health.go

@@ -3,7 +3,7 @@ package cluster
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 	"strings"
 )
 

cluster/state.go

@@ -1,7 +1,7 @@
 package cluster
 
 import (
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // http://www.elasticsearch.org/guide/reference/api/admin-cluster-update-settings.html

core/count.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 type CountResponse struct {

core/delete.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The delete API allows to delete a typed JSON document from a specific index based on its id. 

core/deleteByQuery.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 	"strings"
 )
 

core/explain.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The explain api computes a score explanation for a query and a specific document. 

core/get.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The get API allows to get a typed JSON document from the index based on its id.

core/index.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The index API adds or updates a typed JSON document in a specific index, making it searchable. 

core/mget.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // Multi GET API allows to get multiple documents based on an index, type (optional) and id (and possibly routing).

core/moreLikeThis.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The more like this (mlt) API allows to get documents that are “like” a specified document. 

core/percolate.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The percolator allows to register queries against an index, and then send percolate requests which include a doc, and 

core/search.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // Performs a very basic search on an index via the request URI API.
@@ -51,25 +51,20 @@ func Scroll(pretty bool, scroll_id string, scroll string) (SearchResult, error)
 }
 
 type SearchResult struct {
-	Took        int        `json:"took"`
-	TimedOut    bool       `json:"timed_out"`
-	ShardStatus api.Status `json:"_shards"`
-	Hits        Hits       `json:"hits"`
-	Facets      json.RawMessage     `json:"facets,omitempty"` // structure varies on query
-	ScrollId    string     `json:"_scroll_id,omitempty"`
+	Took        int             `json:"took"`
+	TimedOut    bool            `json:"timed_out"`
+	ShardStatus api.Status      `json:"_shards"`
+	Hits        Hits            `json:"hits"`
+	Facets      json.RawMessage `json:"facets,omitempty"` // structure varies on query
+	ScrollId    string          `json:"_scroll_id,omitempty"`
 }
 
 type Hits struct {
-	Total    int     `json:"total"`
-	MaxScore float32 `json:"max_score"`
-	Hits     []Hit   `json:"hits"`
 	Total int `json:"total"`
 	//	MaxScore float32 `json:"max_score"`
 	Hits []Hit `json:"hits"`
-	Total    int     `json:"total"`
-	MaxScore float32 `json:"max_score,omitempty"`
-	Hits     []Hit   `json:"hits"`
 }
+
 type Hit struct {
 	Index  string          `json:"_index"`
 	Type   string          `json:"_type,omitempty"`

core/update.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The update API allows to update a document based on a script provided. The operation gets the document

core/validate.go

@@ -3,7 +3,7 @@ package core
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The validate API allows a user to validate a potentially expensive query without executing it.

indices/flush.go

@@ -3,7 +3,7 @@ package indices
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 )
 
 // The flush API allows to flush one or more indices through an API. The flush process of an index basically

indices/refresh.go

@@ -3,7 +3,7 @@ package indices
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 	"strings"
 )
 

indices/status.go

@@ -3,7 +3,7 @@ package indices
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/mschoch/elastigo/api"
+	"github.com/mattbaird/elastigo/api"
 	"strings"
 )