Autoload org-mac-grab-link
Add init-vc.el, and enable diff-hl by default
Ignore ~/.emacs.d/{thumbs,emms}
Merge remote-tracking branch 'upstream/master'