master branch needs to track svenc/NeoJSON branch exactly with GemStone mods on gs_master branch

[dalehenrich]

This way we can make changes on the master branch and do a pull request against svens repo without polluting the changes with the gemStone-specifc changes ....

Might take some git magic to do this but it shouldn't be too bad ...