All kinds of stuff -- debug and new functions and so on
Merge branch 'sumatra'

Conflicts:
	proc.d/01.csource
	proc.d/enable.snippet
	proc.d/hostname.rc
	proc.d/local.rc
	proc.d/pythonbrew
	proc.d/setaliases
	proc.d/setenv
	proc.d/setps
	proc.d/uname.rc
Everything is squared away