Changes to get sphinx to build; rename FunctionQuantityBase to FunctionQuantity