Get latest updates checked in

It's been a while since I checked in updates to my dotfiles. To be
honest, I don't even know what all is in here. I'll try to be more
diligent here in the future.
Merge remote-tracking branch 'origin'