Update variant implementation

Update the variant implementation with the most recent version from https://github.com/mapbox/variant