Fix override order for base.js and dev.js / dist.js

cfg/dev.js

@@ -7,7 +7,7 @@ var baseConfig = require('./base');
 // Add needed plugins here
 var BowerWebpackPlugin = require('bower-webpack-plugin');
 
-var config = _.merge({
+var config = _.merge(baseConfig, {
   entry: [
     'webpack-dev-server/client?http://127.0.0.1:8000',
     'webpack/hot/only-dev-server',
@@ -22,7 +22,7 @@ var config = _.merge({
       searchResolveModulesDirectories: false
     })
   ]
-}, baseConfig);
+});
 
 // Add needed loaders
 config.module.loaders.push({