resolve merge conflict in routes
Order works through delivery, added styles and confirmation
Merge branch 'master' into elastic_search_plus_delivery
Test search along with order delivery
Eval ideas
Vendor locations map working
All tests green. Basic mapping done. Delivery order green.
Merge branch 'master' of https://github.com/JessicaG/the_pivot
Merge branch 'master' into pickup_and_master_merge
Merge pull request #104 from JessicaG/pickup_and_master_merge

Pickup and master merge