Remove unnecessary vim maps, improve todo syntax