Restructure vimrc. Add few extra bundles