Better prompt and session X-launcher
And the fixes
Merge branch 'master' of github:baabelfish/dotfiles

Conflicts:
	.zsh/alias.sh