allow for construction by expiry date and for receiver and payer swaptions
Merge branch 'fix20131102'