Merge pull request #13 from jordandukart/7.x

Revert back to a stable state.
Re-add update and schema changes to make sure we don't break.