Consolidate creation of default calendars back into the calendar lib

Please pull this small code tidy. 

It simply consolidates the creation of default calendars back into the calendar lib. It's a pre-requisite to a later change which will adjust the default calendar names (or perhaps make them more customisable)

First pull request - please guide on procedure...

Signed-off: Ed W <ed@wildgooses.com>