Fixing immediate problems. More to be solved soon.
Making changes to reflect the vundle repo changing names