added base-cli configuration
Fix IF statement
git-extras enabled