reorder vimrc files
Update the color for vim and fix bug