Fix bad right prompt placing.
Update git.plugin.zsh
escape dashes
Merge pull request #2396 from soluwalana/master

Fix WIP false positive
Fixes tmuxinator plugin find on OSX
Merge pull request #2398 from phstc/fixes-tmuxinator-plugin-find

Fixes tmuxinator plugin `find` on OSX
Merge pull request #2389 from driver2000/patch-1

Fix bad right prompt placing.
git: don't alias gm to git merge; conflicts with GraphicsMagick
add the ondra theme
ls: color more audio files
automate my two-branch upgrades