git: re-arrange config, add template dir + github
git: conflicted alias for conflicts
git: turn rerere on