changing order of files around, and removing a hardcoded gitconfig