Merge pull request #194 from mpeuster/master

Cleaning up jenkins test integration.