Maven3support

These are the changes for supporting the build of the jar and the site in maven 3. I believe that these changes take into account some of Laurent's changes but go furthrer so you need not apply his changes.

I have made changes on a branch - might allow you to be more selective about applying them.