Finishing up my little package package.
Merge branch 'master' of github.com:verdammelt/dotfiles

Conflicts:
	.emacs.d/init-package.el
Unmerging fetchmailrc