more cleanups and minor modifications
Merge branch 'master' of github.com:tareqalayan/zsh_config

Conflicts:
	README.rst