Various updates.
Merge branch 'master' of github.com:seanochoa/dot-files