Started using vundle, and a few other misc changes