Merge branch 'fixthatshit' into 'home'

shell bits that needed to be fixed.

we lost some of the things with the merge request, not sure how.

See merge request !4

powerline-shell-init

@@ -1,5 +1,5 @@
 function powerline_precmd() {
-    PS1="$(/home/truck/sturf/powerline-shell/powerline-shell.py $? --shell zsh 2> /dev/null)"
+    PS1="$(/home/truck/sturf/banga-powerline/powerline-shell.py $? --shell zsh 2> /dev/null)"
 }
 
 function install_powerline_precmd() {

zshrc

@@ -9,8 +9,10 @@ SAVEHIST=2000
 setopt appendhistory autocd extendedglob
 
 if [ -x /usr/bin/xset ]; then
+	if [ -v DISPLAY]; then
 		xset -b
 	fi
+fi
 
 if [[ ${TERM} == st* ]]; then
 	if [ ! -e /usr/share/terminfo/s/st-256color ]; then