Add org-caldav submodule
Add to mc-lists
Allow using sudo user in tramp (as /sudo:host:path/file)
Merge branch 'master' of github.com:gpittarelli/emacs.d

Conflicts:
	.mc-lists.el
	init.el