Merge pull request #61 from yaronyg/master

Minor android bug fix and cleaned up web relay a little
Integrate Tor and put in better test skip control

The Android libraries are passing but there is a problem with the Java
libraries. I'm doing this commit mostly just to backup before I install
an update on my machine.