Update more dependencies

Author: Gaurav0

app/models/settings.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
-import _merge from 'lodash/object/merge';
+import _merge from 'lodash/merge';
 
 const {
   ObjectProxy,

app/services/ember-cli.js

@@ -4,7 +4,7 @@ import HbsPlugin from '../plugins/hbs-plugin';
 import blueprints from '../lib/blueprints';
 import Ember from 'ember';
 import moment from 'moment';
-import _template from "lodash/string/template";
+import _template from "lodash/template";
 
 const { computed, inject, RSVP, $, testing } = Ember;
 const twiddleAppName = 'twiddle';

package.json

@@ -21,53 +21,53 @@
     "babel-standalone": "^6.26.0",
     "broccoli-asset-rev": "^2.4.5",
     "broccoli-babel-transpiler": "^6.1.4",
-    "broccoli-concat": "^2.3.2",
-    "broccoli-funnel": "^1.0.1",
-    "broccoli-merge-trees": "^1.1.1",
-    "browserify": "^13.0.1",
-    "dedent": "~0.6.0",
-    "ember-ajax": "~2.4.1",
-    "ember-api-actions": "~0.1.4",
-    "ember-autoresize": "~0.5.17",
+    "broccoli-concat": "^3.2.2",
+    "broccoli-funnel": "^2.0.1",
+    "broccoli-merge-trees": "^3.0.0",
+    "browserify": "^16.2.0",
+    "dedent": "~0.7.0",
+    "ember-ajax": "^2.5.6",
+    "ember-api-actions": "~0.1.8",
+    "ember-autoresize": "~0.6.1",
     "ember-cli": "2.12.2",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli-app-version": "^2.1.0",
     "ember-cli-babel": "^6.12.0",
-    "ember-cli-bootstrap-sassy": "~0.5.5",
+    "ember-cli-bootstrap-sassy": "~0.5.8",
     "ember-cli-build-notifications": "~0.2.0",
-    "ember-cli-code-coverage": "~0.3.4",
-    "ember-cli-dependency-checker": "^2.0.0",
-    "ember-cli-deploy": "^1.0.0",
-    "ember-cli-deploy-s3-pack": "^1.0.0-beta.1",
-    "ember-cli-deploy-slack": "~0.1.0",
+    "ember-cli-code-coverage": "~0.3.12 ",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-deploy": "^1.0.2",
+    "ember-cli-deploy-s3-pack": "^1.0.0-beta.2",
+    "ember-cli-deploy-slack": "^1.0.0",
     "ember-cli-document-title": "~0.3.3",
-    "ember-cli-eslint": "^4.2.1",
+    "ember-cli-eslint": "^4.2.3",
     "ember-cli-fastboot": "1.0.0-beta.11",
     "ember-cli-file-creator": "~0.4.0",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "~0.4.0",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jstree": "^1.0.7",
-    "ember-cli-legacy-blueprints": "^0.1.0",
-    "ember-cli-mirage": "~0.2.3",
+    "ember-cli-htmlbars": "^1.3.4",
+    "ember-cli-htmlbars-inline-precompile": "~0.4.4",
+    "ember-cli-inject-live-reload": "^1.7.0",
+    "ember-cli-jstree": "^1.0.9",
+    "ember-cli-legacy-blueprints": "~0.2.1",
+    "ember-cli-mirage": "~0.2.9",
     "ember-cli-moment-shim": "^2.2.1",
-    "ember-cli-node-assets": "~0.1.6",
-    "ember-cli-qunit": "^3.1.2",
+    "ember-cli-node-assets": "~0.2.2",
+    "ember-cli-qunit": "^3.1.3",
     "ember-cli-release": "1.0.0-beta.2",
-    "ember-cli-sass": "^6.0.0",
+    "ember-cli-sass": "^6.2.0",
     "ember-cli-shims": "~1.0.2",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-test-loader": "^1.1.1",
     "ember-cli-uglify": "^2.1.0",
-    "ember-concurrency": "~0.8.2",
+    "ember-concurrency": "~0.8.17",
     "ember-data": "~2.12.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.1.1",
-    "ember-git-version": "~0.1.1",
-    "ember-inflector": "^1.9.4",
-    "ember-load": "~0.0.9",
+    "ember-git-version": "~0.1.2",
+    "ember-inflector": "^1.12.1",
+    "ember-load": "~0.0.12",
     "ember-load-initializers": "^1.0.0",
-    "ember-lodash": "~0.0.10",
-    "ember-moment": "7.0.0-beta.5",
+    "ember-lodash": "^4.18.0",
+    "ember-moment": "7.6.0",
     "ember-notify": "^5.1.6",
     "ember-resolver": "^2.0.3",
     "ember-responsive": "^1.2.7",