Started over.
Merge pull request #1 from BenKanouse/master

All new things - the jenkins pull request builder requires more work :(