Merge pull request #1796 from danmcp/master

Jenkins v2 WIP
getting jenkins working