fix up the upgrade.mode stuff to go away
Merge branch 'devbranch-dhiller' of github.com:deanhiller/databus into devbranch-dhiller