Merge upstream updates

This merges updates to the original (Gabriele's) repo since March, including persistence and the ability to continue playing after 2048.