Merged Michael's Android transport/config, fixes #2, fixes #7