Updated makefile to point to ding2 master branches
Merge pull request #4 from ding2tal/core-pr-4

Core pr 4
Merge branch 'master' into development
Updated make file to point to development branch
Issue #513 by pjohans: Remove explicit dependency to ding_dibs.
Issue #513 by pjohans: Remove implicit dependency to ding_dibs.
Merge pull request #1 from pjohans/development

Make it possible to disable ding_dibs
Resovled merge conflict in makefile