move git color cfgs to end of file
rm token (no longer needed)
visual mergetool
always ignore git's mergetool temp files
sort ignroed types