Merge of powerline-zsh.py  with powerline-shell.py