merge gitconfig, gitignore from dotfiles, yadr, dotfiles_mathiasbynens