adds House, NonHouse models, and refactors the rake task