add powerline
tmux: update <bind>r for tmux 1.8
Merge remote-tracking branch 'origin/master' into mac