Lionel Messi has committed his future to Barcelona, penning a deal which will keep him at the club until 2021 and which includes a 300 million Euro buyout clause.