underscore -> lodash
livereload on 35730
Merge remote-tracking branch 'origin/master' into cal-annotations
horizontal overlapping case
group by N weeks for now to reduce horizontal overlap