Vinales announces new two-year deal with Yamaha