removed various tom-cruft to clean up jakob's world

Signed-off-by: Tom Everett <tome@criticalmass.com>
Merge remote-tracking branch 'origin/tge_1' into dev