Fixed device_tree.tpl to be a bit more flexible. Recursive grouping was only adding string fields. Now adds both integers and strings.