Update drinks query for SQL sanitization
Upgrade capybara and factory_girl gems and update integration specs