Chiller query optimization
Merge branch 'master' of https://github.com/jdebbink/lollipop

# By unknown
# Via unknown
* 'master' of https://github.com/jdebbink/lollipop:
  Wire up config menu
  add options to config