added gi-vim, removed puppet