refactored OrderFultillment at bit

- reformatted some code
- corrected a misspelling bug
- inserted optional MarchantOrderID / MerchantOrderItemID fields
corrected/added to RSpec tests