setopt nohup
Merge branch 'master' of github.com:antekone/zshrc

Conflicts:
	.zshrc