dependency resolution update

Gulpfile.coffee

@@ -6,11 +6,11 @@ karma = require('karma').server
 mocha = require 'gulp-mocha'
 rename = require 'gulp-rename'
 nodemon = require 'gulp-nodemon'
-webpack = require 'gulp-webpack'
+gulpWebpack = require 'gulp-webpack'
 coffeelint = require 'gulp-coffeelint'
 runSequence = require 'run-sequence'
 RewirePlugin = require 'rewire-webpack'
-webpackSource = require 'webpack'
+webpack = require 'webpack'
 clayLintConfig = require 'clay-coffeescript-style-guide'
 
 karmaConf =
@@ -80,7 +80,7 @@ gulp.task 'test:phantom', ['scripts:test'], (cb) ->
 
 gulp.task 'scripts:test', ->
   gulp.src paths.rootTests
-  .pipe webpack
+  .pipe gulpWebpack
     module:
       postLoaders: [
         { test: /\.coffee$/, loader: 'transform/cacheable?envify' }
@@ -136,7 +136,7 @@ gulp.task 'clean:dist', (cb) ->
 # init.coffee --> dist/js/bundle.min.js
 gulp.task 'scripts:prod', ->
   gulp.src paths.root
-  .pipe webpack
+  .pipe gulpWebpack
     module:
       postLoaders: [
         { test: /\.coffee$/, loader: 'transform/cacheable?envify' }
@@ -156,7 +156,7 @@ gulp.task 'scripts:prod', ->
           'bower.json', ['main']
         )
       )
-      new webpackSource.optimize.UglifyJsPlugin()
+      new webpack.optimize.UglifyJsPlugin()
     ]
     resolve:
       root: [path.join(__dirname, 'bower_components')]

bower.json

@@ -4,7 +4,6 @@
   "private": true,
   "dependencies": {
     "fetch": "0.3.0",
-    "normalize.styl": "~3.0.2",
-    "zorium-paper": "zorium/zorium-paper"
+    "normalize.styl": "~3.0.2"
   }
 }

package.json

@@ -46,14 +46,16 @@
     "helmet": "^0.6.0",
     "json-loader": "^0.5.1",
     "karma": "^0.12.17",
-    "lodash": "^2.4.1",
+    "lodash": "https://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz",
     "pm2": "^0.12.3",
     "promiz": "^1.0.0",
     "rewire-webpack": "^0.2.0",
     "run-sequence": "^0.3.2",
     "style-loader": "^0.8.1",
     "stylus-loader": "^0.5.0",
     "transform-loader": "^0.2.1",
-    "webpack": "^1.4.11"
+    "webpack": "^1.5.0",
+    "zorium": "^0.6.8",
+    "zorium-paper": "^0.1.0"
   }
 }