Revert "Merge remote-tracking branch 'csexton/calendar-vim/master'"

This reverts commit d83595a5ed9cb9f53384a24a504465ade6d08a77, reversing
changes made to cbd48a20e408ce0d8455bab120dcd1b9a2969271.

Changes are superfluous.