Minor POM updates and some small code cleanup
Resolve merge conflicts
Reimplement try with resources patch after merge conflict
Merge pull request #31 from karianna/master

More small POM and code changes