Country field not hidden like State/Province

I discovered a few issues while I was upgrading a client's taxcalculator to the latest.

• The Country was not showing as a link as we do for provinces and only after changing it through the Popup was it working properly
• The Taxes are calculated based on your phrase was repeated twice
• Switching the Payment processor was focussed on Billig, but since they can choose another payment method we should upgrade this to the new method.
• Starting with an out-of-country Country setting, and changing it didn't cause the Country to be disabled and therefore displayed the Country from before.

I'll make a merge request shortly.