Merge stuff from https://github.com/mathiasbynens/dotfiles/