fix Generator.java, was an issue with merge, fixed, and fixed 2 template issues
Merge branch 'master' of github.com:mawalker/druid