Added git flow plugin
Merge branch 'master' of github.com:thasso/dotfiles

Conflicts:
	zshrc