Final touch-ups (hopefully) to jenkins build script