Cleanup & simplify git config
Misc updates