Move most of configuration from ~/.gitflow_export to natural config
Move all configuration from .git/gitflow_config to "--local" conf
The configuration for the base should always be local.

Included the parameter --local to make sure it will only read and write from the local .git config file.
Update Changelog
Version bump 1.6.0-dev.21
Merge branch 'feature/pull_request_#87' into develop
Improve help formatting
Update changelog
Version bump 1.6.0-dev.25
Merge branch 'feature/pr_86' into develop