General config updates.
Merge branch 'master' of https://github.com/Jing361/misc