Refactor Swaps and Position

Added CommoditySwapSpread. Added discounting. More tests.
This is just a rename from HedgeInstrument. It's not an instrument so I thought this was a better name.