Merge branch 'Importer-text-links' of github.com:tddawson/conference-tracker into Importer-text-links
Merge branch 'master' into Importer-text-links