Reorganized vimrc
Merged