Fixes for diff logic#57

Eric Hibbs (flowstate) merged 5 commits intomainSocketDev/socket-python-cli:mainfrom

doug/fix-diff-logicSocketDev/socket-python-cli:doug/fix-diff-logicCopy head branch name to clipboard