Add Git user/email config, tidy up a bit