tmux tweaks
Merge branch 'tmux'
better prompt
Merge branch 'fish'