Clean up SerializerFactory options handling
Merge pull request #102 from wmde/options

Clean up SerializerFactory options handling