Add zsh_env_setup support
Add emacs configuration
Update install.sh
Update .zprofile
Merge branch 'master' of https://github.com/medvid/dotfiles

Conflicts:
	.zprofile
Change kdiff3 to meld as mergetool