Vishv dev

Changes based on feedback on 'Google SignIn' branch.
These are sort-of constants, so please use ALL_CAPS for the variable names.