Merge pull request #92 from jsight/master

Reorganized legacy windup code, reworked relativePaths, removed unused f...
Remove netbeans config
Use JDK 1.7 everywhere
Removed duplicated test files