Tmux and zprezto updates
Merge branch 'master' of github.com:Meroje/dotpickles

Conflicts:
	home/.tmux-powerline
	home/.tmux.conf