removed a lot of uneeded if blocks and cleaned up repeated upgrade processes
Merge pull request #31 from jacobwagner/fix_upgrades

upgrade process cleaning