Fix drink spec
Comment out drinks integration specs
Fix user editing for #skip_password