Catch up as of https://github.com/mathiasbynens/dotfiles/commit/235e141b78a93008bdfb7bb3edf800545ffb0023