Reset affinities

Implemented #27, actually merging it to !1.1.0 now.

Before, #30 merged reset_affinities->master, which was bad and reverted in #31.

This is the merge I was looking for.