Updated import to add generic as well as marc21
ignore .orig conflict resoleution files
whitespace reformat