Added --rm switch for building of new containers