Small fixes
Merge branch 'master' of https://github.com/mic47/linux-configuration

Conflicts:
	tmux.conf