Fix YamlLoader reimport when "sol" subdirectory doesn't exist.
Fix reimporter to not wipe out user questions.
Merge branch 'importer_fix'