leftover unpushed fixes/header updates
Merge branch 'master' of github.com:SJShaw/simpatico