Fixed factory_girl errors; fixed rspec default generator; added model annotations