Updated submodules, fixed a conflict with diff and markdown and
configured gradle files to use the built-in groovy syntax.