Add ability for users to more neatly apply custom manifests

[nocturnalastro]

Also requires slight change if people have be overriding manifest templates