Removed the weight node, and added the ScalarWeighted and FunctionWeight trait types.
Added tests for the new weighted feature traits.