Cleanup and switch base16 to vundle