Update Marmotta to the 3.3.0 release candidate

* Use new style jettywrapper configuration
Merge pull request #28 from dpla/update-marmotta

Update Marmotta to the 3.3.0 release candidate