merge!
renames!
move NAME and REUC extensions to sys/
Merge pull request #1389 from ethomson/merge_trees

Merge trees