fixed typo in tmux plugin
Merge pull request #1935 from mateitrusca/master

typo in tmux plugin
git: don't alias gm to git merge; conflicts with GraphicsMagick
add the ondra theme
ls: color more audio files
branch-agnostic upgrades