Minor fix to a) save on reset and b) enforce requirements for buying things
Merge branch 'master' into gh-pages