Unit test fixes.  Test was looking in the wrong place for ingested data files,
and was not checking to see if the files had been actually ingested (rather
than being left over from a previous run.)
Ripple from Grischa's ACL overhaul
Merge pull request #10 from crawley/dev

Regression from Grischa's ACL improvements
Merge 'origin/master' into stevefork-merged

Conflicts:
	atom_ingest.py
Merge branch 'stevefork-merged' into stevefork