update test conf
update test conf
tweak index
Merge remote-tracking branch 'koan/master'