lots and lots update since last time, moved to vundle