Some functionality for mode-specific scratch buffers
Python gdb setup
Merge branch 'master' of https://github.com/lmichelbacher/emacs

Conflicts:
	lisp.el