Update user spec with email and password tests
Merge branch 'master' of github.com:moztemo/drinkstudio