Fixed up being able to update a table with new columns etc.  Of note, Sqlite does not allow you to create a new constraint on a table that has already been created.
Fixed merge conflicts