Add local
Clean up mutt
Massive change. Do not care what
Merge branch 'master' of /home/mert1415/shared/dotfiles

Conflicts:
	bash/local/clom.oucs.ox.ac.uk
update ssh config file