resync
Merge branch 'master' of https://github.com/vrih/emacs-config

Conflicts:
	.emacs
resolve conflicts