Substitute highlighting
Merge branch 'master' of github.com:omarabid/vimrc