Clean up .gitignore and pom.xml