Disable syntax highlight for email editing
Merge branch 'my-rpi' into laptop

Conflicts:
	config/muttrc