Ditch some bundles I'm not using
Add vim-puppet plugin
Reenable some plugins