Cleaning up
Merge branch 'master' of github.com:w0land/dotfiles

Conflicts:
	mutt/muttrc