Revert "whitespace, javadoc, cleanup"

This reverts commit e7ae440529b0fca172905f148e3cdbe87cfa9b89.
Merge branch 'master' of github.com:SpringSource/grails-data-mapping