rolled back some changes to ensure d0 and d^ match default behaviours, spf13/spf13-vim#464