Fast merges.
Various stuff.
Merge branch 'master' of https://github.com/trq/dotfiles