Merge branch 'develop'
Bump version 1.9 -> 2.0
Format some variables nicely in the README file
Merge remote-tracking branch 'remotes/github/master'

Conflicts:
        omnisharp.el

The version number was the only thing conflicting
Merge branch 'master' into StartServer