Fixes for mavericks zsh complaints. Makes a bit more sense too.
Fix setup.sh so it works better with mavericks.