Distinguish between futures and options instrument types

A single OPTION_INSTRUMENT type is not sufficient for instrument processing logic. This pull separates futures and equity options instrument types. It also renames an existing enum which could cause some minor code breakage (OPTION_INSTRUMENT -> FUTURE_OPTION_INSTRUMENT)