add json keys to structs for re-encoding
fix a few missed json encodings
Merge pull request #5 from lushvino/master

Add json keys for re-encoding into json (ie: API Server)