Move Align, vim-web-indent to vundle, remove vim-puppet