20140326:COMPLETE:Fixes for decimal percentage shipping and markup