Integrating Rob's changes.  Cleaning up checkout page billing and shipping panels.