remove typescripts thing
updates
Fix zsh history search
various changes
Merge branch 'master' into osx

Conflicts:
	.zshrc