upgrade maven 3.0 -> 3.0.4, zinc 0.1.0 -> 0.2.0
Merge branch 'master' of github.com:davidB/scala-maven-plugin

Conflicts:
	pom.xml