Merge pull request #28 from bhutchinson/master

need to fixcrlf for import-data as well as import-data2