Fix 'add' and rework rebuilding

The 'add' files need to be copied to the build directory. Also only
rebuild if the image doesn't already exist or if the --rebuild option
was given.