Add status line and shutup ZSH
Merge branch 'master' of github.com:Bram--/dotfiles

Conflicts:
	files/tmux.conf