Automatic changes
Merge branch 'master' of ssh://github.com/rshk/dot-emacs-d

Conflicts:
	init.el