Datasource is done

Converted textfileloader to use the datasource and the datasource tests
are complete for now.