Merge branch 'master' into master

.gitattributes

@@ -3,7 +3,6 @@
 /.vscode export-ignore
 /fixtures export-ignore
 /images export-ignore
-/tests export-ignore
 /validation export-ignore
 /.dockerignore export-ignore
 /.editorconfig export-ignore

.travis.yml

@@ -30,9 +30,9 @@ jobs:
       before_install:
         # Fix ruby error https://github.com/Homebrew/brew/issues/3299
         - brew update
-        - brew tap homebrew/homebrew-php
+        - brew install php@7.1
-        - brew install php71
+        - brew link --force --overwrite php@7.1
-        - brew install homebrew/php/php71-xdebug
+        - pecl install xdebug-2.6.0
         - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
         - php composer-setup.php
         - ln -s "`pwd`/composer.phar" /usr/local/bin/composer

README.md

@@ -17,6 +17,16 @@ Uses the great [Tolerant PHP Parser](https://github.com/Microsoft/tolerant-php-p
 [phpDocumentor's DocBlock reflection](https://github.com/phpDocumentor/ReflectionDocBlock)
 and an [event loop](http://sabre.io/event/loop/) for concurrency.
 
+**Table of Contents**
+  - [Features](#features)
+  - [Performance](#performance)
+  - [Versioning](#versioning)
+  - [Installation](#installation)
+  - [Running](#running)
+  - [Used by](#used-by)
+  - [Contributing](#contributing)
+
+
 ## Features
 
 ### [Completion](https://github.com/Microsoft/language-server-protocol/blob/master/protocol.md#textDocument_completion)