Updated IndicatorType vocab, cleaned up vocab file

Closes #37