Update django-subdomain-instances to 0.7
Make sure an existing contenttype is renamed.

This migration was trying to change the (speeches, popolospeaker)
contenttype to be (speeches, speaker) which since 80e3f0b4325395951cf89,
probably already exists, causing an error.

Make sure any existing (speeches, speaker) contenttype is therefore
renamed first.
Merge branch 'new_subdomain_instances'
keyboard controls are no longer visible when there are no next or previous sections. Closes #396
Remove unused packages file.
Merge remote-tracking branch 'origin/issue/396-keyboard-controls'
Version 1.2.2.

Bugfix release. Include note to error about upgrading South to 1.0, as
that will use south_migrations directory in preference.
Update bundled CSS for change in 5319257c.
Add dots to join subsections to the narrative line

Fixes #372. Also remove horizontal overflow bug in .section-signpost.
Quieten unneeded warning about new test runner.

Fixes #406.
Don't error if no files found to import
Add merge/delete speaker interface.
Placate flake8 a bit - there are a lot of long lines in this file...
Merge branch 'delete_or_merge_speaker'
Merge remote-tracking branch 'james/noxml'
Exclude active speaker from reassignment list.

Fix typo with two selfs, and remove unneeded JS.
Only run override code if main JavaScript present.
General Popolo json import script.

Rewrite and merge the Popolo json import scripts from SayIt Philadelphia
and OpenNorth to make a more general Popolo json import script which
works in an 'upsert' manner.

It should now update any existing entries and associated records, rather
than delete/recreate the identifiers/other names/etc. Also fix a number
of bugs.
Break popolo importer out of management command.

Break the Popolo importer out of the management command so we
can use it from the web frontend too.
Extra requirements for https with SNI.

python-requests needs some extra packages in order to be able to
fetch stuff from an https site with SNI. This is particularly
noticeable now that PopIt uses https.

https://stackoverflow.com/questions/18578439/using-requests-with-tls-doesnt-give-sni-support