diff --git a/package.json b/package.json
index a36fcbd3a..354340ae1 100644
--- a/package.json
+++ b/package.json
@@ -5,25 +5,20 @@
   "main": "app.js",
   "scripts": {
     "start": "./bin/www",
-    "build": "webpack --config webpack.config.js --bail",
-    "build-watch": "webpack --config webpack.config.dev.js --watch",
+    "build": "NODE_ENV=production webpack --config webpack.config.js --bail",
+    "build-watch": "NODE_ENV=development webpack --config webpack.config.dev.js --watch",
     "lint": "eslint bin/* .",
     "lint-fix": "eslint . --fix",
     "pretest": "npm install",
     "test": "mocha --compilers js:babel-core/register --recursive tests",
     "test-watch": "mocha --compilers js:babel-core/register --recursive -w tests",
-    "embed-start": "npm run build && ./bin/www"
+    "embed-start": "NODE_ENV=development npm run build && ./bin/www"
   },
   "config": {
     "pre-git": {
       "commit-msg": [],
-      "pre-commit": [
-        "npm run lint",
-        "npm test"
-      ],
-      "pre-push": [
-        "npm test"
-      ],
+      "pre-commit": ["npm run lint", "npm test"],
+      "pre-push": ["npm test"],
       "post-commit": [],
       "post-merge": []
     }
@@ -32,12 +27,7 @@
     "type": "git",
     "url": "git+https://github.com/coralproject/talk.git"
   },
-  "keywords": [
-    "talk",
-    "coral",
-    "coralproject",
-    "ask"
-  ],
+  "keywords": ["talk", "coral", "coralproject", "ask"],
   "author": "",
   "license": "Apache-2.0",
   "bugs": {
@@ -54,7 +44,6 @@
     "mongoose": "^4.6.5",
     "morgan": "^1.7.0",
     "prompt": "^1.0.0",
-    "react-mdl-selectfield": "^0.2.0",
     "uuid": "^2.0.3"
   },
   "devDependencies": {
@@ -104,6 +93,7 @@
     "react": "15.3.2",
     "react-dom": "15.3.2",
     "react-mdl": "^1.7.2",
+    "react-mdl-selectfield": "^0.2.0",
     "react-onclickoutside": "^5.7.1",
     "react-redux": "^4.4.5",
     "react-router": "^3.0.0",
diff --git a/webpack.config.dev.js b/webpack.config.dev.js
index 8e2f253e5..571c31625 100644
--- a/webpack.config.dev.js
+++ b/webpack.config.dev.js
@@ -85,7 +85,7 @@ module.exports = {
     }),
     new webpack.DefinePlugin({
       'process.env': {
-        'NODE_ENV': `"${'development'}"`,
+        'NODE_ENV': `"${process.env.NODE_ENV}"`,
         'VERSION': `"${require('./package.json').version}"`
       }
     })
diff --git a/webpack.config.js b/webpack.config.js
index bf602733f..46cd2961b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -5,12 +5,6 @@ const devConfig = require('./webpack.config.dev');
 devConfig.devtool = null;
 
 devConfig.plugins = devConfig.plugins.concat([
-  new webpack.DefinePlugin({
-    'process.env': {
-      'NODE_ENV': `"${'production'}"`,
-      'VERSION': `"${require('./package.json').version}"`
-    }
-  }),
   new webpack.optimize.UglifyJsPlugin({
     compress: {
       warnings: false