Stop using org-caldav from MELPA

Dependency on org-7 keeps messing things up and caldav wants to install
org from MELPA as well. Ack.