Merge pull request #36 from adam-vessey/7.x

Correct an unintended difference from the previous XSLT: Order of items
Make fields parameters.

Could be exposed as config in the GUI at some point...