Merge branch 'use_import' into 12spokes

Conflicts:
	lib/seed_dump/dump_methods.rb