Added cabal binaries to path
Merge branch 'develop' of github.com:jdubie/oh-my-zsh into develop

Conflicts:
	custom/common.zsh