Merge pull request #40 from opengm/master

update from opengm:master
fix typo in opengm_min_sum causes unincluded headers if cplex was disabled
Merge pull request #157 from joergkappes/master

fix typo that causes broken build