correcting oh-my-zsh install which does
not set PATH correctly for #132
Merge branch 'feature/zsh' into develop
removed uneeded trailing slash, again for #132"
Merge branch 'feature/zsh' into develop
Merge branch 'develop'
Merge remote-tracking branch 'upstream/master'