Merge remote-tracking branch 'origin/master' into some-core-rules

# Conflicts:
#	README.md
#	lib/index.js

Author: mysticatea

Diff for: README.md

@@ -240,7 +240,6 @@ Enforce all the rules in this category, as well as all higher priority rules, wi
 | :wrench: | [vue/array-bracket-spacing](./docs/rules/array-bracket-spacing.md) | enforce consistent spacing inside array brackets |
 | :wrench: | [vue/eqeqeq](./docs/rules/eqeqeq.md) | require the use of `===` and `!==` |
 | :wrench: | [vue/key-spacing](./docs/rules/key-spacing.md) | enforce consistent spacing between keys and values in object literal properties |
-|  | [vue/match-component-file-name](./docs/rules/match-component-file-name.md) | require component name property to match its file name |
 | :wrench: | [vue/object-curly-spacing](./docs/rules/object-curly-spacing.md) | enforce consistent spacing inside braces |
 | :wrench: | [vue/script-indent](./docs/rules/script-indent.md) | enforce consistent indentation in `<script>` |
 | :wrench: | [vue/space-infix-ops](./docs/rules/space-infix-ops.md) | require spacing around infix operators |

Diff for: docs/rules/match-component-file-name.md

@@ -21,7 +21,6 @@ module.exports = {
     'html-self-closing': require('./rules/html-self-closing'),
     'jsx-uses-vars': require('./rules/jsx-uses-vars'),
     'key-spacing': require('./rules/key-spacing'),
-    'match-component-file-name': require('./rules/match-component-file-name'),
     'max-attributes-per-line': require('./rules/max-attributes-per-line'),
     'multiline-html-element-content-newline': require('./rules/multiline-html-element-content-newline'),
     'mustache-interpolation-spacing': require('./rules/mustache-interpolation-spacing'),

Diff for: lib/index.js

@@ -6,7 +6,7 @@
 const utils = require('../utils')
 
 // ------------------------------------------------------------------------------
-// Rule Definitionutilu
+// Rule Definition
 // ------------------------------------------------------------------------------
 
 module.exports = {