Remove local build config file.
Add sorting functions to the node lists.
Merge from master.