Only keep 200 photos around, tweak the timing for values.
Merge remote-tracking branch 'origin/master'