add remote-url aliases for github
use tabs for gitconfig because linus
gitconfig reordering
some git diff aliases and merge configs