Add calendar and org mode on startup.
Merge branch 'master' of github.com:bluekeys/.emacs.d