prep for merge
Merge branch 'master' of https://github.com/el3ment/lsp