Merge branch 'master' into task_manager

* master:
  Order matters for little ol pip
Fix unittests for nettest
Refactoring of NetTestLoader

* Make it clear that calling one of those methods can be extremely dangerous
* Kill a bug spotted thanks to unittesting
Rename private option to test_file to separate it from test string.
Fix director unittest
Remove now superfluos runner unittest
Change how we pass arguments to the nettest loader

* Explicit the passing of the nettest file argument
Make the starting of tests more robust.
Add more debugging to managers
Set the default collector via the command line option
Update test decks with the proper key
Fix so that parsing of test decks works properly
Fix typo in test deck before_i_commit
Merge branch 'master' into feature/task_manager

* master:
  Remove unneeded commented out line
  Flatten the reporter keys
  Return something in txscapy
  Update before_i_commit script to make it work (cherry picked from commit 9cdf5596c8f16cac819afdaf1b9b537b36f796a6)
  Refactor logic for importing scapy related functions
  Add sent packets to report and use startSending instead of sendPackets

Conflicts:
	decks/before_i_commit.testdeck
Merge branch 'master' into feature/task_manager

* master:
  Add changelog for ooni
  Update ooniprobe.conf.sample
  Add tests for YAML reporter
  Open YAML report in createReport
  Update tests to reflect change of syntax in NetTestLoader
  Update NetTest tests to reflect change of syntax

Conflicts:
	ooni/errors.py
	tests/test_director.py
	tests/test_nettest.py
Raise NoMoreReporters exception on failure
Reorganization of code tree

* Move unittests into ooni directory
Attach errback to dl
Rename ooniprobe to ooni.
Merge branch 'feature/task_manager' into feature/daemon

* feature/task_manager: (70 commits)
  Disabled test_pushFilenameStack, because it's failing in travis
  Use absolute filepath instead of relative
  Only run trial unittests
  Fix typo in ooniprobe sample config file
  Add libpcap-dev to dependencies
  Install pyrex and python deps via pip
  Also run the unittests
  Fix travis file
  Further debugging and code robustness
  Set the tor_state GeoIP class attribute on startup
  Bump version to 0.0.11
  Clean up tests for updated ooni codebase
  Final cleanup and bugfixing for task_manager
  Pass the IP address of the probe instead of an object
  Make reporting more robust
  Make the starting of ooniprobe via cmd line more robust
  Parametrize task timeout and retry count
  Add option to disable the default collector
  Raise NoMoreReporters exception on failure
  Fix typo in test deck before_i_commit
  ...

Conflicts:
	ooni/config.py
	ooni/director.py
	ooni/errors.py
	ooni/managers.py
	ooni/nettest.py
	ooni/oonicli.py
	ooni/reporter.py
	ooni/tests/disabled_test_utils.py
	ooni/tests/test-class-design.py
	ooni/tests/test_director.py
	ooni/tests/test_nettest.py
	ooni/tests/test_reporter.py
	ooni/tests/test_utils.py
	ooniprobe.conf.sample
	tests/test_utils.py