Calendar Overhaul

Signed-Off: Matthew "Labradoodle-360" Kerle <lab360@simplemachines.org>