Merge pull request #2 from dominichamon/master

pull in latest submodules
Add paris-traceroute to prepare
Merge branch 'prepare' of https://github.com/dominichamon/npad-support into prepare