fixed more upgrade stuff
Merge branch 'master' of github.com:jacobwagner/monster

Conflicts:
	monster/upgrades/four_two_one.py