Auto-enable magit-svn when appropriate for a repo
Autoload org-mac-grab-link
Add init-vc.el, and enable diff-hl by default
Ignore ~/.emacs.d/{thumbs,emms}
Autoload org-mac-grab-link as an interactive symbol
Remove redundant autoload
Show guide-key hints for % sequences in dired
Show clock sums as hours and minutes, not "n days" etc.
Add org-pomodoro
Enable melpa-stable
Disable package-check-signature if gpg is not available
Remove unused package-filter-function code: use package-pinned-packages instead
Disable marmalade
Merge branch 'master' of https://github.com/purcell/emacs.d

Conflicts:
	.gitignore