Tweaked the mailboxes some more
Merge branch 'master' of github.com:dxtr/dotfiles

Conflicts:
	mutt/muttrc
	mutt/offlineimap.py
Added notmuch-config-osx