Manually merged a few tiny changes

* Catch a ValueError when opening bankroll file