Switch from neobundle to vundle and reorganize vimrc.