Updated vim part 1

Signed-off-by: Tom Van Herreweghe <tom@king-foo.be>
Started on vim part 2