Various modifications based on mathiasbynens dotfiles