Cleanup and re-organize vimrc