Fetch dnspython and scapy from pypi instead of the tpo mirror
Merge branch 'master' into effhaa/vagrant-precise-ooni

* master:
  Fetch dnspython and scapy from pypi instead of the tpo mirror