Resolve conflict
Merge branch 'master' of http://github.com/yinghau76/dotfiles
Merge branch 'master' of http://github.com/yinghau76/dotfiles
Use backtick as tmux trigger