HOTFIX: Auto Changing Order Status

Fixed issues with automatically changing order statuses based on payment processing. Also fixed payment based mergecodes in order status emails also triggered by payments.