add makefile problem fix
Merge branch 'master' of https://github.com/qinshulei/emacs.d

Conflicts:
	lisp/init-local.el
add gist