Add evil back, tweak flycheck