tmux v1.9
Merge branch 'master' of github.com:michelk/dotfiles-public

Conflicts:
	muttrc