tor/non-tor test flag
Merge pull request #40 from jmspring/toggle_tor_tests

tor/non-tor test flag