Merge jenkins branch into master

omgherd so much has changed! Re-generalized so jenkins bits aren't mandatory, but is simply the assumed default.