Fixing yet more gofmt errors with imports

builtin/providers/docker/resource_docker_container.go

@@ -4,9 +4,10 @@ import (
 	"bytes"
 	"fmt"
 
+	"regexp"
+
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
-	"regexp"
 )
 
 func resourceDockerContainer() *schema.Resource {

builtin/providers/postgresql/config.go

@@ -3,6 +3,7 @@ package postgresql
 import (
 	"database/sql"
 	"fmt"
+
 	_ "github.com/lib/pq" //PostgreSQL db
 )
 

builtin/providers/vcd/resource_vcd_dnat.go

@@ -2,6 +2,7 @@ package vcd
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform/helper/schema"
 )
 

builtin/providers/vcd/resource_vcd_firewall_rules.go

@@ -2,10 +2,11 @@ package vcd
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform/helper/schema"
-	types "github.com/hmrc/vmware-govcd/types/v56"
 	"log"
 	"strings"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	types "github.com/hmrc/vmware-govcd/types/v56"
 )
 
 func resourceVcdFirewallRules() *schema.Resource {

builtin/providers/vcd/resource_vcd_network.go

@@ -5,10 +5,11 @@ import (
 
 	"bytes"
 	"fmt"
+	"strings"
+
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"strings"
 )
 
 func resourceVcdNetwork() *schema.Resource {

builtin/providers/vcd/resource_vcd_snat.go

@@ -2,6 +2,7 @@ package vcd
 
 import (
 	"fmt"
+
 	"github.com/hashicorp/terraform/helper/schema"
 )
 

builtin/providers/vcd/resource_vcd_vapp.go

@@ -2,9 +2,10 @@ package vcd
 
 import (
 	"fmt"
+	"log"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"log"
 )
 
 func resourceVcdVApp() *schema.Resource {

builtin/providers/vcd/structure.go

@@ -2,11 +2,12 @@ package vcd
 
 import (
 	"fmt"
+	"strconv"
+	"time"
+
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	types "github.com/hmrc/vmware-govcd/types/v56"
-	"strconv"
-	"time"
 )
 
 func expandIPRange(configured []interface{}) types.IPRanges {