model tests
merge conflicts
Merge pull request #16 from s-loar/model_specs

Model specs
Delete .DS_Store
Update seeds.rb
more tour poi
more tour poi
Merge pull request #19 from s-loar/seeding_more

Seeding more for architecture tour
Seed change
Merge pull request #20 from s-loar/seeding_more

Seed change
moved email_convert out of private