Merge pull request #137 from emilyhahn/master

File ingestion change
disabled test
Updated dataset templates.