Update my mailboxes
Merge branch 'my-rpi' into laptop

Conflicts:
	config/muttrc
Fix typo
Merge branch 'my-rpi' into laptop