Adjust method paramter names
Adjusted parameter names on methods to be more consistant with WPeC coding practices
**No logic changes**
renamed parameters per review suggestions
adjusted parameter names in WPSC_Country class methods
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names

Conflicts:
	wpsc-includes/wpsc-country.class.php
Merge pull request #1077 from JeffPyeBrook/pr-adjust-method-parameter-names

Adjust method parameter names