Correct augmented term data for contextual objects.

Update Issue 626
Status: Fixed
Version 1.5.2 - fixes category error w/ contextal maps
Limit query post filtering to WPML (sitepress).

We can't send the second filter argument that plugins may expect,
a WP_Query object. If WPML starts using it this attempt will break
again.

If, however, we integrate post queries with a WP_Query, none of
this will be necessary. :)
Declare globals properly.

Update Issue 628
Status: Fixed
Maintain consistent object type when guessing current location.

Update Issue 629
Status: Fixed
Version 1.5.3 - bug fixes.