Completing the rename to powerline-shell
Merge remote-tracking branch 'upstream/master'