commit from new machine branched with bzzr
Merge branch 'master' of https://github.com/necktwi/ferryport after bzr branch
model was implemented. should be tested.