Fix @JsonIgnore and @JsonProperty annotations

Fix @JsonIgnore for getters that don't have a corresponding field.

Also fix @JsonProperty, so renamed properties are properly picked up.