ckarlof's API update based on 5-21-14 meeting with ferjm, tarek, remy, and alexis
formatting fixups
tweak
missing comma
Little changes from ckarlof proposal.