Wanted to push this back to my dev box after making a change in prod.
Yet *more* cleanup, fixing and completeness.
Merge branch 'master' of github.com:blakelapierre/pulsarcms