Merge pull request #145 from boudewijn-tribler/bugfixes

Point to Tribler repro.
Point to latest Dispersy.