cleanup + fix

Branch: burtbeckwith/jsonexclusionmarshaller:master

Branch: stonebraker/jsonexclusionmarshaller:master

Merged

#2 · Created 2013-06-30 · Last updated 2013-06-30

Merged pull request

Merged in burtbeckwith/jsonexclusionmarshaller (pull request #2)

c10a801·Author: Jason Stonebraker·Closed by: Jason Stonebraker·2013-06-30

Sorry about the breakage - the last commit fixes what I broke