Revert "Add WP_Query integration on init, not plugin load"

This should be merged into develop, not master.

Reverting to fix the master branch.