added cogs and contribution margin stuff to deals and proposals -- closes #40