Merge pull request #11 from opengm/master

update from opengm/master
removed unnecessary cplex macro
added wrapper for MPLP
added missing patch for MPLP
CMakeLists.txt: fixed typo for sadistic warning level
Merge pull request #151 from bekaus/master

CMakeLists.txt: fixed typo for sadistic warning level
FindCPLEX.cmake: Added OS X search paths.
Merge pull request #39 from opengm/master

update from opengm/opengm
update manipulator
update constraint opt
 bugfix lf visitor call
consider constant factors
new rinf
bugfix rinf-calles
add rinf-test
test-multicut: Check LINK_RT before linking against librt.
Merge pull request #152 from ilastik/mac-build-fixes

Mac build fixes
update rinf
update rinf
Merge pull request #153 from joergkappes/master

RINF