added git-flow
fixed doc badge
not on pypi... yet.
Merge branch 'feature/update_docs' into dev