Merge pull request #89 from bradbishop/dtree

switch back to in-tree device trees