Modifying poms
Merged incoming
Update gitignore