Add test for #2292, #2006
Fix content type in migrations.
Rename migration
Remove print
Cleaner implementation of content type fix
Cleaner existing record fix
Fix test
Django 1.6 doesn't like get_or_create in migrations, apparently
Merge pull request #2380 from yakky/feature/fix_content_type

Fix content type generation