Prints word position if called with -w.
Fixed build warnings when building with -DDEBUG -DDEBUG_II.
Added test query to test for a bug where and "and" followed by a phrase didn't get merged correctly.
Added and clean up some DEBUG_II text.
Fixed bug where some queries with an "and" followed by a phrase didn't get merged correctly.