[Mostly Fixed] Main site problems due to upgrade

[Orion Pobursky]

The bottom line is that I feel terrible about this. I should have done some testing but in my excitement with fixing the PHP issues I did not. :/