Merge branch 'master' of github.com:10sr/dotfiles

tmux.conf

@@ -23,5 +23,6 @@ set -g status-bg green
 set -g status-fg white
 if "test `hostname` = arch-aspireone" "set -g status-bg blue"
 if "test `hostname` = darwin-mba.local" "set -g status-bg yellow; set -g status-fg black"
+if "test `hostname` = newkiwi" "set -g status-bg magenta"
 
 if "test -f /opt/local/bin/reattach-to-user-namespace" "set-option -g default-command '/opt/local/bin/reattach-to-user-namespace bash'"