US House bill 3483 was introduced over the weekend, actually a good bill if it can get enough support. The bill would add exceptions to firearm prohibitions for marijuana possession if it is lawful under state law.

Proposed Federal Gun Legislation HB3483 - American Gun Owners Alliance