new zsh prompt
changed border, changed prompt, changed zenbar
new spacing
removed powerline
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.tmux.conf