vimrc: foldmethod, cleanup
zshrc: merge aliases.zsh functions.zsh into zshrc