* master:
  Revert "Master" (vuejs#462)
  Master (vuejs#460)
  Update link to Karma (vuejs#458)
  Explicitly note on `events` opt deprecation (fixes vuejs#436) (vuejs#453)
  remove wording about not including a benchmark from the react team
  Set the background-color to white. (vuejs#452)
  fix capitalizion typo in migration guide
  add literal modifier for directives to migration guide
  fix typo in interpolation within attributes in migration guide
  update dynamic binding example in guide intro
  add named slot to render function guide
  add warnings about using arrow functions on instance properties (vuejs#448)
  fix links to single-file components - fixes vuejs#446
  add note about two-way directives, linking to two-way filters example
  update two-filters example in migration guide
  Same word used multiple times in a sentence (vuejs#444)
  improve $data instance property API docs (vuejs#445)

# Conflicts:
#	src/guide/index.md
#	src/guide/installation.md
#	src/guide/instance.md
#	src/guide/render-function.md
#	src/guide/unit-testing.md

This reverts commit b73f126.