Now vundle is used to manage plugins
Changed plugins
Merge branch 'master' into vundle