add git-flow for zsh
include local include files
Merge branch 'master' of github.com:jeffknupp/config_files