More build file cleanups.
Merge branch 'master' of https://github.com/kwhat/jnitasks