using erbs
Merge pull request #1778 from danmcp/master

More Jenkins WIP