first commit, working UT
Merge branch 'master' into query-prioritization
cleanup
Merge branch 'master' into query-prioritization
fix according to code review
more code review fixes
Merge pull request #156 from metamx/query-prioritization

Query prioritization