added gist.el.
fixed conflicts.