Housecleaning.
Merge branch 'master' of https://github.com/modalpdx/MintTinPS_882