Remove images, change default to lamp00
Add CPUS as param in Makefile
Update wdir
Bring in updated metadata
Update metadata