added git-flow plugin
Merge branch 'develop' of https://github.com/forkch/dotfiles into develop

Conflicts:
	gitconfig
special dirs
Merge branch 'develop' of https://github.com/forkch/dotfiles into develop