added git cherry-pick alias
got vim folding defaults set up correctly