Sync default calendar creation code with contacts app

Please review this small code tidy. It (mostly) synchronises default cal/contact creation between the two apps (hint: there is a lot of duplicated code between these apps - perhaps we can consolidate some code?)

Pre-requisite to changing default names for cal/contacts (or making customisable)

ping @georgehrke