Revert "Revert "Revert "fix vim stuff"""

This reverts commit 50b4950365790544f0e2a4812a7ad991573fdcc0.