Changes to accommodate option year discrimination
Clean up magic numbers
Merge pull request #1 from barchart/Symbology_Options_Change

Changes to accommodate option year discrimination