Various changes.
Merge branch 'master' of https://github.com/m73/dotfiles
Completing merge.