minor diplomacy changes
Merge branch 'master' of https://github.com/arap/Chip-Totality