update my setting
Merge branch 'timeblink' of https://github.com/timeblink/emacs.d into timeblink

Conflicts:
	lisp/init-locales.el