Merge pull request #36 from alxdarksage/develop

Java 7 --> Java 6
Merge pull request #37 from alxdarksage/develop

More IT changes to run on Hudson
Test cleanup. Changes to work on Hudson?