Merge changes from mathiasbynens 's dotfiles

Up to commit b69366cbab