fileset-store: merge xml and xhtml p:store

This pull request intends to replace #54 .

It merges the `p:store` steps used for XML and XHTML documents. XHTML are stored with the `xhtml` method, unless `@method` is set explicitly on the file set.

@josteinaj please review and comment if OK. I'll rebase and merge.