Hotfix: Cleaner metadata nodes, put value text with output tag on single line

d29d65d Makes empty metadata nodes cleaner. Instead of <timeStart></timeStart>, it's <timeStart/>.

4144bb1Is as clean of a solution as I could think of. To make sure I don't add or remove whitespaces, trim() has been removed from the building of the model.