Update build-image.sh

Forgot to add the removal of .pibuilding
Fix CD back into scriptdir