Fixed problem with mod_name var and restored .gitignore to it's upstream content
Merge branch 'master' of github.com:joerx/puppet-java

Conflicts:
	.gitignore