Patch for 4.7 bugs: vocabmap table has vocab ids reversed, method stored as integer not string & commening out buggy domain code

Issue Summary

This very rough patch (my apologies to the Drupal gods for my bad code :-) !) fixes the following 4.7 problems:

1. The vocabmap table has the remote and local vocabulary ids reversed
2. method is stored as as an integer not a string
3. the domain checking code is buggy and could not possibly work in a server with multiple sites. Because I don't know how to fix this problem, I have commented out the domain checking code. I will post a further issue with the real domain checking problem and a solution on how to fix it.