vim: Some vimrc formatting and organization