updated oh-my-zsh, reordered bundles in vimrc