Update vimrc.
Remove powerline.
Fix merge.