Raise on error when connecting via SAP

Also get rid of some debug prints
Add a CommChain for simplified tunneling
Merge branch 'rails-args' into upstream-master