_model property mapping has duplicate type handling check
the _model in Emitter is currently only checking properties that aren't fields to see if they are 'int, basestring' or callable, with no handling if they are neither. If the property passes the 'int, basestring' check, it is simply handed off to _any, which again does type-mapping that is more robust.
The attached patch removes the unnecessary 'int,basestring' instance check and instead checks to see if the property is callable (as before) and if not passes it off to _any for better type-handling.
I believe I got the tests set up correctly and this patch passed the tests for 1.0 and 1.1.