Removed wp_die to be comply with the WPeC deprecation methodology.
Restored get and set methods after deep reflection
Address PR review comments
Merge pull request #1075 from JeffPyeBrook/pr-deprecate-means-go-way-nicely-not-die

Let's not die, and certainly not die without having get and set methods that work
Merge remote-tracking branch 'upstream/master' into pr-adjust-method-parameter-names

Conflicts:
	wpsc-includes/wpsc-country.class.php