Vagrant 1.3.3, added git-flow and enabled more zsh plugins
Merge branch 'master' of github.com:tripledes/configs into develop