Updated calculate functions to be fluent and added specs
Merge pull request #992 from elliot/orderitem_fluent_calculation

Updated calculate functions to be fluent and added specs