some update
Merge branch 'master' of ssh://github.com/cybergrind/emacs_config

Conflicts:
	init.el