Battle over e-cigarettes hits Capitol