* vuejs-templates/master: (29 commits)
  Fix missing dependency bumps (vuejs-templates#987)
  Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)
  stick to ES5
  v1.1.1
  downgrade airbnb config to ensure compaibility with eslint.
  Typo fixed: 'use stxrict' -> 'use strict' (vuejs-templates#955)
  We now have port-detection, so README should reflect that.
  Revision of wording in the README docs (vuejs-templates#958)
  add version tag to config/index.js
  add version tag to config/index.js
  Reference dev script in start script instead of copy pasting (vuejs-templates#894)
  Reference dev script in start script instead of copy pasting (vuejs-templates#894)
  Put hotMiddleware before proxyMiddleware in dev server (vuejs-templates#837)
  fix component filename
  Rename Hello component to HelloWorld (vuejs-templates#944)
  bump more deps
  Add .vscode to gitignore (vuejs-templates#845)
  update URL of ESLint to https (vuejs-templates#927)
  Fix small errors in webpack.prod.conf (vuejs-templates#897)
  Standardize base webpack module variable name (vuejs-templates#912)
  ...

# Conflicts:
#	template/build/dev-server.js
#	template/build/webpack.prod.conf.js
#	template/package.json
#	template/src/components/HelloWorld.vue

)

* refactor: replace karma and mocha with jest

* refactor: remove webpack.test.conf

* refactor: prompt jest instead of mocha and karma

* feat(jest): add coverage reporting

* docs(jest): update unit.md with details of jest

* docs(jest): remove karma files from structure.md

* docs(jest): replace details on Karma with details on Jest

* docs: add missing period

* docs(jest): replace karma with Jest in commands.md

* docs(jest): update npm run unit bullet points

* refactor: use module-resolver in place of jest moduleNameMapper

* refactor: remove .vue extension from Hello import

* test: include src files in test coverage

* test: only ignore router/index in coverage if router option selected

* chore: fix merge conflicts

* chore: add MIT free Jest

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* feat: add karma option

* refactor: use const in webpack.test.conf

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* refactor: use jest module mapping

* feat(jest): filter jest setup file

* fix: fix trailing comma

* docs: add Jest and Karma to unit section

* fix: add Jest options if jest option

* test: change env in .eslintrc

* fix: remove merge trace

* fix: merge package.json with develop

* docs: split unit test docs into Jest and Karma

* docs: add Karma and Jest to README

* docs: reimplement karma files in structure.md

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (#785)" (#1035)

This reverts commit 14f2a92.

* re-merge (#1045)

* Reference dev script in start script instead of copy pasting (#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (#986)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (#987)

* switch hello-world tag to PascalCase (#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (#785)" (#1035)

This reverts commit 14f2a92.

* Remove unnecessary whitespaces (#1047)

* fix(jest): fix Jest coverage directory (#1046)

Explicitly set the coverage directory to match Karma and .gitignore

* Fix typos and formatting (#1048)

* re-add postcss-loader

was mistakenly removed during merge of #824

* bumb version string in config

* bumb version string in config in package.json

…uejs-templates#824)

* refactor: replace karma and mocha with jest

* refactor: remove webpack.test.conf

* refactor: prompt jest instead of mocha and karma

* feat(jest): add coverage reporting

* docs(jest): update unit.md with details of jest

* docs(jest): remove karma files from structure.md

* docs(jest): replace details on Karma with details on Jest

* docs: add missing period

* docs(jest): replace karma with Jest in commands.md

* docs(jest): update npm run unit bullet points

* refactor: use module-resolver in place of jest moduleNameMapper

* refactor: remove .vue extension from Hello import

* test: include src files in test coverage

* test: only ignore router/index in coverage if router option selected

* chore: fix merge conflicts

* chore: add MIT free Jest

* Reference dev script in start script instead of copy pasting (vuejs-templates#894)

Less duplication FTW.

* feat: add karma option

* refactor: use const in webpack.test.conf

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (vuejs-templates#987)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* refactor: use jest module mapping

* feat(jest): filter jest setup file

* fix: fix trailing comma

* docs: add Jest and Karma to unit section

* fix: add Jest options if jest option

* test: change env in .eslintrc

* fix: remove merge trace

* fix: merge package.json with develop

* docs: split unit test docs into Jest and Karma

* docs: add Karma and Jest to README

* docs: reimplement karma files in structure.md

* Reference dev script in start script instead of copy pasting (vuejs-templates#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (vuejs-templates#987)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)" (vuejs-templates#1035)

This reverts commit 14f2a92.

* re-merge (vuejs-templates#1045)

* Reference dev script in start script instead of copy pasting (vuejs-templates#894)

Less duplication FTW.

* add version tag to config/index.js

* stick to ES5

this file is not transpiled

* Bumping Vue+VueRouter versions, some minor fixes. (vuejs-templates#986)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* Fix missing dependency bumps (vuejs-templates#987)

* switch hello-world tag to PascalCase (vuejs-templates#951)

* fix Es6 code issue.

This file is not transpiled, so we should stick to ES5

* Fix bug in dev-server when a proxyTable entry is a string (vuejs-templates#965)

`options` can not be a `const` because it is modified if value is a string.

* Fix casing

* Revert 9befbfc

* update to vue and vue-router latest version (vuejs-templates#984)

- vue 2.5
- vue-router 3.0

* fix missing dependency updates for

* vue-template compiler
* vue-loader

* bump version string

* Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)

* Fix Unknown plugin istanbul error when no unit test

* simplify handlebars conditionals.

* Revert "Fix Unknown plugin istanbul error when no unit test (vuejs-templates#785)" (vuejs-templates#1035)

This reverts commit 14f2a92.

* Remove unnecessary whitespaces (vuejs-templates#1047)

* fix(jest): fix Jest coverage directory (vuejs-templates#1046)

Explicitly set the coverage directory to match Karma and .gitignore

* Fix typos and formatting (vuejs-templates#1048)

* re-add postcss-loader

was mistakenly removed during merge of vuejs-templates#824

* bumb version string in config

* bumb version string in config in package.json