Updated
Merge branch 'master' of github.com:fallen-s4e/emacs-config

Conflicts:
	git/git-achievements