cleanup + fix
BurtB
Branch: burtbeckwith/jsonexclusionmarshaller:master
Branch: stonebraker/jsonexclusionmarshaller:master
Merged
Merged pull request
Merged in burtbeckwith/jsonexclusionmarshaller (pull request #2)
Merged in burtbeckwith/jsonexclusionmarshaller (pull request #2)
Sorry about the breakage - the last commit fixes what I broke