Merge pull request #1 from eternaldensity/master

get updates from main fork
Made Castles/Sand spent use LucidCrux's new custom arguments.
Merge pull request #785 from eqbot/master

Made use of LucidCrux's new argument system.