From what I have heard, this part of that very long bill did not pass.
Here is a link to an update about lithium ion batteries http://sfata.org/member-update-regarding-u-s-senate-potential-ban-vapor-products-commercial-flights/
Glad to hear you found something you enjoy, and hope it works out for you. in todays economy one income isn't enough for most people. Personally I would rather be poor and live in the sticks than to be rich and live in a city, but that's me, and everyone has different priorities.
LOL... The original mechanical mods were made from flashlights swap out a momentary contact button for the on/off button, and replace the bulb-head with a 510 connection and you were good to go... If I'm not mistaken, I've seen LED/CREE flashlight heads available with 510 connectors to turn your mechanical mod INTO a flashlight
it is the only language I know. If I can just keep one vapor from ending up on the news with a injury, by boring them to death with geek speak...I have succeeded.