Fixes some of the license headers after merge.
Fixes module in module inclusion.

Extend works on class methods.
Moves remaining helper out of timelines namespace.
Restores original migrations.

This changes everything, again!

Changing migrations was not the right way to to do it. Instead, this
restores the original migrations and adds a new migration that includes
all changes that are needed for the changed models.