Retested WPSC_Countries API
* Fixed functions not working as a result of method name changes in prior commits
* Updated WPSC_Data_Map recursion prevention check to be fully re-entrant and handle cases where class was being constructed by multiple parents
Merge remote-tracking branch 'upstream/master' into pr-issue-1144-checkout-page-issues

Conflicts:
	wpsc-includes/wpsc-countries.class.php
	wpsc-includes/wpsc-data-map.class.php
Merge branch 'pr-issue-1144-checkout-page-issues'
Merge branch 'pr-issue-1144-checkout-page-issues-fixes'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'