Reorder includes in index.php.  Resolves #554
Merge branch 'master' into edition-update
Adding handlers for edition deleting.
Adding edition handling to structure and law pages.  Part of #362
Fixing migration runner for proper ordering.
Adding migration for extra edition_id fields on tables for convenience.
Adding edition_id to import/delete queries.
More edition patches.  Refactoring the permalinks system.