Merge branch 'master' into umd

# Conflicts:
#	src/components/Select.vue

build/build.js

@@ -6,13 +6,14 @@ var path = require('path')
 var config = require('../config')
 var ora = require('ora')
 var webpack = require('webpack')
+var ghpages = require('gh-pages')
 var webpackConfig = require('./webpack.prod.conf')
 var umdConfig = require('./webpack.umd.conf')
 
 console.log(
-  '  Tip:\n' +
-  '  Built files are meant to be served over an HTTP server.\n' +
-  '  Opening index.html over file:// won\'t work.\n'
+		'  Tip:\n' +
+		'  Built files are meant to be served over an HTTP server.\n' +
+		'  Opening index.html over file:// won\'t work.\n'
 )
 
 var spinner = ora('building for production...')
@@ -27,15 +28,25 @@ cp('-R', 'static/', assetsPath)
  * Build the /dist/ folder (demo site)
  */
 webpack(webpackConfig, function (err, stats) {
-  spinner.stop()
-  if (err) throw err
-  process.stdout.write(stats.toString({
-    colors: true,
-    modules: false,
-    children: false,
-    chunks: false,
-    chunkModules: false
-  }) + '\n')
+	spinner.stop()
+	if (err) throw err
+	process.stdout.write(stats.toString({
+				colors: true,
+				modules: false,
+				children: false,
+				chunks: false,
+				chunkModules: false
+			}) + '\n')
+
+	// $ npm run build publish
+	// This will publish /dist/ to the gh-pages
+	if (( process.argv.indexOf('publish') > 1 )) {
+		spinner = ora('Publishing to GitHub Pages...').start()
+		ghpages.publish(path.join(__dirname, '../dist'), function (err) {
+			spinner.stop()
+			if (err) throw err
+		});
+	}
 })
 
 /**