Disable oh-my-zsh autoupdate
don't collapse any folds at first in vim
add VimClojure bundle
add repo status back to prompt
merge upstream