merge up to jailbot

merging clark's latest changes