Merge pull request #81 from drslump/override-object-mapping

Move entity mapping for void, object and duck to a virtual method
Merge pull request #82 from drslump/annotate-alias-import

Annotate aliased selective imports
Merge branch 'master' into boojs