Refactor Swaps and Position

Added CommoditySwapSpread. Added discounting. More tests.