Comparative Advantage in a Multi-Factor World