Make tomcat7 the default profile and rebase patches accordingly.

Make tomcat7 the default profile and rebase patches accordingly.
Fixes issue #28.