Merge pull request #75 from opengm/master

update from master
Merge pull request #76 from opengm/master

update from opengm:master
Update .travis.yml

use 4 processes for make within travis (maybe this solves problems with travis)
Merge pull request #304 from joergkappes/master

Reduce number of make-processes for travis