Trap error if git flow is not available.
Changes the default profile example to set prompt globally instead of locally
Merge remote-tracking branch 'origin/master' into viper