Improve vim settings, reorganize vimrc a bit.