Merge branch 'master' into Release_170815-EdgeX-EAP

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index a902a1c..9a1d122 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 
 go:
-  - 1.7.x
+  - 1.8.3
 
 before_install:
   - sudo add-apt-repository ppa:masterminds/glide -y
@@ -9,7 +9,7 @@
   - sudo apt-get install glide -y
 
 install:
-  - glide install
+  - glide up --strip-vendor
 
 script:
   - go test $(glide novendor)

CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6d364e1..ae319c7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,4 +20,4 @@
 All submissions, including submissions by project members, require review. We
 use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
-information on using pull requests.
\ No newline at end of file
+information on using pull requests.

README.md

diff --git a/README.md b/README.md
index da829f6..e9cdb6b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # ApidAnalytics
 
-This is a core plugin for [apid](http://github.com/30x/apid) and is responsible for collecting analytics data for
+This is a core plugin for [apid](http://github.com/apid/apid) and is responsible for collecting analytics data for
 runtime traffic from Micro and Enterprise Gateway and puplishing to Apigee.
 
 ### Configuration

api.go

diff --git a/api.go b/api.go
index b93d327..b8470fc 100644
--- a/api.go
+++ b/api.go
@@ -15,7 +15,7 @@
 package apidAnalytics
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"net/http"
 	"strings"
 )

api.yaml

diff --git a/api.yaml b/api.yaml
index 0414d5b..9bf8e43 100644
--- a/api.yaml
+++ b/api.yaml
@@ -100,7 +100,7 @@
         $ref: "#/definitions/records"
     example: {
     "organization":"orgname",
-    "enironment":"envname",
+    "environment":"envname",
     "records":[{
         "response_status_code": 400,
         "client_received_start_timestamp": 1462850097576,
@@ -194,10 +194,10 @@
 
   errClientError:
     required:
-      - errrorCode
+      - errorCode
       - reason
     properties:
-      errrorCode:
+      errorCode:
         type: string
         enum:
           - UNKNOWN_SCOPE
@@ -208,16 +208,16 @@
       reason:
         type: string
     example: {
-      "errrorCode":"UNKNOWN_SCOPE",
+      "errorCode":"UNKNOWN_SCOPE",
       "reason":"No tenant found for this scopeuuid : UUID"
     }
 
   errServerError:
     required:
-      - errrorCode
+      - errorCode
       - reason
     properties:
-      errrorCode:
+      errorCode:
         type: string
         enum:
           - INTERNAL_SERVER_ERROR
@@ -225,16 +225,16 @@
       reason:
         type: string
     example: {
-      "errrorCode":"INTERNAL_SERVER_ERROR",
+      "errorCode":"INTERNAL_SERVER_ERROR",
       "reason":"Service is not initialized completely"
     }
 
   errResponse:
     required:
-      - errrorCode
+      - errorCode
       - reason
     properties:
-      errrorCode:
+      errorCode:
         type: string
       reason:
-        type: string
\ No newline at end of file
+        type: string

apidAnalytics_suite_test.go

diff --git a/apidAnalytics_suite_test.go b/apidAnalytics_suite_test.go
index 669b18c..e23a9c0 100644
--- a/apidAnalytics_suite_test.go
+++ b/apidAnalytics_suite_test.go
@@ -19,8 +19,8 @@
 	. "github.com/onsi/gomega"
 
 	"encoding/json"
-	"github.com/30x/apid-core"
-	"github.com/30x/apid-core/factory"
+	"github.com/apid/apid-core"
+	"github.com/apid/apid-core/factory"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"

glide.yaml

diff --git a/glide.yaml b/glide.yaml
index be36db2..052b5cd 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-package: github.com/30x/apidAnalytics
+package: github.com/apid/apidAnalytics
 
 import:
 - package: github.com/30x/apid-core

init.go

diff --git a/init.go b/init.go
index 91351ea..f9f219a 100644
--- a/init.go
+++ b/init.go
@@ -16,7 +16,7 @@
 
 import (
 	"fmt"
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"os"
 	"path/filepath"
 	"sync"

listener.go

diff --git a/listener.go b/listener.go
index 9143e5b..57dc4c8 100644
--- a/listener.go
+++ b/listener.go
@@ -15,7 +15,7 @@
 package apidAnalytics
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 )
 

listener_test.go

diff --git a/listener_test.go b/listener_test.go
index fc73c2f..aeaa198 100644
--- a/listener_test.go
+++ b/listener_test.go
@@ -15,7 +15,7 @@
 package apidAnalytics
 
 import (
-	"github.com/30x/apid-core"
+	"github.com/apid/apid-core"
 	"github.com/apigee-labs/transicator/common"
 )
 

pluginData.go

diff --git a/pluginData.go b/pluginData.go
index bfb3dfa..205b36e 100644
--- a/pluginData.go
+++ b/pluginData.go
@@ -14,7 +14,7 @@
 
 package apidAnalytics
 
-import "github.com/30x/apid-core"
+import "github.com/apid/apid-core"
 
 var pluginData = apid.PluginData{
 	Name:    "apidAnalytics",