indentation
Remove hack for python-mode
require cb-org-mail instead of autoloading
Remove reference to cb-lib
submodule update