recreating branch

oops. Messed up on the last commit to the branch, I sent it to master.
Anyway, it builds now. Just needs some tenderness to make CFLint an
uberjar