Minor cleanup based on review comments, revert Jackson dependency back
to 2.2.0 in the POM until 2.4.1 is released with my submitted patches.