Little correction
Merge branch 'master' of github.com:LehmRob/dotfiles

Conflicts:
	.tmux.conf