fixed merge conflicts with master

basic/line.go

@@ -8,7 +8,7 @@ import (
 )
 
 // Line is a basic line type which is made up of two or more points that don't
-// interect.
+// intersect.
 // TODO: We don't really check to make sure the points don't intersect.
 type Line []Point
 

mvt/feature.go

@@ -145,7 +145,7 @@ type cursor struct {
 	tile tegola.BoundingBox
 
 	// The extent — it is an int, but to make computations easier and not lose precision
-	// Untill we convert the ∆'s to int32.
+	// Until we convert the ∆'s to int32.
 	extent float64
 
 	// These values are cached

mvt/feature_test.go

@@ -194,7 +194,7 @@ func TestNewFeature(t *testing.T) {
 		if len(tcase.expected) <= 0 {
 			continue
 		}
-		// TOOD test to make sure we got the correct feature
+		// TODO test to make sure we got the correct feature
 
 	}
 }

wkb/collection.go

@@ -18,7 +18,7 @@ WKBGeometry      wkbGeometries[num_wkbGeometries]
 // Collection is a collection of geometries.
 type Collection []Geometry
 
-// Type returns the type number of this geometery, by the spec it's 7.
+// Type returns the type number of this geometry, by the spec it's 7.
 func (Collection) Type() uint32 {
 	return GeoGeometryCollection
 }