Updated poms
Cleaned up poms
Fixed merge
Upgraded some dependencies