Changes due to renaming
Merge branch 'master' of github.com:VincentKetelaars/dispersy-experiments
Changes due to renaming dispersy