Changed bundling and vimrc