zip editing helper function.
Merge branch 'master' of github.com:skakri/dotfiles

Conflicts:
	zshrc