Mass. lawmakers unveil proposed overhaul of marijuana law