upgrade to peep 2.0

@rhelmer r?