Merge pull request graphql-go#168 from Tonkpils/travis

Add 1.7 and tip to build matrix for Go

Author: chris-ramon

.travis.yml

@@ -2,6 +2,8 @@ language: go
 
 go:
   - 1.4
+  - 1.7
+  - tip
 
 before_install:
   - go get github.com/axw/gocov/gocov

definition.go

@@ -389,7 +389,7 @@ type IsTypeOfFn func(p IsTypeOfParams) bool
 type InterfacesThunk func() []*Interface
 
 type ObjectConfig struct {
-	Name        string      `json:"description"`
+	Name        string      `json:"name"`
 	Interfaces  interface{} `json:"interfaces"`
 	Fields      interface{} `json:"fields"`
 	IsTypeOf    IsTypeOfFn  `json:"isTypeOf"`