added precise and squeeze support to setup-dependencies.sh
Fetch dnspython and scapy from pypi instead of the tpo mirror
using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54
Vagrantfile now using setup-dependencies.sh
nettests dir changed
back to upstream master
fixing rights
fixing path to data dir
nicer file handling if makefile is executed multiple times without clean
some steps closer to a fully running setup, documented the open issues
wrong box name fixed
Merge pull request #54 from moskvax/squeeze-precise-setup-support

added precise and squeeze support to setup-dependencies.sh
Merge pull request #155 from effhaa/readme-fix

Readme Fix: nettests location changed
Update README file
Do some radical changes to Vagrantfile and setup-dependencies

A lot of this code is taken from the GlobaLeaks setup script.
Update to point to the /usr/share dir directly
Workaround crazy bugs.
Merge branch 'master' into effhaa/vagrant-precise-ooni

* master:
  Fetch dnspython and scapy from pypi instead of the tpo mirror
Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add disclaimer
  fixing rights
  back to upstream master
  nettests dir changed
  using precise-capable setup-dependencies from https://github.com/TheTorProject/ooni-probe/pull/54
  Add obfsproxy_binary option to sample config
  added precise and squeeze support to setup-dependencies.sh
Merge branch 'master' into effhaa/vagrant-precise-ooni

* master:
  Add disclaimer
  fixing rights
  back to upstream master
  nettests dir changed
  added precise and squeeze support to setup-dependencies.sh

Conflicts:
	README.md