Removed ZSH_PWD variable from `zshrc` file, instead `local.sh` is used.

Note: consider the use of `git update-index --assume-unchanged local.sh` in order to ignore local changes to this file. See http://blog.pagebakers.nl/2009/01/29/git-ignoring-changes-in-tracked-files/
Merge branch 'origin/master'