update gitconfig and XDefault for urxvt
Merge remote-tracking branch 'origin/master'