Updated collate; renamed spring() to roll()
Update roller interface; break up calendar.R better