Backout b17e9a0ea116 and 50725de303ef, restoring Feature model. Fixes #161 and re-opens #65.
Update changelog
Bumped to 3.1 in preparation for next release.
Added tag 3.1 for changeset 47224d55ddc6
Bumped to 3.2 in preparation for next release.