Merged the rides and calendar pages. Upgraded to using the calendar API which is much much better. Better presentation and more info for calendar events and it actually works properly now which is nice. Some style changes too.