stuff
Merge branch 'master' of https://github.com/chipchilders/dotfiles

Conflicts:
	.muttrc
Remove pgp from mutt config