Update shellvars
Update osx.sh
Merge branch 'master' into sansi

* master:
  Update osx.sh
  Update shellvars
Update zprofile
Merge branch 'master' into sansi

* master:
  Update zprofile
do not update yum or apt
Merge branch 'master' into sansi

* master:
  do not update yum or apt