Resolved the things that changed since I forked

Hi Lester, 

I changed the check for "print" from a `strpos` back to `query_var` with advice from stackexchange.
I also cleaned up the differences in the files. Looks like I was somehow using an old version?!?