Make merchant overview simpler and more consistent with core

The merchant overview was a table in a form, with buttons displayed in the table. This was not consistent with core and made the code somewhat more complex. The overview is now just a themed table and the buttons have been converted to links. The form for making a merchant the default one has been moved to a separate page callback.

Fixed and committed to 7.x-2.x-dev.