Pull update from Nau team's back to my personal dotfiles