Merge pull request #2 from alexbennett/master

Update to latest.
Should work with Jenkins now.
Merge pull request #4 from HmmmQuestionMark/master

Ant buildfile and better versioning.