another fix to the conditional syphon include
cleaning up the json serialization code
Adding player code updates
more json cleanup
minor fixes to player classes
Merge branch 'master' into config-and-serialization