Maven fork updated

[Ray Krueger]

I changed the pom to deal with the "test" code in the main branch. I
changed the junit dependency to "provided" scope. Which means that
normally depending on erma-core won't give you a runtime dependency on
junit. But if you are using any of the test stuff in erma-core you'll
need to add junit to your own project.

I've also merged in the latest commits to smullins7/erma so it should
all be up to date.