Readded maintain highlight in indent change
merged upstream omnisharp
merged vimrc