Fixes and merges
Merge branch 'master' of https://github.com/cjryan/cucushift-jenkins
Minor fixes