Used Map.Builder and Vector.Builder to construct JsonObject while parsing.
Commented out some bits and fixed up the project so that everything still compiles fine.
Various bits of housework around the codebase and a bump in the version of Jackson.
Merge with master