changes to mc-lists
ediff configuration
Added safe themes
Merge branch 'master' of ssh://github.com/rshk/dot-emacs-d
Merge branch 'master' of ssh://github.com/rshk/dot-emacs-d

Conflicts:
	.mc-lists.el
Nicer dark theme for terminal