Thanks Eric! Somehow I missed that post as I was searching through the forums last night for a solution.
I've got some testing to do on what I need to update as I wasn't too pleased with my first pass at upgrading. The styles on the store pages were different (need to figure out which style sheet to restore and where) and the front page of my store was missing some of the custom text I had added to that module. Also, I need to tweak the categories widget as it no longer provides the ability to show the sub-categories like I have now (or customize the heading of the widgets).