Updated CompositeIndicatorExpression/Indicator to more closely align with IndicatorType annotation.
Merge pull request #102 from JWParlee/issue_32

Updated CompositeIndicatorExpression/Indicator to more closely align wit...