Upgrade support with Nick's changes

This incorporates Nick's changes as well as Forest's bug fix along with everything else up to date. Created a new branch as the old branch is messy..

https://albino.pistoncloud.com/job/Upgrade_Tests/357/console