misc updates
Merge branch 'master' of github.com:tom-weiss-github/home