Update and organize vimrc
Remove some auto-enters from vimrc
Merge and fix conflicts