Ensure that the 3.0 Merchant API is loaded after the 2.0 theme engine, as the merchant API has conditional dependencies on the theme engine.
Merge branch 'master' of github.com:wp-e-commerce/WP-e-Commerce