Update the database.yml file
Fix database naming conflicts
Remove delivery features and respective tests.  All tests pass.
Fix conflicts for delivery features
Merge pull request #46 from MarcGarreau/clean-up-views

Clean up views