Ignore .git when doing recursive grep
Merge remote-tracking branch 'origin/master'
Add conf mode from GNU emacs for supporting xemacs