add environment checking variable
fix environment-dependent lines
add zsh-completions to fpath
Merge branch 'master' of github.com:na4zagin3/dotfiles

Conflicts:
	.emacs