Some fixes from trying out on a VM

Fixed some syntax in the script that doesn't agree with bash
Change the gitconfig file to not include the stuff wildcarded, going to try two
   part configs for now (~/.gitconfig and ~/.config/git/config)
rebase
Revert "rebase"

This reverts commit 376d6da4ccd7be286a4b4643cd27ed4ff0c8c446.
Typoed filename