configs changed for local usage with 2 parties
Merge remote-tracking branch 'origin/stubfixing' into wondergui