manual merge from freed
Merge pull request #20 from phreed/master

Add druid-java-lib
fix Generator.java, was an issue with merge, fixed, and fixed 2 template issues
Merge branch 'master' of github.com:mawalker/druid
Merge branch 'master' of git://github.com/mawalker/druid
making repairs to the templates, update, default values, etc.