tiny interface tweaks for happiness
Merge remote-tracking branch 'origin/master'

Conflicts:
	.tmux.conf