Disable X11 in vim from mutt as well
Remove duplicate displays

These can appear when we have multiple tmuxes on a single machine with the same
DISPLAY variable.
Merge branch 'my-rpi' into laptop

Conflicts:
	config/muttrc