Annotated models and specs
Updated rake tasks to import hash annotations and events from new files