Grabbing changes from the speaker refactor branch
Merging in changes from truenorth2014 branch where refacorting to use Entity + Mapper combos