Working set
Mail packages
Merge branch 'master' of github.com:do3cc/dotfiles

Conflicts:
	.gitignore