Pull in some sandbox changes
Don't swoop evil-operator-state -> evil-emacs-state