Cleanup and additional javadocs
Fix enunciate plugin config and remove runtime components (which we don't need)
Merge branch 'enunciate'