Combining vimrc and gvimrc, separating vundle setup and bundle configs and sourcing them into vimrc, added to vimrc