Adjustments to vimrc to fix syntax highlighting issues