Show sub shell status in PS line
Merge branch 'master' into grapefruit