Merge branch 'serve_multithreaded'
Add combined position_path field.

This allows us to can calculate counts of number of times a result is
clicked on in a given position for a search.  Wouldn't be needed if we
were using elasticsearch 1.0+ aggregations which allow a script to be
used to calculate the key for this sort of operation.