Down to two Maven Modules and two Maven Assemblies

100% of tests passing now but have not tested the webapp yet.

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/fewer_modules@1488776 13f79535-47bb-0310-9956-ffa450edef68