Improve diffs for Emacs Lisp and Org

Tip by @ryuslash at
http://blog.ryuslash.org/archives/2013/08/11/some-quick-git-diff-tips

Thanks!
Enable some more diff patterns
Add merge settings for VS projects