Merge pull request #50 from bhatfield/master

[TIDOC-1059] Change to master branch as default for Jenkins builds
Fix folder name