Merge branch 'master' of github.com:bratarmin/.emacs.d

Conflicts:
	.gitignore
	conf.d/main.el
	conf.d/mode-git.el
	conf.d/mode-org-remember.el
	conf.d/mode-slime.el
Merge branch 'master' of github.com:bratarmin/.emacs.d