whitespace, cleanup
updated tomcat, scaffolding, and hibernate plugins to non-snapshot versions