deleted commented notes in promotion.js, and played with failing lines in a spec, ultimately left spec file unchanged
fixed one test, made the change order status button send the order.id rather than the order.guid, it works now
Merge branch 'master' into final_bugs
Merge branch 'master' of github.com:bradpsheehan/daughter_of_store_engine