fixing up upgrades and enables on them
Merge branch 'master' of https://github.com/rek/gunday