merge from timwhitlock/node-amf (no changes)

Add support for traits/types