I ended up just doing it manually and I tried 3 different programs to make the process easier: MTG Studio, Magic Workstation, and Magic Album. I actually liked a lot of features in MTG Studio (enough that I would have paid for it) except when adding cards, there was always a prompt asking me if I wanted to merge the new card in with the ... More @Wikipedia
Hover over any link to get a description of the article. Please note that search keywords are sometimes hidden within the full article and don't appear in the description or title.