various additions, rearrangements
Merge branch 'master' of github.com:kirkelifson/dot-files