pom revert
Merge pull request #774 from dburdick/develop

pom revert
better merge
better pom version
Merge pull request #775 from dburdick/develop

Develop
merge upstream changes