Adding more vim plugins, cleaning up Puppetfile