Rename mvn.json to maven.json
Update maven to 3.2.5
Merge pull request #247 from scottwillmoore/rename-maven

Rename and update maven