Move vundle related settings to vim-bundles

And update the settings for the plugin according to the changes in the vundle.
Merge branch 'master' into netbook