Add seed data items and two vendors
Merge branch 'master' into seed_data
Add new item seeds
Fix master merge conflict
Jeff route example/namespace commented out
remove vendors.yml.swp fild and two extraneous spaces from items.yml