Merge pull request #19 from yaronyg/master

TORIFY!
Merge pull request #20 from yaronyg/master

Changes to get tests running on Tor in Android as well
Little clean up so relay port specification is centralized

Added support for finding the socks proxy address
Added support for directly specifying relay port
Centralized where we declare relay port in JS to one place so we can change
 it later when we support dynamic relay ports.