Fix Json serializer to be converting consistently - making enums serialize as integers

Fix Json serializer to be converting consistently - making enums serialize as integers #213