So, I finally got my offer last week! Turns out they had actually made an offer in March, but misstyped my e-mail address... which I at first found dubious, but they showed me a copy of the original offer letter, complete with a character missing from the e-mail addressee line. Oh, well! Got a merit offer and a fellowship that come out to about 50% tuition the first year and a bit more the second, and the program seems like a great fit, so I decided to accept.
To anyone who thinks they should have received funding, but didn't, it doesn't hurt to call or e-mail, even at the last minute! You never know if someone didn't make a tiny error like in my case. I'm definitely glad I followed up, as they might have otherwise had no idea they made such an error.
Hope to meet some of you soon! Good luck!