Merge changes from mathiasbynens' dotfiles