Do not overwrite $wp_query with global symbol of the same name
Merge pull request #101 from barryhughes/master

Do not overwrite $wp_query with global symbol of the same name