update .emacs
modify .emacs
Merge branch 'master' of https://github.com/davidshen84/gist

Conflicts:
	.emacs