More changes and cleanup

Added name attribute to Order.  Renamed order_type to type on Order.
Updated load_demo_om.sql.