A few updates to folding and code organization in vimrc