Update search to keep running score as it traverses documents and query tokens
merge master branch into scoring