Update .tmux.conf to use newer PowerLine symbols
Merge remote-tracking branch 'origin'