docs update
Merge branch 'master' of https://github.com/bmauser/psa_docs