imagefactory: Fix substitutions to also use @

Regressed in previous commit.
imagefactory: Don't hardcode /repo

Drop the .. from here, we should fix the kickstart files.
imagefactory: Flatten input kickstart

This way we can use %includes for the vagrant box.