Added some tweaks from @holman's dotfiles https://github.com/holman/dotfiles