Merge branch 'arrange_vimrc'