Fixed error where users with the same username or email could be made multiple times
Added field provider_id to users table, this is used for fb auth
Merge branch 'master' of https://github.com/wordify/wordify