-
Merge branch 'master' of https://github.com/usoff82/my-emacs-config

Conflicts:
	.emacs
	.emacs.d/rc/emacs-rc-log4j-mode.el
	.emacs.d/rc/emacs-rc-python-elpy.el
	.emacs.d/url/cookies