According to this article in The Hill,  a bill was introduced in the US House of Representatives by Rep. Jared Polis (D-Colo.) that would end the Federal prohibition on marijuana and treat marijuana users like alcohol users.  It includes a federal tax on recreational use (but not on medical use) of the drug.  The bill has little chance of getting passed, but it does show that the issue is gaining momentum.