Various improvements.
Merge branch 'master' of https://github.com/howardabrams/dot-files