Re-added save/restore bundle state to work with new code
Merge branch 'master' of ssh://git@github.com/danielfinke/cpsc472.git