Maven

Updated as previously discussed..
I see a lot of commits there.  I guess this is because I had been working off a clone of master.  
My stuff is fairly self contained though;  Everything under build/maven.