tidy up manifests/hieradata - move to forked version of marathon repo