Updated ps1.sh to use git status --porcelain.
Merge branch 'master' into mac