Converting schema to workbench version 6.0

The new version of MySQL Workbench writes schema files slightly
differently.  Also, some index names have been fixed.