Better zsh detection
Added rvm to path
OSX script