Merge pull request #3 from eternaldensity/master

get updates
Refactors castlesSpent
Merge pull request #707 from eqbot/master

Refactors castlesSpent, also fixes the spot I missed in persist with refactoring sandSpent.