update to make gmail optional with flag on model;
update for installer