update
Merge branch 'master' of https://github.com/schnecki/dot-emacs.d

Conflicts:
	24/language_configs/c_config.el
	init.el
	remrege/24/packages_configs/rainbow_mode_config.el