connection and responses work on halligan lab machines
Merge branch 'master' of https://github.com/fleetofthemalden/petulant-obfuscation
fixing conflicts