update lusty vim
update zshenv
Merge branch 'master' of github.com:nearapogee/dotfiles

Conflicts:
	zshenv