Revert "Revert "re-add gitflow thingy""

ugh, reverted in the wrong repo

This reverts commit 7835fc74865e98eb54e8303b5a58c7b78399acfe.
Revert "Revert "standard vim finally works with ruby 1.9, use it""

Finally got this working, yay

This reverts commit b8ad48c7e2f4e4095a722212b5ed9cfa05def83f.

Conflicts:
	.zshrc
	install.zsh
Revert "remove directory overrides"

vim-sensible still seems to have some issues w/ standard (non-mac-) vim
here

This reverts commit 288b8155ebfa196ac46b98295a8a5788159542ba.
bundle updates