Arranged bundles and make use of NeoBundle instead of Vundle.
Commented vundle bundle line since it is not used.