Update zsh config for better virtualenv friendliness.
Add 'unixtime' alias.
Merge branch 'master' of github.com:asmallteapot/dotfiles

Conflicts:
	zsh-alias