nov26 updates
Merge branch 'master' of https://github.com/imjakeayala/settings