Revert
Merge branch 'master' of github.com:Silox/tmux-powerline

Conflicts:
	tmux.conf
	zshrc