Merge branch 'master' of github.com:tobytripp/emacs.d

Conflicts:
	custom.el
	packages.el
Merge branch 'master' of github.com:tobytripp/emacs.d

Conflicts:
	custom.el