Bug fixes: attach datafile attributes to the right datafiles + cope with
missing user details
Merge pull request #2 from crawley/master

Bug fixes