Merge remote-tracking branch 'havsule/master' into osx
Merge remote-tracking branch 'havsule/master' into osx
Merge remote-tracking branch 'origin/master' into osx
Merge remote-tracking branch 'origin/master' into osx
zsh/OSX: plistcat alias
PYTHONDONTWRITEBYTECODE=1
Merge branch 'master' into HEAD
Merge remote-tracking branch 'origin/osx' into osx