Move git config (aliases & editor) from .extra
Move git config (aliases & editor) from .extra

Better to have these tracked in the repo and just keep the sensitive info in
.extra, as intended.

cappadona/dotfiles,cappadona/dotfiles