Merge pull request #5 from opengm/master

Merge pull request #245 from homul/master
TRWS reparametrizer updated
Merge branch 'master' of https://github.com/homul/opengm
Merge pull request #246 from homul/master

reparametrization updated for persistence