Small improvemenets to the File store.
Merge pull request #5 from pedroigor/picketlink-relationship

Small improvemenets to the File store.