Updated modules and vimrc
Switch to Vundle. Improvements to setup script.