"Vape" and "e-cig" to be added to Oxford English Dict., among others