Ambiguous package names lead to incorrect import statements

[tsuna]

This is basically just re-opening #60. As mentioned there, as of commits abf85a1 / c0158f5 (the former doesn't build, so the last commit that works for me is a39c63a) that bug seems to have crept back into the code.

For example, say I have a package called foo/query and upon re-generating the code past that commit, I get the following diff:

--- a/foo/apigraphql/generated.go
+++ b/foo/apigraphql/generated.go
@@ -1,4 +1,4 @@
-// This file was generated by github.com/vektah/gqlgen, DO NOT EDIT
+// Code generated by github.com/vektah/gqlgen, DO NOT EDIT.
 
 package apigraphql
 
@@ -6,33 +6,154 @@ import (
        "bytes"
        context "context"
        apimodel "foo/apimodel"
-       query1 "foo/query"
+       query "foo/query"
        strconv "strconv"
 
        graphql "github.com/vektah/gqlgen/graphql"
        introspection "github.com/vektah/gqlgen/neelance/introspection"
-       query "github.com/vektah/gqlgen/neelance/query"
        schema "github.com/vektah/gqlgen/neelance/schema"
 )
 

as a result the code obviously doesn't compile anymore:

$ go test ./...
# foo/apigraphql
./generated.go:167:59: undefined: "foo/query".Operation