Standarize the empty cart test
Copy an example database yml to avoid travis complaining about a lack of database
Copy an example database yml to avoid travis complaining about a lack of database
Merge branch 'master' into order_processing