Now using vundle, along with other small vim changes.