Change primary key of Canvas Model to canvas_id to allow for arbitrary canvas_id values
Pull changes for the billionth time