Merge pull request #306 from pelias/staging

Merge staging into production

package.json

@@ -13,7 +13,7 @@
     "drop_index": "node scripts/drop_index",
     "reset_type": "node scripts/reset_type",
     "update_settings": "node scripts/update_settings",
-    "travis": "npm run test"
+    "travis": "npm run test && npm run integration"
   },
   "repository": {
     "type": "git",
@@ -33,21 +33,20 @@
   },
   "dependencies": {
     "colors": "^1.1.2",
-    "elasticsearch": "^14.0.0",
+    "elasticsearch": "^15.0.0",
     "joi": "^13.1.0",
     "lodash.merge": "^4.6.0",
-    "pelias-config": "2.14.0"
+    "pelias-config": "^3.0.2"
   },
   "devDependencies": {
     "difflet": "^1.0.1",
     "elastictest": "^1.2.0",
     "proxyquire": "^2.0.0",
     "semantic-release": "^15.0.0",
-    "tap-spec": "^4.1.1",
+    "tap-spec": "^5.0.0",
     "tape": "^4.5.0"
   },
-  "pre-commit": [
-  ],
+  "pre-commit": [],
   "release": {
     "branch": "production",
     "success": []

settings.js

@@ -21,7 +21,7 @@ var synonyms = fs.readdirSync(path.join(__dirname, 'synonyms'))
 require('./configValidation').validate(peliasConfig.generate());
 
 function generate(){
-  var config = peliasConfig.generate().export();
+  var config = peliasConfig.generate();
 
   // Default settings
   var settings = {