merge changes from lectura
merge zshrc
Merge branch 'master' of github.com:dpfried/config

Conflicts:
	vimrc