Merge pull request #13 from eribeiro/master

Refactoring: remove redundant semi-colons
Had to copy the voter benchmark in directly from Stephen's branch
Fixed incrementing of s_order_cnt on new order
Merge pull request #17 from alendit/new_order_fix

Fixed incrementing of s_order_cnt on new order
Fixed loading bug introduced in 20a2b6
Merge pull request #18 from alendit/tpcc_load_fix

Fixed loading bug introduced in 20a2b6